Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/PlanStatusEnum.java

@@ -14,7 +14,9 @@ public enum PlanStatusEnum {
     EXAMINE_FORMULATE("已审核/检查内容未制定",4, 5),
     EXAMINE_DEVELOPED("检查内容已制定/未执行",5, 6),
     IN_EXECUTION("执行中",6, 7),
-    COMPLETED("已完成",7, 7);
+    COMPLETED("已完成",7, 7),
+    OUT_TIME("已超时",8, 8);
+
 
     /**
      * 名称

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -260,7 +260,7 @@ public class PlanServiceImpl implements IPlanService {
                     rulePlanService.addPlanRule(plan, userIds, RuleTypeEnum.计划提交, null); // 计划提交
                 } else {
                     if (PlanStatusEnum.EXAMINE_THREE.getValue() != status){
-                        rulePlanService.addPlanAuditRule(plan, userIds, RuleTypeEnum.计划审核, ExecuteStateNameEnum.getNameByCode(excuteState)); // 计划审核
+                   //     rulePlanService.addPlanAuditRule(plan, userIds, RuleTypeEnum.计划审核, ExecuteStateNameEnum.getNameByCode(excuteState)); // 计划审核
                         rulePlanService.addPlanAuditRule(plan, userIds, RuleTypeEnum.计划审核任务, ExecuteStateNameEnum.getNameByCode(excuteState)); // 计划审核任务通知
                     } else {
                         rulePlanService.addPlanAuditRule(plan, userIds, RuleTypeEnum.计划审核完成, ExecuteStateNameEnum.getNameByCode(excuteState)); // 计划审核完成

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanTaskServiceImpl.java

@@ -396,7 +396,23 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 			}
 			// 计划已过期,则更新status = 7,已完成
 			if (!vo.getIsGenData()) {
-				paramMap.put("status", PlanStatusEnum.COMPLETED.getValue());
+				int num = 0;
+				//根据计划id查询关联的任务
+				List<PlanTask> planTaskByRouteId = planTaskMapper.getPlanTaskByRouteId(plan.getId());
+				if (!ValidationUtil.isEmpty(planTaskByRouteId)){
+					HashMap<String, Object> param = new HashMap<String, Object>();
+					param.put("pointId",plan.getId());
+					//根据任务id查询关联的任务是否存在未完成的  如果存在 则修改状态为已超时
+					List<Map<String, Object>> planTaskPoints = planTaskMapper.getPlanTaskPoints(param);
+					if (!ValidationUtil.isEmpty(planTaskPoints)){
+						num = (int) planTaskPoints.stream().filter(c -> c.containsKey("finish") && !String.valueOf(c.get("finish")).equals("2")).count();
+					}
+					if (num >= 1){
+						paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
+					}else {
+						paramMap.put("status", PlanStatusEnum.COMPLETED.getValue());
+					}
+				}
 				planMapper.updPlanStatusOrGenDate(paramMap);
 				continue;
 			}

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -398,7 +398,9 @@
         <if test="taskType != null and taskType != ''">and ppn.check_type_id = #{taskType}</if>
         <if test="planTaskId != null and planTaskId > 0 ">and ptd.task_no = #{planTaskId}</if>
         <if test="orderBy != null and orderBy != ''">order by ${orderBy}</if>
-        limit #{offset},#{pageSize}
+        <if test="offset != null and pageSize != null">
+            limit #{offset},#{pageSize}
+        </if>
     </select>
 
     <select id="getPlanTaskPointsCount" resultType="long">