From bb3acc6bbe344bbe859c3e7b326d6eb067626901 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Thu, 4 Mar 2021 16:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AF=84=E5=AE=A1=20?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=A2=9E=E5=8A=A0=E9=87=87=E8=B4=AD=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/ProjectReEvaluationMapper.xml              | 3 ++-
 .../projectreevaluation/entity/ProjectReEvaluationVO.java | 3 +++
 .../service/impl/ProjectReEvaluationServiceImpl.java      | 8 +++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml
index 0d83cd4..61758e9 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/dao/mapper/ProjectReEvaluationMapper.xml
@@ -48,7 +48,8 @@
             p.project_name as projectName,
             p.ebp_project_number as ebpProjectNumber,
             s.bid_sect_biz_num as bidSectBizNum,
-            s.bid_sect_name as bidSectName
+            s.bid_sect_name as bidSectName,
+            p.bid_method_dict as bidMethodDict
         FROM
             biz_project_re_evaluation t,
             biz_project_section s,
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java
index 2f793aa..6524ed0 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/entity/ProjectReEvaluationVO.java
@@ -50,4 +50,7 @@ public class ProjectReEvaluationVO extends ProjectReEvaluation implements Serial
     @ApiModelProperty(value = "标段名称")
     private String bidSectName;
 
+    @ApiModelProperty(value = "招标方式字典编号")
+    private String bidMethodDict;
+
 }
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 1c2e625..f4a3f91 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
@@ -182,9 +182,8 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
     public boolean submitForApproval(String id) {
-
-        initSection(id);
         boolean result = updateStatus(id,ProjectCommonUtil.RE_EVALUATION_STATUS_0,ProjectCommonUtil.RE_EVALUATION_STATUS_2);
+        initSection(id);
 
 //        //1 去采购系统校验子项目信息是否发生改变  如果发生改变不可以重新评审
 //        ProjectReEvaluation evaluation = this.getById(id);
@@ -217,12 +216,11 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
     public boolean callbackApproval(WasUpdateBizDTO dto) {
         boolean result = false;
         if(StringUtils.equals(EbpProjectCommonUtil.CALLBACK_APPROVAL_STATUS_YES,dto.getAuditState())){
-            initSection(dto.getId());
             result = updateStatus(dto.getId(),ProjectCommonUtil.RE_EVALUATION_STATUS_1,ProjectCommonUtil.RE_EVALUATION_STATUS_2);
+            initSection(dto.getId());
         }else if(StringUtils.equals(EbpProjectCommonUtil.CALLBACK_APPROVAL_STATUS_NO,dto.getAuditState())){
             result = updateStatus(dto.getId(),ProjectCommonUtil.RE_EVALUATION_STATUS_1,ProjectCommonUtil.RE_EVALUATION_STATUS_9);
         }
-
         return result;
     }
 
@@ -366,7 +364,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
         int roomSort = 1;
         log.info("xid:"+ RootContext.getXID());
         //初始化评审室信息
-        log.info("初始化评审 请求参数："+ evaluation.getProjectId(), evaluation.getSectionId(), roomSort);
+        log.info("初始化评审 请求参数ProjectId："+ evaluation.getProjectId()+ " SectionId：" + evaluation.getSectionId(), roomSort);
         BaseResponse<AgainRoomVO> response = mallProcessApi.againinitialize(evaluation.getProjectId(), evaluation.getSectionId(), roomSort);
         ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(response.getMessage(),!response.isSuccess());
         log.info("初始化评审 返回结果："+ JsonUtils.objectToJson(response));