对接修改

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/sop/vo/SopExecutionPlanPageReqVO.java

@@ -34,8 +34,11 @@ public class SopExecutionPlanPageReqVO extends PageParam {
     @Schema(description = "持续时长（小时）")
     private String duration;
 
-    @Schema(description = "计划终止时间")
-    private String endTime;
+    @Schema(description = "计划终止分类")
+    private String endType;
+
+    @Schema(description = "计划终止内容")
+    private String endValue;
 
     @Schema(description = "非工作日(0-照常执行 1-不执行 2-向前顺延 3-向后顺延 )")
     private Integer nonWorkDay;

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/sop/vo/SopExecutionPlanRespVO.java

@@ -44,9 +44,11 @@ public class SopExecutionPlanRespVO {
     @ExcelProperty("持续时长（小时）")
     private String duration;
 
-    @Schema(description = "计划终止时间")
-    @ExcelProperty("计划终止时间")
-    private String endTime;
+    @Schema(description = "计划终止分类")
+    private String endType;
+
+    @Schema(description = "计划终止内容")
+    private String endValue;
 
     @Schema(description = "非工作日(0-照常执行 1-不执行 2-向前顺延 3-向后顺延 )")
     @ExcelProperty("非工作日(0-照常执行 1-不执行 2-向前顺延 3-向后顺延 )")

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/sop/vo/SopExecutionPlanSaveReqVO.java

@@ -34,8 +34,11 @@ public class SopExecutionPlanSaveReqVO {
     @NotNull(message = "实行日期点（第30天 / 周一）不能为空")
     private Integer timePoint;
 
-    @Schema(description = "开始时间节点")
-    private String startTime;
+    @Schema(description = "计划终止分类")
+    private String endType;
+
+    @Schema(description = "计划终止内容")
+    private String endValue;
 
     @Schema(description = "持续时长（小时）")
     private String duration;

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/sop/SopExecutionPlanDO.java

@@ -57,9 +57,13 @@ public class SopExecutionPlanDO extends BaseDO {
      */
     private String duration;
     /**
-     * 计划终止时间
+     * 计划终止分类
      */
-    private LocalDateTime endTime;
+    private String endType;
+    /**
+     * 计划终止内容
+     */
+    private String endValue;
     /**
      * 非工作日(0-照常执行 1-不执行 2-向前顺延 3-向后顺延 )
      */

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopExecutionPlanServiceImpl.java

@@ -56,29 +56,28 @@ public class SopExecutionPlanServiceImpl extends ServiceImpl<SopExecutionPlanMap
     }
 
     @Override
-        public void deleteSopExecutionPlanListByIds(List<Long> ids) {
+    public void deleteSopExecutionPlanListByIds(List<Long> ids) {
         // 删除
         sopExecutionPlanMapper.deleteByIds(ids);
-        }
-
+    }
 
 
     @Override
     public SopExecutionPlanRespVO getSopExecutionPlan(Long id) {
         SopExecutionPlanDO sopExecutionPlanDO = sopExecutionPlanMapper.selectById(id);
         SopExecutionPlanRespVO bean = BeanUtils.toBean(sopExecutionPlanDO, SopExecutionPlanRespVO.class);
-        Date date = new Date();
         // 分类处理
-        /*if (createReqVO.getFrequencyUnit().equals(0)) {
+        if (bean.getFrequencyUnit().equals(0)) {
             // 处理年的数据
-            String yyyymmdd = DateUtil.format(date, "yyyy-MM-dd");
+            String yyyymmdd = SuperDateUtils.getYYYYMMDD();
             List<String> adjacentDatesYearDay = SuperDateUtils.getAdjacentDatesYearDay(
-                    SuperDateUtils.getYYYYMMDD(),
-                    createReqVO.getEndTime(),
-                    createReqVO.getFrequency(),
-                    createReqVO.getTimePoint(),
+                    yyyymmdd,
+                    bean.getEndTime(),
+                    bean.getFrequency(),
+                    bean.getTimePoint(),
                     10);
-        }*/
+        }
+
         return bean;
     }