小车车 3 kuukautta sitten
vanhempi
sitoutus
c164219451

+ 1 - 1
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/sop/SopExecutionPlanService.java

@@ -58,7 +58,7 @@ public interface SopExecutionPlanService extends IService<SopExecutionPlanDO> {
     /**
      * 获得SOP计划执行
      *
-     * @param id 编号
+     * @param sopId 编号
      * @return SOP计划执行
      */
     SopExecutionPlanRespVO selectSopExecutionPlanBySopId(Long sopId);

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

@@ -190,7 +190,7 @@ public class SopExecutionPlanServiceImpl extends ServiceImpl<SopExecutionPlanMap
             String yyyymmdd = SuperDateUtils.getYYYYMMDD();
             List<String> adjacentDatesYearDay = SuperDateUtils.getAdjacentDatesYearDay(
                     yyyymmdd,
-                    null,
+                    sopExecutionPlanDO.getEndValue(),
                     bean.getFrequency(),
                     Integer.parseInt(bean.getTimePoint()),
                     10);
@@ -212,7 +212,7 @@ public class SopExecutionPlanServiceImpl extends ServiceImpl<SopExecutionPlanMap
             String yyyymmdd = SuperDateUtils.getYYYYMMDD();
             List<String> adjacentDatesMonthDay = SuperDateUtils.getAdjacentDatesMonthDay(
                     yyyymmdd,
-                    null,
+                    sopExecutionPlanDO.getEndValue(),
                     bean.getFrequency(),
                     Integer.parseInt(bean.getTimePoint()),
                     10);
@@ -256,7 +256,7 @@ public class SopExecutionPlanServiceImpl extends ServiceImpl<SopExecutionPlanMap
             String yyyymmdd = SuperDateUtils.getYYYYMMDD();
             List<String> adjacentDatesByDay = SuperDateUtils.getAdjacentDatesByDay(
                     yyyymmdd,
-                    null,
+                    sopExecutionPlanDO.getEndValue(),
                     bean.getFrequency(),
                     10);
             for (String s : adjacentDatesByDay) {