241229-3代码。

routers/api/riskManagement/rescue_resources.py

@@ -478,7 +478,11 @@ async def get_inspection_task_list(
             year_1 =current_date.year
         if month_1 is None:
             month_1 = current_date.month
-        query = query.filter(RiskManagementRescueResourcesTaskChildrenTask.tsak_time < datetime_1.date(year_1, month_1 + 1, 1))
+        if month_1 == 12:
+            query = query.filter(
+                RiskManagementRescueResourcesTaskChildrenTask.tsak_time < datetime_1.date(year_1+1,  1, 1))
+        else:
+            query = query.filter(RiskManagementRescueResourcesTaskChildrenTask.tsak_time < datetime_1.date(year_1, month_1 + 1, 1))
         query = query.filter(RiskManagementRescueResourcesTaskChildrenTask.tsak_time >= datetime_1.date(year_1, month_1, 1))
         # query = query.filter(RiskManagementInspectionTaskChildrenTask.tsak_time <=datetime.now())
         query = query.filter(RiskManagementRescueResourcesTaskChildrenTask.task_range.in_(task_range))
@@ -490,7 +494,10 @@ async def get_inspection_task_list(
         # 获取指定月份的第一天是周几
         # first_day = datetime.date(yaer_1, month_1, 1)
         # 计算该月的天数
-        number_of_days = (datetime_1.date(year_1, month_1 + 1, 1) - datetime_1.timedelta(days=1)).day
+        if month_1 == 12:
+            number_of_days = (datetime_1.date(year_1+1,  1, 1) - datetime_1.timedelta(days=1)).day
+        else:
+            number_of_days = (datetime_1.date(year_1, month_1 + 1, 1) - datetime_1.timedelta(days=1)).day
         # 遍历该月的每一天
         for day in range(1, number_of_days + 1):
             # 创建日期对象

routers/api/riskManagement/risk_router.py

@@ -478,7 +478,10 @@ async def get_inspection_task_list(
             year_1 =current_date.year
         if month_1 is None:
             month_1 = current_date.month
-        query = query.filter(RiskManagementRiskTaskChildrenTask.tsak_time < datetime_1.date(year_1, month_1 + 1, 1))
+        if month_1 == 12:
+            query = query.filter(RiskManagementRiskTaskChildrenTask.tsak_time < datetime_1.date(year_1+1,  1, 1))
+        else:
+            query = query.filter(RiskManagementRiskTaskChildrenTask.tsak_time < datetime_1.date(year_1, month_1 + 1, 1))
         query = query.filter(RiskManagementRiskTaskChildrenTask.tsak_time >= datetime_1.date(year_1, month_1, 1))
         # query = query.filter(RiskManagementInspectionTaskChildrenTask.tsak_time <=datetime.now())
         query = query.filter(RiskManagementRiskTaskChildrenTask.task_range.in_(task_range))
@@ -490,7 +493,11 @@ async def get_inspection_task_list(
         # 获取指定月份的第一天是周几
         # first_day = datetime.date(yaer_1, month_1, 1)
         # 计算该月的天数
-        number_of_days = (datetime_1.date(year_1, month_1 + 1, 1) - datetime_1.timedelta(days=1)).day
+
+        if month_1 == 12:
+            number_of_days = (datetime_1.date(year_1+1, 1, 1) - datetime_1.timedelta(days=1)).day
+        else:
+            number_of_days = (datetime_1.date(year_1, month_1 + 1, 1) - datetime_1.timedelta(days=1)).day
         # 遍历该月的每一天
         for day in range(1, number_of_days + 1):
             # 创建日期对象

routers/api/riskManagement/task.py

@@ -462,7 +462,10 @@ async def get_inspection_task_list(
             year_1 =current_date.year
         if month_1 is None:
             month_1 = current_date.month
-        query = query.filter(RiskManagementInspectionTaskChildrenTask.tsak_time < datetime_1.date(year_1, month_1 + 1, 1))
+        if month_1==12:
+            query = query.filter(RiskManagementInspectionTaskChildrenTask.tsak_time < datetime_1.date(year_1+1, 1, 1))
+        else:
+            query = query.filter(RiskManagementInspectionTaskChildrenTask.tsak_time < datetime_1.date(year_1, month_1 + 1, 1))
         query = query.filter(RiskManagementInspectionTaskChildrenTask.tsak_time >= datetime_1.date(year_1, month_1, 1))
         # query = query.filter(RiskManagementInspectionTaskChildrenTask.tsak_time <=datetime.now())
         query = query.filter(RiskManagementInspectionTaskChildrenTask.task_range.in_(task_range))
@@ -474,7 +477,10 @@ async def get_inspection_task_list(
         # 获取指定月份的第一天是周几
         # first_day = datetime.date(yaer_1, month_1, 1)
         # 计算该月的天数
-        number_of_days = (datetime_1.date(year_1, month_1 + 1, 1) - datetime_1.timedelta(days=1)).day
+        if month_1 == 12:
+            number_of_days = (datetime_1.date(year_1+1, 1, 1) - datetime_1.timedelta(days=1)).day
+        else:
+            number_of_days = (datetime_1.date(year_1, month_1 + 1, 1) - datetime_1.timedelta(days=1)).day
         # 遍历该月的每一天
         for day in range(1, number_of_days + 1):
             # 创建日期对象