fix20230331

apps/inves_manage/statistic_analysis_view.py

@@ -104,7 +104,7 @@ def get_data1(data_time, district_li, max_year):
             }
             }
             data_li1.append(data)
             data_li1.append(data)
             continue
             continue
-        data_li1 = sorted(data_li1, key=lambda x: x['value'], reverse=False)
+        data_li1 = sorted(data_li1, key=lambda x: x['value'], reverse=True)
         return data_li1
         return data_li1
     except Exception as e:
     except Exception as e:
         current_app.logger.error(e)
         current_app.logger.error(e)

apps/view_atlas/view.py

@@ -1168,7 +1168,7 @@ def industry_enterprise():
     try:
     try:
         company = Company.query.filter(
         company = Company.query.filter(
             Company.city == "晋城市",
             Company.city == "晋城市",
-            Company.entype == entype if entype else text(''),
+            Company.entype.like('%{}%'.format(entype)) if entype else text(''),
             Company.company_name.like('%{}%'.format(company_name)) if company_name else text(''),
             Company.company_name.like('%{}%'.format(company_name)) if company_name else text(''),
             Company.status == status if status else text('')
             Company.status == status if status else text('')
         )
         )