From e9ac3f375ac7e075c6d14352093aea09187e4e68 Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 23 Mar 2021 10:48:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E9=87=8D=E8=AF=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/project/common/ProjectExceptionEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java index 07df1a4..cfb5fe4 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java @@ -134,7 +134,7 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert { 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, "询价文件不能为空"), From 7efb907b0d19617490349e545a5021da0c58ea28 Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 23 Mar 2021 16:04:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E9=87=8D=E8=AF=84=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectReEvaluationController.java | 2 +- .../service/impl/ProjectReEvaluationServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java index 5323446..0a1c070 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/controller/ProjectReEvaluationController.java @@ -210,7 +210,7 @@ public class ProjectReEvaluationController { * @return 返回结果 */ @ApiOperation("查询流程跟踪") - @PostMapping("/findTraceDetail/{instanceId}") + @GetMapping("/findTraceDetail/{instanceId}") public BaseResponse findTraceDetail(@ApiParam(value = "流程实例id", required = true) @PathVariable("instanceId") String instanceId) { return BaseResponse.success(projectReEvaluationService.findTraceDetail(instanceId)); 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 1a6f32b..ce41e95 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 @@ -180,7 +180,6 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId())); + log.info("重评校验子项目信息返回结果：{}",JsonUtils.objectToJson(baseResponse)); if(!baseResponse.isSuccess()){ CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess()); }