liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
请求方式修改

See merge request eshop/biz_service_ebtp_project!15
This commit is contained in:
代兴成
2021-03-23 16:05:51 +08:00
parent 96e1fb6273 7efb907b0d
commit bdee612a25
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java
View File

@ -134,7 +134,7 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert {
FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR(110058, "采购系统子项目信息版本已升级不可以发起重新评审"), FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR(110058, "采购系统子项目信息版本已升级不可以发起重新评审"),
FRAME_EXCEPTION_PROJECT_EXCEPTION_SECTION_BUSINESS_MODULE_ERROR(110059, "异常的标段中含有已归档标段，不可以进行异常处理！"), FRAME_EXCEPTION_PROJECT_EXCEPTION_SECTION_BUSINESS_MODULE_ERROR(110059, "项目中心已编制采购结果，如需发起重新评审，请联系采购经理！"),
FRAME_EXCEPTION_INQUIRY_ATTACHMENT_LIST_EMPTY(110060, "询价文件不能为空"), FRAME_EXCEPTION_INQUIRY_ATTACHMENT_LIST_EMPTY(110060, "询价文件不能为空"),

2
src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java
View File

@ -210,7 +210,7 @@ public class ProjectReEvaluationController {
* @return 返回结果 * @return 返回结果
*/ */
@ApiOperation("查询流程跟踪") @ApiOperation("查询流程跟踪")
@PostMapping("/findTraceDetail/{instanceId}") @GetMapping("/findTraceDetail/{instanceId}")
public BaseResponse<TraceDetail> findTraceDetail(@ApiParam(value = "流程实例id", required = true) @PathVariable("instanceId") String instanceId) { public BaseResponse<TraceDetail> findTraceDetail(@ApiParam(value = "流程实例id", required = true) @PathVariable("instanceId") String instanceId) {
return BaseResponse.success(projectReEvaluationService.findTraceDetail(instanceId)); return BaseResponse.success(projectReEvaluationService.findTraceDetail(instanceId));

3
src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
View File

@ -180,7 +180,6 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class)
public boolean submitForApproval(String id) { public boolean submitForApproval(String id) {
// boolean result = updateStatus(id,ProjectCommonUtil.RE_EVALUATION_STATUS_0,ProjectCommonUtil.RE_EVALUATION_STATUS_2); // boolean result = updateStatus(id,ProjectCommonUtil.RE_EVALUATION_STATUS_0,ProjectCommonUtil.RE_EVALUATION_STATUS_2);
// initSection(id); // initSection(id);
@ -188,7 +187,9 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
//1 去采购系统校验子项目信息是否发生改变 如果发生改变不可以重新评审 //1 去采购系统校验子项目信息是否发生改变 如果发生改变不可以重新评审
ProjectReEvaluation evaluation = this.getById(id); ProjectReEvaluation evaluation = this.getById(id);
ProjectSection section = sectionService.getById(evaluation.getSectionId()); ProjectSection section = sectionService.getById(evaluation.getSectionId());
log.info("重评校验子项目信息请求参数 子项目ID：{}",section.getSubprojectId());
BaseResponse<Boolean> baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId())); BaseResponse<Boolean> baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId()));
log.info("重评校验子项目信息返回结果：{}",JsonUtils.objectToJson(baseResponse));
if(!baseResponse.isSuccess()){ if(!baseResponse.isSuccess()){
CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
} }