From 2fccec826ce186cb087434ab8a9364801bab6983 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Fri, 5 Mar 2021 14:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E7=9A=84=E6=A0=87=E6=AE=B5=E5=92=8C=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=AF=B9=E5=BA=94=E4=B8=8D=E4=B8=8A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectReEvaluationServiceImpl.java  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

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 f4a3f91..7a2eb98 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,31 +182,31 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
     @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);
+//        boolean result = updateStatus(id,ProjectCommonUtil.RE_EVALUATION_STATUS_0,ProjectCommonUtil.RE_EVALUATION_STATUS_2);
+//        initSection(id);
 
-//        //1 去采购系统校验子项目信息是否发生改变  如果发生改变不可以重新评审
-//        ProjectReEvaluation evaluation = this.getById(id);
-//        ProjectSection section = sectionService.getById(evaluation.getSectionId());
-//        BaseResponse<Boolean> baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId()));
-//        if(!baseResponse.isSuccess()){
-//            CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
-//        }
-//        if(!baseResponse.getData()){
-//            ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR.throwException();
-//        }
-//
-//        //3、调用流程中心 发起重新评审流程
-//        ProjectReEvaluationTaskVO reEvaluationTaskVO = reEvalStart(id);
-//
-//        //修改异常信息进行提交
-//        UpdateWrapper<ProjectReEvaluation> updateWrapper = new UpdateWrapper<>();
-//        updateWrapper.eq(ProjectReEvaluationField.ID,id);
-//        updateWrapper.eq(ProjectReEvaluationField.STATUS, ProjectCommonUtil.RE_EVALUATION_STATUS_0);
-//        updateWrapper.set(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_1);
-//        updateWrapper.set(ProjectReEvaluationField.INSTANCE_ID,reEvaluationTaskVO.getInstanceId());
-//        boolean result = this.update(updateWrapper);
-//        CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValid(!result);
+        //1 去采购系统校验子项目信息是否发生改变  如果发生改变不可以重新评审
+        ProjectReEvaluation evaluation = this.getById(id);
+        ProjectSection section = sectionService.getById(evaluation.getSectionId());
+        BaseResponse<Boolean> baseResponse = mallResuApi.findStatusByPurpIdForEval(Long.parseLong(section.getSubprojectId()));
+        if(!baseResponse.isSuccess()){
+            CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
+        }
+        if(!baseResponse.getData()){
+            ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR.throwException();
+        }
+
+        //3、调用流程中心 发起重新评审流程
+        ProjectReEvaluationTaskVO reEvaluationTaskVO = reEvalStart(id);
+
+        //修改异常信息进行提交
+        UpdateWrapper<ProjectReEvaluation> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq(ProjectReEvaluationField.ID,id);
+        updateWrapper.eq(ProjectReEvaluationField.STATUS, ProjectCommonUtil.RE_EVALUATION_STATUS_0);
+        updateWrapper.set(ProjectReEvaluationField.STATUS,ProjectCommonUtil.RE_EVALUATION_STATUS_1);
+        updateWrapper.set(ProjectReEvaluationField.INSTANCE_ID,reEvaluationTaskVO.getInstanceId());
+        boolean result = this.update(updateWrapper);
+        CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValid(!result);
         return result;
     }