From 9ed9388d3cb895a9a159b2cf4fcb5cc7e0fc0fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Wed, 30 Aug 2023 16:38:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SupvPlanServiceImpl.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) 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("结束实施时间不可为空！"); }