修改计划生成

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPlanDao.java

@@ -17,8 +17,8 @@ public interface IPlanDao extends BaseDao<Plan, Long> {
 
     @Modifying
     @Transactional
-    @Query(value = "select * from p_plan WHERE next_gen_date = ?1 and status = ?2", nativeQuery = true)
-    List<Plan> queryScheduledPlan(String strDate, String status);
+    @Query(value = "select * from p_plan WHERE next_gen_date = ?1 and (status = ?2 or status = ?3)", nativeQuery = true)
+    List<Plan> queryScheduledPlan(String strDate, String status,  String status1);
 
     @Modifying
     @Transactional

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

@@ -331,7 +331,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String strDate = df.format(now);
         String tomorrow = DateUtil.getIntervalDateStr(now, 1, "yyyy-MM-dd");//下一天
-        List<Plan> planList = iplanDao.queryScheduledPlan(strDate, String.valueOf(PlanStatusEnum.EXAMINE_DEVELOPED.getValue()));
+        // 根据计划状态5，6和next_gen_date查询需要生成任务的计划
+        List<Plan> planList = iplanDao.queryScheduledPlan(strDate, String.valueOf(PlanStatusEnum.EXAMINE_DEVELOPED.getValue()), String.valueOf(PlanStatusEnum.IN_EXECUTION.getValue()));
         if (planList == null || planList.size() <= 0) {
             log.info(strDate + " " + " 暂无待生成执行数据的计划");
             return;
@@ -359,9 +360,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 planMapper.updPlanStatusOrGenDate(paramMap);//更新为明天
                 continue;
             }
-            //计划已过期,则更新status = 1,停用
+            //计划已过期,则更新status = 7,已完成
             if (!vo.getIsGenData()) {
-                paramMap.put("status", XJConstant.PLAN_STATUS_STOP);
+                paramMap.put("status", PlanStatusEnum.COMPLETED.getValue());
                 planMapper.updPlanStatusOrGenDate(paramMap);
                 continue;
             }