From e3dff45ca3a5a7f7d9d4a6a419b18523807153aa Mon Sep 17 00:00:00 2001 From: dxc Date: Wed, 11 Aug 2021 13:39:59 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=B8=80?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E7=AE=80=E5=8C=96=E7=89=88=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E8=AF=84=E5=AE=A1=E5=AE=A4=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/feign/EbtpMallProcessApi.java | 10 +++++++ .../impl/ProjectExceptionServiceImpl.java | 8 +++++- .../service/IProjectRecordService.java | 8 ++++++ .../impl/ProjectRecordServiceImpl.java | 27 ++++++++++++++----- 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java index 5d0f3de..52fcb95 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpMallProcessApi.java @@ -7,6 +7,7 @@ import com.chinaunicom.mall.ebtp.project.feign.entity.BizAssessRoom; import com.chinaunicom.mall.ebtp.project.feign.entity.DictProjectConfig; import com.chinaunicom.mall.ebtp.project.feign.entity.WfProjectConfigTask; import com.chinaunicom.mall.ebtp.project.feign.fallback.EbtpMallProcessClientFallback; +import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -82,4 +83,13 @@ public interface EbtpMallProcessApi { @PostMapping("/v1/bizassessroom/inquiry/initialize") BaseResponse inquiryInitialize(@RequestParam(name = "tpId") String tpId,@RequestBody Map sectionMap,@RequestParam(name="openTime") String openTime); + /** + * 单一来源简化版评审室信息初始化 + * @param tpId 项目Id + * @param sectionId 标包信息 + * @return + */ + @PostMapping("/v1/bizassessroom/simple/initialize") + public BaseResponse simpleInitialize(@ApiParam(value = "项目Id", required = true) @RequestParam(name = "tpId") String tpId, + @ApiParam(value = "标包Id", required = true) @RequestParam(name = "sectionIds") List sectionId); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java index 1e27be6..65ca2ee 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java @@ -436,7 +436,13 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl{ */ boolean isReviewMethod(ProjectRecord projectRecord); + /** + * 单一来源简化版评审室信息初始化 + * @param id 项目Id + * @param sectionId 标包信息 + * @return + */ + void simpleInitialize(String id, List sectionId); + /** * 初始化标段评审流程 * @param id 项目ID diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index c5eae99..f7e474f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -267,17 +267,18 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionMaps = projectSectionService.getFlowList(id); + List sectionIds = new ArrayList<>(); + + sectionMaps.forEach((key,value) -> sectionIds.add(key)); //当项目不是单一来源简化流程 初始化评审流程 - if(!(StringUtils.equals(projectRecord.getBidMethodDict(),ProjectCommonUtil.PROCUREMENT_MODE_6) && StringUtils.equals(projectRecord.getIsApproval(),ProjectCommonUtil.IS_APPROVAL_1))){ - log.info("初始化流程调用方法 projectID："+id + " isReviewMethod："+isReviewMethod + " sectionMaps："+JsonUtils.objectToJson(sectionMaps)); + if(StringUtils.equals(projectRecord.getBidMethodDict(),ProjectCommonUtil.PROCUREMENT_MODE_9)){ + simpleInitialize(id,sectionIds); + }else{ initialize(id, isReviewMethod, sectionMaps); } - List sectionIds = new ArrayList<>(); - //插入标段变更记录 - sectionMaps.forEach((key,value) -> sectionIds.add(key)); sectionFlowService.saveSectionList(sectionIds,ProjectCommonUtil.BUSINESS_MODULE_1,businessModule); //初始化邀请调用 initInvitation(projectRecord); @@ -325,6 +326,20 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionId) { + log.info("单一来源初始化流程调用方法 projectID：{} sectionId：{}",id,JsonUtils.objectToJson(sectionId)); + BaseResponse result = ebtpMallProcessApi.simpleInitialize(id,sectionId); + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_ERROR.customValid(!result.isSuccess()); + log.info("单一来源初始化流程返回 projectID："+id + " 返回结果："+JsonUtils.objectToJson(result)); + } + /** * 初始化标段评审流程 * @param id 项目ID @@ -333,7 +348,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl sectionMaps) { - + log.info("初始化流程调用方法 projectID："+id + " isReviewMethod："+isReviewMethod + " sectionMaps："+JsonUtils.objectToJson(sectionMaps)); BaseResponse result = ebtpMallProcessApi.initialize(id,sectionMaps,isReviewMethod); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_ERROR.customValid(!result.isSuccess()); log.info("初始化流程返回 projectID："+id + " 返回结果："+JsonUtils.objectToJson(result));