瀏覽代碼

安全检查编辑时,可能提示不支持无周期的问题

jiawuxian 1 年之前
父節點
當前提交
7ac0dcff12

+ 13 - 2
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -778,7 +778,13 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
      * @return
      */
     private Boolean needCopyOnEdit(CoreSafecheckPlan plan) {
-        DateRange dateRange = DateUtils.getStartAndEnd(new Date(), SafetyPlanCycle.toCommon(plan.getPlanCycle()));
+        DateRange dateRange = null;
+        if (ObjectUtil.equal(plan.getPlanCycle(), SafetyPlanCycle.NONE.getCode())) {
+            dateRange = new DateRange(plan.getStartDate(), plan.getEndDate());
+        } else {
+            dateRange = DateUtils.getStartAndEnd(new Date(), SafetyPlanCycle.toCommon(plan.getPlanCycle()));
+        }
+
         if (ObjectUtil.equal(plan.getPlanStatus(), PlanStatus.USING.getCode()) && new Date().before(plan.getEffectiveTime())) {
             return false;
         } else if (ObjectUtil.equal(plan.getPlanStatus(), PlanStatus.USING.getCode())
@@ -1015,7 +1021,12 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         registerBookVo.setCheckUserInfo(checkUserInfo);
         registerBookVo.setCheckTeam(appSafetyCheckTask.getCheckTeam());
         final CoreSafecheckPlan plan = coreSafecheckPlanMapper.get(appSafetyCheckTask.getPlanId());
-        registerBookVo.setCheckTypeText(DictUtils.getDictLabel(DictConstants.CHECK_TYPE, plan.getCheckType().intValue()));
+        if (ObjectUtil.isNotNull(plan)) {
+            registerBookVo.setCheckTypeText(DictUtils.getDictLabel(DictConstants.CHECK_TYPE, plan.getCheckType().intValue()));
+        } else {
+            registerBookVo.setCheckTypeText("临时登记");
+        }
+
         List<CheckDataVo> pointCheckDataList = new ArrayList<>();
         List<AppTaskRegisterPointVo> appTaskRegisterPointVos = coreSafetyTaskMapper.selectPointByTask(appSafetyCheckTask.getId());
         for (AppTaskRegisterPointVo vo :