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 dd25002..c55a023 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 @@ -373,46 +373,45 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl 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()); }