feature 代码提交

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/CheckTemplateServiceImpl.java

@@ -263,9 +263,9 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
             // 每天
             if ("day".equals(frequencys[0])) {
                 isCreate = true;
-            }
-            // 每周
-            else if ("week".equals(frequencys[0])) {
+            }else if("once".equals(frequencys[0])){
+                isCreate = true;
+            } else if ("week".equals(frequencys[0])) {
                 String weekday = frequencys[1];
                 // 当前时间是星期几
                 String w = DateUtil.dayOfWeek(new Date()) + "";
@@ -580,7 +580,7 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
                 .eq(BaseDo::getDeleted, "0"));
         if (!mode) {
             templateItemsDos = templateItemsDos.stream()
-                    .filter(data -> isNowCreateByFrequency(data.getFrequency()))
+                    .filter(data -> isNowCreateByFrequency(data.getFrequencyids()))
                     .collect(Collectors.toList());
         }
         logger.debug("本次需要生成检查计划的模板数据有：{}", templateItemsDos.size());

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ScheduledTasksServiceImpl.java

@@ -391,7 +391,7 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
                                 updateGenerationDateDo[0].setGenerationdate(startInstance.getTime());
                                 updateGenerationDateList.add(updateGenerationDateDo[0]);
                             });
-                    startInstance.add(Calendar.MONTH, -(task.getKey() - 1));
+                    endInstance.add(Calendar.MONTH, -(task.getKey() - 1));
                 }
             } else if (SaveConstans.INSPECTION_CYCLE_UNIT.DAY.equals(checkCycleUnit)) {
                 // 对于天的任务 直接判断上次生成时间和当前时间相隔的天数是否满足要求