1、增加单一来源简化版初始化评审室方法

This commit is contained in:
dxc
2021-08-11 13:39:59 +08:00
parent a4a13354ea
commit e3dff45ca3
4 changed files with 46 additions and 7 deletions

View File

@ -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<Boolean> inquiryInitialize(@RequestParam(name = "tpId") String tpId,@RequestBody Map<String,String> sectionMap,@RequestParam(name="openTime") String openTime);
/**
* 单一来源简化版评审室信息初始化
* @param tpId 项目Id
* @param sectionId 标包信息
* @return
*/
@PostMapping("/v1/bizassessroom/simple/initialize")
public BaseResponse<Boolean> simpleInitialize(@ApiParam(value = "项目Id", required = true) @RequestParam(name = "tpId") String tpId,
@ApiParam(value = "标包Id", required = true) @RequestParam(name = "sectionIds") List<String> sectionId);
}

View File

@ -436,7 +436,13 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
callEbtpMallBidApi(projectRecord, sectionSupplierList);
//出始化标段评审室信息
callInitialize(projectRecord.getId(), isReviewMethod);
if(StringUtils.equals(projectRecord.getBidMethodDict(),ProjectCommonUtil.PROCUREMENT_MODE_9)){
projectRecordService.simpleInitialize(projectRecord.getId(),
sectionList.stream().map(ProjectSection::getId).collect(Collectors.toList()));
}else{
callInitialize(projectRecord.getId(), isReviewMethod);
}
}

View File

@ -93,6 +93,14 @@ public interface IProjectRecordService extends IBaseService<ProjectRecord>{
*/
boolean isReviewMethod(ProjectRecord projectRecord);
/**
* 单一来源简化版评审室信息初始化
* @param id 项目Id
* @param sectionId 标包信息
* @return
*/
void simpleInitialize(String id, List<String> sectionId);
/**
* 初始化标段评审流程
* @param id 项目ID

View File

@ -267,17 +267,18 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValid(!result);
Map<String,String> sectionMaps = projectSectionService.getFlowList(id);
List<String> 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<String> 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<ProjectRecordMappe
}
/**
* 单一来源初始化标段评审流程
* @param id 项目ID
* @param sectionId 流程ID集合
*/
@Override
public void simpleInitialize(String id, List<String> sectionId) {
log.info("单一来源初始化流程调用方法 projectID{} sectionId{}",id,JsonUtils.objectToJson(sectionId));
BaseResponse<Boolean> 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<ProjectRecordMappe
*/
@Override
public void initialize(String id, boolean isReviewMethod, Map<String, String> sectionMaps) {
log.info("初始化流程调用方法 projectID"+id + " isReviewMethod"+isReviewMethod + " sectionMaps"+JsonUtils.objectToJson(sectionMaps));
BaseResponse<Boolean> result = ebtpMallProcessApi.initialize(id,sectionMaps,isReviewMethod);
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_ERROR.customValid(!result.isSuccess());
log.info("初始化流程返回 projectID"+id + " 返回结果:"+JsonUtils.objectToJson(result));