fix20230331

apps/view_map/view.py

@@ -428,16 +428,17 @@ def attract_enterprise():
             Enterprise.province == province if province else text(''),
             Enterprise.province == province if province else text(''),
             Enterprise.city == city if city else text(''),
             Enterprise.city == city if city else text(''),
             Enterprise.district == district if district else text(''),
             Enterprise.district == district if district else text(''),
-            Enterprise.high_new == '1' if qualificat == '高新技术企业' else text(''),
-            Enterprise.tbe == '1' if qualificat == '科技型中小企业' else text(''),
+            Enterprise.isfive == '1' if qualificat == '中国500强企业' else text(''),
             Enterprise.quoted_company == '1' if qualificat == '上市企业' else text(''),
             Enterprise.quoted_company == '1' if qualificat == '上市企业' else text(''),
-            Enterprise.sxonhun == '1' if qualificat == '山西100强企业' else text(''),
-            Enterprise.zjtg == '1' if qualificat == '山西专精特新企业' else text(''),
+            Enterprise.chain_master == '1' if qualificat == '链主企业' else text(''),
             Enterprise.unicorn == '1' if qualificat == '独角兽企业' else text(''),
             Enterprise.unicorn == '1' if qualificat == '独角兽企业' else text(''),
+
+            Enterprise.high_new == '1' if qualificat == '高新技术企业' else text(''),
             Enterprise.dengl == '1' if qualificat == '瞪羚企业' else text(''),
             Enterprise.dengl == '1' if qualificat == '瞪羚企业' else text(''),
-            Enterprise.isfive == '1' if qualificat == '中国500强企业' else text(''),
             Enterprise.scale == '1' if qualificat == '规模以上企业' else text(''),
             Enterprise.scale == '1' if qualificat == '规模以上企业' else text(''),
-            Enterprise.chain_master == '1' if qualificat == '链主企业' else text(''),
+            Enterprise.zjtg == '1' if qualificat == '山西专精特新企业' else text(''),
+            Enterprise.tbe == '1' if qualificat == '科技型中小企业' else text(''),
+            Enterprise.sxonhun == '1' if qualificat == '山西100强企业' else text(''),
             Enterprise.serve == '1' if qualificat == '限额以上服务业企业' else text('')
             Enterprise.serve == '1' if qualificat == '限额以上服务业企业' else text('')
         )
         )
         if product:
         if product:

apps/view_radar/view.py

@@ -9,7 +9,7 @@ from sqlalchemy.sql import func
 from apps.util import login_required
 from apps.util import login_required
 from apps.utils.response_code import RET
 from apps.utils.response_code import RET
 from datetime import datetime
 from datetime import datetime
-import datetime
+# import datetime
 from apps import db, constants, redis_store
 from apps import db, constants, redis_store
 from apps.utils.neo4j_conn import conn_neo4j
 from apps.utils.neo4j_conn import conn_neo4j