diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java index f4a3f91..7a2eb98 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java @@ -182,31 +182,31 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId())); -// if(!baseResponse.isSuccess()){ -// CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); -// } -// if(!baseResponse.getData()){ -// ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR.throwException(); -// } -// -// //3、调用流程中心 发起重新评审流程 -// ProjectReEvaluationTaskVO reEvaluationTaskVO = reEvalStart(id); -// -// //修改异常信息进行提交 -// UpdateWrapper updateWrapper = new UpdateWrapper<>(); -// updateWrapper.eq(ProjectReEvaluationField.ID,id); -// updateWrapper.eq(ProjectReEvaluationField.STATUS, ProjectCommonUtil.RE_EVALUATION_STATUS_0); -// updateWrapper.set(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_1); -// updateWrapper.set(ProjectReEvaluationField.INSTANCE_ID,reEvaluationTaskVO.getInstanceId()); -// boolean result = this.update(updateWrapper); -// CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValid(!result); + //1 去采购系统校验子项目信息是否发生改变 如果发生改变不可以重新评审 + ProjectReEvaluation evaluation = this.getById(id); + ProjectSection section = sectionService.getById(evaluation.getSectionId()); + BaseResponse baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId())); + if(!baseResponse.isSuccess()){ + CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); + } + if(!baseResponse.getData()){ + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR.throwException(); + } + + //3、调用流程中心 发起重新评审流程 + ProjectReEvaluationTaskVO reEvaluationTaskVO = reEvalStart(id); + + //修改异常信息进行提交 + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq(ProjectReEvaluationField.ID,id); + updateWrapper.eq(ProjectReEvaluationField.STATUS, ProjectCommonUtil.RE_EVALUATION_STATUS_0); + updateWrapper.set(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_1); + updateWrapper.set(ProjectReEvaluationField.INSTANCE_ID,reEvaluationTaskVO.getInstanceId()); + boolean result = this.update(updateWrapper); + CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValid(!result); return result; }