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 4031afb..dd25002 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 @@ -31,6 +31,7 @@ import com.chinaunicom.mall.ebtp.project.projectreevaluation.entity.ProjectReEva import com.chinaunicom.mall.ebtp.project.projectreevaluation.service.IProjectReEvaluationService; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionService; +import io.seata.core.context.RootContext; import io.seata.spring.annotation.GlobalTransactional; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -181,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; } @@ -356,58 +357,62 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl response = mallProcessApi.againinitialize(evaluation.getProjectId(), evaluation.getSectionId(), roomSort); ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); log.info("初始化评审 返回结果:"+ JsonUtils.objectToJson(response)); AgainRoomVO againRoomVO = response.getData(); + ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.throwException(); - //复制招标信息 - log.info("复制招标信息 请求参数:"+ JsonUtils.objectToJson(againRoomVO)); - response = ebtpMallBidApi.copyDocument(againRoomVO); - ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); - log.info("复制招标信息 返回结果:"+ JsonUtils.objectToJson(response)); - - //复制投标信息 - log.info("复制投标信息 请求参数:"+ JsonUtils.objectToJson(response.getData()),evaluation.getAssessId()); - response = ebtpTenderApi.reviewAgain(response.getData(),evaluation.getAssessId()); - ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); - log.info("复制投标信息 返回结果:"+ JsonUtils.objectToJson(response)); - - //复制应答信息 - log.info("复制应答信息 请求参数:"+ JsonUtils.objectToJson(response.getData())); - response = ebtpRespsApi.copyTdocByAgainRoom(response.getData()); - ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); - log.info("复制应答信息 返回结果:"+ JsonUtils.objectToJson(response)); - - //复制评审设置信息 - log.info("复制评审设置信息 请求参数:"+ JsonUtils.objectToJson(response.getData())); - BaseResponse rsmsResponse = ebtpRsmsApi.again(response.getData()); - ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(rsmsResponse.getMessage(),!rsmsResponse.isSuccess()); - log.info("复制评审设置信息 返回结果:"+ JsonUtils.objectToJson(rsmsResponse)); - - //是否专家与上次一致 如果 是 进行复制 - if(StringUtils.equals(ProjectCommonUtil.IS_AGREEMENT_YES,evaluation.getIsAgreement())){ - BaseResponse juryResponse = ebtpRsmsApi.copyJury(evaluation.getAssessId(),againRoomVO.getRoomId()); - ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(juryResponse.getMessage(),!juryResponse.isSuccess()); - } - - //修改评审开始时间 - Map updateProcessMap = new HashMap<>(16); - updateProcessMap.put(evaluation.getSectionId(),evaluation.getEvaluationStartTime()); - log.info("修改评审开始时间 请求参数:"+ JsonUtils.objectToJson(updateProcessMap)); - rsmsResponse = mallProcessApi.updateOpenTime(updateProcessMap); - ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(rsmsResponse.getMessage(),!rsmsResponse.isSuccess()); - log.info("修改评审开始时间 返回结果:"+ JsonUtils.objectToJson(rsmsResponse)); - sectionService.calibrationToEvaluation(evaluation.getSectionId()); +// //复制招标信息 +// log.info("复制招标信息 请求参数:"+ JsonUtils.objectToJson(againRoomVO)); +// response = ebtpMallBidApi.copyDocument(againRoomVO); +// ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); +// log.info("复制招标信息 返回结果:"+ JsonUtils.objectToJson(response)); +// +// //复制投标信息 +// log.info("复制投标信息 请求参数:"+ JsonUtils.objectToJson(response.getData()),evaluation.getAssessId()); +// response = ebtpTenderApi.reviewAgain(response.getData(),evaluation.getAssessId()); +// ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); +// log.info("复制投标信息 返回结果:"+ JsonUtils.objectToJson(response)); +// +// //复制应答信息 +// log.info("复制应答信息 请求参数:"+ JsonUtils.objectToJson(response.getData())); +// response = ebtpRespsApi.copyTdocByAgainRoom(response.getData()); +// ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess()); +// log.info("复制应答信息 返回结果:"+ JsonUtils.objectToJson(response)); +// +// //复制评审设置信息 +// log.info("复制评审设置信息 请求参数:"+ JsonUtils.objectToJson(response.getData())); +// BaseResponse rsmsResponse = ebtpRsmsApi.again(response.getData()); +// ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(rsmsResponse.getMessage(),!rsmsResponse.isSuccess()); +// log.info("复制评审设置信息 返回结果:"+ JsonUtils.objectToJson(rsmsResponse)); +// +// //是否专家与上次一致 如果 是 进行复制 +// if(StringUtils.equals(ProjectCommonUtil.IS_AGREEMENT_YES,evaluation.getIsAgreement())){ +// BaseResponse juryResponse = ebtpRsmsApi.copyJury(evaluation.getAssessId(),againRoomVO.getRoomId()); +// ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(juryResponse.getMessage(),!juryResponse.isSuccess()); +// } +// +// //修改评审开始时间 +// Map updateProcessMap = new HashMap<>(16); +// updateProcessMap.put(evaluation.getSectionId(),evaluation.getEvaluationStartTime()); +// log.info("修改评审开始时间 请求参数:"+ JsonUtils.objectToJson(updateProcessMap)); +// rsmsResponse = mallProcessApi.updateOpenTime(updateProcessMap); +// ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(rsmsResponse.getMessage(),!rsmsResponse.isSuccess()); +// log.info("修改评审开始时间 返回结果:"+ JsonUtils.objectToJson(rsmsResponse)); +// sectionService.calibrationToEvaluation(evaluation.getSectionId()); }