250418-1代码。

models/risk_management.py

@@ -40,6 +40,7 @@ class RiskManagementInspectionTask(Base):
     end_time = Column(DateTime, nullable=True, comment='巡查结束时间')
     inspection_cycle = Column(String(50), nullable=True, comment='巡查周期，每年、每月、每周、每日、一次')
     corn_expression = Column(String(100), nullable=True, comment='corn表达式')
+    corn_query = Column(String(100), nullable=True, comment='corn_query')
     inspection_range = Column(String(50), nullable=True, comment='巡查范围，市级、区县级、镇街级、村居级')
     task_status = Column(String(20), nullable=True, comment='任务状态，未开始、进行中、未完成、已完结')
     del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')
@@ -139,6 +140,7 @@ class RiskManagementRiskTask(Base):
     end_time = Column(DateTime, nullable=True, comment='排查结束时间')
     task_cycle = Column(String(50), nullable=True, comment='排查周期，每年、每月、每周、每日、一次')
     corn_expression = Column(String(100), nullable=True, comment='corn表达式')
+    corn_query = Column(String(100), nullable=True, comment='corn_query')
     task_range = Column(String(50), nullable=True, comment='巡查范围，市级、区县级、镇街级、村居级')
     task_status = Column(String(20), nullable=True, comment='任务状态，未开始、进行中、未完成、已完结')
     del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')
@@ -221,6 +223,7 @@ class RiskManagementRescueResourcesTask(Base):
     end_time = Column(DateTime, nullable=True, comment='采集结束时间')
     task_cycle = Column(String(50), nullable=True, comment='采集周期，每年、每月、每周、每日、一次')
     corn_expression = Column(String(100), nullable=True, comment='corn表达式')
+    corn_query = Column(String(100), nullable=True, comment='corn_query')
     task_range = Column(String(50), nullable=True, comment='巡查范围，市级、区县级、镇街级、村居级')
     task_status = Column(String(20), nullable=True, comment='任务状态，未开始、进行中、未完成、已完结')
     del_flag = Column(String(1), default='0', comment='删除标志（0代表存在 2代表删除）')

routers/api/riskManagement/rescue_resources.py

@@ -73,6 +73,7 @@ async def get_inspection_task_list(
                 "task_time": '%s-%s'%(task.start_time.strftime('%Y/%m/%d'),task.end_time.strftime('%Y/%m/%d')),
                 "cycle": task.task_cycle,
                 "task_range": task.task_range,
+                "corn_query":task.corn_query,
                 "task_status": task_status,
                 "create_by":nick_name,
                 "create_time": task.create_time.strftime('%Y-%m-%d %H:%M:%S')
@@ -135,6 +136,7 @@ async def get_inspection_task(
                 "task_time": '%s-%s'%(task.start_time.strftime('%Y/%m/%d'),task.end_time.strftime('%Y/%m/%d')),
                 "cycle": task.task_cycle,
                 "task_range": task.task_range,
+                "corn_query":task.corn_query,
                 "task_status": task_status,
                 "create_by":nick_name,
                 "create_time": task.create_time.strftime('%Y-%m-%d')

routers/api/riskManagement/risk_router.py

@@ -73,6 +73,7 @@ async def get_inspection_task_list(
                 "task_time": '%s-%s'%(task.start_time.strftime('%Y/%m/%d'),task.end_time.strftime('%Y/%m/%d')),
                 "cycle": task.task_cycle,
                 "task_range": task.task_range,
+                "corn_query":task.corn_query,
                 "task_status": task_status,
                 "create_by":nick_name,
                 "create_time": task.create_time#.strftime('%Y-%m-%d')
@@ -135,6 +136,7 @@ async def get_inspection_task(
                 "task_time": '%s-%s'%(task.start_time.strftime('%Y/%m/%d'),task.end_time.strftime('%Y/%m/%d')),
                 "cycle": task.task_cycle,
                 "task_range": task.task_range,
+                "corn_query":task.corn_query,
                 "task_status": task_status,
                 "create_by":nick_name,
                 "create_time": task.create_time.strftime('%Y-%m-%d')

routers/api/riskManagement/task.py

@@ -72,6 +72,7 @@ async def get_inspection_task_list(
                 "business": task.inspection_business,
                 "task_time": '%s-%s'%(task.start_time.strftime('%Y/%m/%d'),task.end_time.strftime('%Y/%m/%d')),
                 "cycle": task.inspection_cycle,
+                "corn_query":task.corn_query,
                 "inspection_range": task.inspection_range,
                 "task_status": task_status,
                 "create_by":nick_name,
@@ -137,6 +138,7 @@ async def get_inspection_task(
                 "end_time":task.end_time.strftime('%Y-%m-%d'),
                 "cycle": task.inspection_cycle,
                 "inspection_range": task.inspection_range,
+                "corn_query":task.corn_query,
                 "task_status": task_status,
                 "create_by":nick_name,
                 "create_time": task.create_time.strftime('%Y-%m-%d')

utils/riskManagement_uitl.py

@@ -107,7 +107,7 @@ def get_task_date_list(cycle,start_date,end_date,corn_query):
     # 生成日期列表
     date_list = []
     if cycle=='4': #仅一次，返回当天
-        date_list.append(datetime.today())
+        date_list.append(start_date)#datetime.today())  #是否需要加个日期？
         return date_list
     elif cycle=='3': #每天
         current_date = start_date
@@ -143,7 +143,7 @@ def get_task_date_list(cycle,start_date,end_date,corn_query):
         return date_list
     elif cycle=='0': #每月
         if '-' in corn_query:
-            y,m,d = corn_query.split("-")
+            m,d = corn_query.split("-")
         else:
             d,m = corn_query.split()
         days_ahead = datetime.strptime(start_date.strftime("%Y-")+m+'-'+d, "%Y-%m-%d")