修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PlanTaskMapper.java

@@ -223,5 +223,15 @@ public interface PlanTaskMapper extends BaseMapper<PlanTask>, com.yeejoin.amos.s
 
     List<Map<String, Object>> queryTimeAxis(HashMap<String, Object> params);
 
+    /**
+     * 修改计划下任务状态
+     * @param planId
+     */
+    void updateTaskStatusByPlanId(@Param("planId") Long planId);
 
+    /**
+     * 修改计划下任务详情状态
+     * @param planId
+     */
+    void updateTaskDetailStatusByPlanId(@Param("planId") Long planId);
 }

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

@@ -65,6 +65,7 @@ import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import java.sql.Time;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -396,6 +397,20 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 			CalDateVo vo = PlanTaskUtil.reGenPlanTaskData(plan, tomorrow, tomorrow);
 			// 计划已过期,则更新status = 7,已完成
 			if (!vo.getIsGenData()) {
+				// 当前时间在计划结束时间之前，则计划还未超时
+				Date date = new Date();
+				Time time = new Time(date.getTime());
+				String planEndTime = plan.getPlanEnd() + " " + plan.getDayEnd().toString();
+				try {
+					 Date parse = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(planEndTime);
+					if (time.before(new Time(parse.getTime()))){
+						continue;
+					}
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+
+
 				int num = 0;
 				//根据计划id查询关联的任务
 				List<PlanTask> planTaskByRouteId = planTaskMapper.getPlanTaskByRouteId(plan.getId());
@@ -416,9 +431,20 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 				if (plan.getIsFixedDate().equals("2")){
 					paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
 					planMapper.updPlanStatusOrGenDate(paramMap);
+					// 计划超时，修改计划下任务状态
+					planTaskMapper.updateTaskStatusByPlanId(plan.getId());
+					// 计划超时，修改计划下任务详情状态
+					planTaskMapper.updateTaskDetailStatusByPlanId(plan.getId());
 					continue;
 				}
 				planMapper.updPlanStatusOrGenDate(paramMap);
+
+				if (!ObjectUtils.isEmpty(paramMap.get("status")) && paramMap.get("status").equals(PlanStatusEnum.OUT_TIME.getValue())){
+					// 计划超时，修改计划下任务状态
+					planTaskMapper.updateTaskStatusByPlanId(plan.getId());
+					// 计划超时，修改计划下任务详情状态
+					planTaskMapper.updateTaskDetailStatusByPlanId(plan.getId());
+				}
 				continue;
 			}
 			// 2.1计划数据合法性校验

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

@@ -1012,4 +1012,15 @@
         #{userId}, user_id)
         AND finish_status = 1
     </select>
+
+    <update id="updateTaskStatusByPlanId">
+          update p_plan_task
+            set finish_status  = 3
+		    WHERE plan_id = #{planId} and finish_status != 2
+    </update>
+    <update id="updateTaskDetailStatusByPlanId">
+        update p_plan_task_detail
+				set is_finish = 3
+				WHERE task_no in(SELECT id FROM p_plan_task WHERE plan_id = #{planId}) and is_finish != 2
+    </update>
 </mapper>
\ No newline at end of file