Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

技术监督bug修改

Browse Source
This commit is contained in:
雨木c
2023-08-30 16:38:53 +08:00
parent 8ff22a9712
commit 9ed9388d3c
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
View File

@@ -96,20 +96,15 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
supvPlan.setReportIssueTime(PubUtils.localDateTimeFormat(supvPlanParam.getReportIssueTime())); 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()) ){ if(Objects.isNull(supvPlan.getEffectStartTime()) ){
throw new BusinessException("开始实施时间不可为空！"); throw new BusinessException("开始实施时间不可为空！");
} }
} }
if(dictDataEnd.getId().equals(supvPlan.getEffectStatus())){ if("04".equals(supvPlan.getEffectStatus())){
if(Objects.isNull(supvPlan.getEffectEndTime()) ){ if(Objects.isNull(supvPlan.getEffectEndTime()) ){
throw new BusinessException("结束实施时间不可为空！"); throw new BusinessException("结束实施时间不可为空！");
} }
@@ -153,20 +148,16 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> 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()) ){ if(Objects.isNull(supvPlan.getEffectStartTime()) ){
throw new BusinessException("开始实施时间不可为空！"); throw new BusinessException("开始实施时间不可为空！");
} }
} }
if(dictDataEnd.getId().equals(supvPlan.getEffectStatus())){ if("04".equals(supvPlan.getEffectStatus())){
if(Objects.isNull(supvPlan.getEffectEndTime()) ){ if(Objects.isNull(supvPlan.getEffectEndTime()) ){
throw new BusinessException("结束实施时间不可为空！"); throw new BusinessException("结束实施时间不可为空！");
} }