diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java index 91351af50..03d2c5342 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java @@ -96,20 +96,15 @@ public class SupvPlanServiceImpl extends ServiceImpl i supvPlan.setReportIssueTime(PubUtils.localDateTimeFormat(supvPlanParam.getReportIssueTime())); } - DictData dictDataStart = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.EFFECT_STATUS.getName(), DicDataEnum.Nocarried.getName()).getData(); - DictData dictDataEnd = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.EFFECT_STATUS.getName(), DicDataEnum.Completed.getName()).getData(); - if(Objects.isNull(dictDataStart) || Objects.isNull(dictDataEnd)){ - throw new BusinessException(SystemResponseEnum.EFFECT_STATUS_EMPTY); - } - if(!dictDataStart.getId().equals(supvPlan.getEffectStatus())){ + if(!"01".equals(supvPlan.getEffectStatus())){ if(Objects.isNull(supvPlan.getEffectStartTime()) ){ throw new BusinessException("开始实施时间不可为空!"); } } - if(dictDataEnd.getId().equals(supvPlan.getEffectStatus())){ + if("04".equals(supvPlan.getEffectStatus())){ if(Objects.isNull(supvPlan.getEffectEndTime()) ){ throw new BusinessException("结束实施时间不可为空!"); } @@ -153,20 +148,16 @@ public class SupvPlanServiceImpl extends ServiceImpl i } } - DictData dictDataStart = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.EFFECT_STATUS.getName(), DicDataEnum.Nocarried.getName()).getData(); - DictData dictDataEnd = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.EFFECT_STATUS.getName(), DicDataEnum.Completed.getName()).getData(); - if(Objects.isNull(dictDataStart) || Objects.isNull(dictDataEnd)){ - throw new BusinessException(SystemResponseEnum.EFFECT_STATUS_EMPTY); - } - if(!dictDataStart.getId().equals(supvPlan.getEffectStatus())){ + + if(!"01".equals(supvPlan.getEffectStatus())){ if(Objects.isNull(supvPlan.getEffectStartTime()) ){ throw new BusinessException("开始实施时间不可为空!"); } } - if(dictDataEnd.getId().equals(supvPlan.getEffectStatus())){ + if("04".equals(supvPlan.getEffectStatus())){ if(Objects.isNull(supvPlan.getEffectEndTime()) ){ throw new BusinessException("结束实施时间不可为空!"); }