修复路口管家巡检页面产品走查bug

app/compare_views.py

@@ -46,3 +46,8 @@ def rerun_cross_survey_part_api():
 @app.route('/api/query_usable_survey_crosses', methods=['GET'])
 def query_usable_survey_crosses_api():
     return query_usable_survey_crosses(request.args)
+
+
+@app.route('/api/query_cross_survey_usable_dates', methods=['GET'])
+def query_cross_survey_usable_dates_api():
+    return query_cross_survey_usable_dates(request.args)

app/cross_compare_worker.py

@@ -316,7 +316,7 @@ def query_usable_survey_crosses(params):
         return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
 
     area_servey_jobs = db_tmnet.query_survey_job_info_by_area_id(area_id)
-    usable_crossid_list = list(set([job['crossid'] for job in area_servey_jobs.values()]))
+    usable_crossid_list = list(set([job['crossid'] for job in area_servey_jobs]))
     res_list = []
     for crossid in usable_crossid_list:
         cross_name = g_roadnet.query_cross(crossid).name
@@ -360,7 +360,7 @@ def query_cross_survey_usable_dates(params):
             end_day = row['update_time'].strftime('%Y%m%d')
         usable_info['job_info'].append({
             'jobid': row['id'],
-            'time_range': start_day + '-' + end_day,
+            'time_range': str(start_day) + '-' + str(end_day),
         })
     res = make_common_res(0, 'ok')
     res['data'] = usable_info

app/db_func_base.py

@@ -75,6 +75,7 @@ class TableDbHelperBase:
             logging.error(f"do_execute '{sql_update}' Error: {e}")
             return 0
         return ret
+
     def do_executemany(self, sql, data_list, cursor=None):
         try:
             logging.info(f"sql = {sql}, data_list = {data_list}")

app/monitor_common.py

@@ -1715,12 +1715,12 @@ def gen_cross_problem_detail(routing_crosses, high_park_problems, too_many_stop_
             phase_infos = phase_tp['problems'][crossid]
             phase_list = []
             for item in phase_infos:
-                if item['final_state_int'] in (4, 5):
-                    continue
                 if item['level_color_int'] < phase_color:
                     phase_color = item['level_color_int']
                 if item['final_state_int'] < phase_final_state:
                     phase_final_state = item['final_state_int']
+                if item['final_state_int'] in (4, 5):
+                    continue
                 item_desc = '【' + item['first_date'] + ' ' + item['time_range'] + '】' + item['level_color'] + '异常'
                 phase_list.append({
                     'desc': item_desc,