巡检任务侦听同步开发完成

CommunityService/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java

@@ -74,17 +74,37 @@ public class InspectionTaskInnerServiceSMOImpl extends BaseServiceSMO implements
         List<Map> inspectPlans = inspectionTaskServiceDaoImpl.queryTodayInspectionPlan(param);
         Map taskParam = new HashMap();
         //#{task.planUserId},#{task.planInsTime},#{task.signType},#{task.inspectionPlanId},#{task.planUserName},#{task.communityId},'-1',#{task.taskId}
-        for (Map inspectPlan : inspectPlans) {
-            inspectPlan.put("planInsTime", new Date());
-            inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+        if (inspectPlans != null && inspectPlans.size() > 0) {
+            for (Map inspectPlan : inspectPlans) {
+                inspectPlan.put("planInsTime", new Date());
+                inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+            }
+            taskParam.put("tasks", inspectPlans);
+            inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
         }
-        taskParam.put("tasks", inspectPlans);
-        inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
 
         //2.0查询当前周是否有执行任务（按每周）
         param.put("inspectionPlanPeriod", "2020023");
         inspectPlans = inspectionTaskServiceDaoImpl.queryTodayInspectionPlan(param);
-
+        if (inspectPlans != null && inspectPlans.size() > 0) {
+            for (Map inspectPlan : inspectPlans) {
+                inspectPlan.put("planInsTime", new Date());
+                inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+            }
+            taskParam.put("tasks", inspectPlans);
+            inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
+        }
+        //2.0查询当前周是否有执行任务（按每周）
+        param.put("inspectionPlanPeriod", "2020024");
+        inspectPlans = inspectionTaskServiceDaoImpl.queryTodayInspectionPlan(param);
+        if (inspectPlans != null && inspectPlans.size() > 0) {
+            for (Map inspectPlan : inspectPlans) {
+                inspectPlan.put("planInsTime", new Date());
+                inspectPlan.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
+            }
+            taskParam.put("tasks", inspectPlans);
+            inspectionTaskServiceDaoImpl.insertInspectionTask(taskParam);
+        }
 
 
         return param;

java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml

@@ -291,6 +291,12 @@
         AND ip.staff_id = it.plan_user_id
         AND it.status_cd = '0'
         AND ip.community_id = it.community_id
+        <if test="inspectionPlanPeriod !=null and inspectionPlanPeriod == '2020023'">
+        and it.plan_ins_time &gt; DATE_SUB(curdate(),INTERVAL 7 DAY)
+        </if>
+        <if test="inspectionPlanPeriod !=null and inspectionPlanPeriod == '2020024'">
+            and it.plan_ins_time &gt; DATE_SUB(curdate(),INTERVAL 30 DAY)
+        </if>
         WHERE
         ip.status_cd = '0'
         and ip.end_time &gt; now()