From 7efb907b0d19617490349e545a5021da0c58ea28 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Tue, 23 Mar 2021 16:04:16 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=87=8D=E8=AF=84=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=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<TraceDetail> 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<ProjectReEva
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @GlobalTransactional(rollbackFor = Exception.class)
     public boolean submitForApproval(String id) {
 //        boolean result = updateStatus(id,ProjectCommonUtil.RE_EVALUATION_STATUS_0,ProjectCommonUtil.RE_EVALUATION_STATUS_2);
 //        initSection(id);
@@ -188,7 +187,9 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
         //1 去采购系统校验子项目信息是否发生改变  如果发生改变不可以重新评审
         ProjectReEvaluation evaluation = this.getById(id);
         ProjectSection section = sectionService.getById(evaluation.getSectionId());
+        log.info("重评校验子项目信息请求参数 子项目ID：{}",section.getSubprojectId());
         BaseResponse<Boolean> 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());
         }