Browse Source

修改天的数据生成逻辑

车车 3 months ago
parent
commit
d40e71fed0

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

@@ -212,7 +212,7 @@ public class SopExecutionPlanServiceImpl extends ServiceImpl<SopExecutionPlanMap
         // 天
         // 天
         if (bean.getFrequencyUnit().equals(3)) {
         if (bean.getFrequencyUnit().equals(3)) {
             // 处理天的数据
             // 处理天的数据
-            String yyyymmdd = SuperDateUtils.getYYYYMMDD();
+            String yyyymmdd = sopExecutionPlanDO.getEffectiveTime() == null ? SuperDateUtils.getYYYYMMDD() : sopExecutionPlanDO.getEffectiveTime();
             days = SuperDateUtils.getAdjacentDatesByDay(
             days = SuperDateUtils.getAdjacentDatesByDay(
                     yyyymmdd,
                     yyyymmdd,
                     endDateStr,
                     endDateStr,

+ 3 - 1
yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/utils/SuperDateUtils.java

@@ -519,7 +519,9 @@ public class SuperDateUtils {
 
 
         // 主循环:生成日期直到满足数量或超出结束日期
         // 主循环:生成日期直到满足数量或超出结束日期
         while (result.size() < count && !currentDate.isAfter(endDate)) {
         while (result.size() < count && !currentDate.isAfter(endDate)) {
-            result.add(currentDate.format(YYYYMMDD));
+            if (!LocalDate.now().isAfter(currentDate)) {
+                result.add(currentDate.format(YYYYMMDD));
+            }
             currentDate = currentDate.plusDays(frequencyDays);
             currentDate = currentDate.plusDays(frequencyDays);
         }
         }