liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'pro'

Browse Source 
合并请求

See merge request eshop/biz_service_ebtp_project!33
This commit is contained in:
代兴成
2021-04-01 10:54:03 +08:00
parent c743b17487 d1b3874048
commit 515e7d5dc3
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
View File

@ -255,7 +255,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
Map<String,String> sectionMaps = projectSectionService.getFlowList(id); Map<String,String> sectionMaps = projectSectionService.getFlowList(id);
//当项目不是单一来源简化流程 初始化评审流程 //当项目不是单一来源简化流程 初始化评审流程
if(!(StringUtils.equals(projectRecord.getBidMethodSubDict(),ProjectCommonUtil.PROCUREMENT_MODE_6) && StringUtils.equals(projectRecord.getIsApproval(),ProjectCommonUtil.IS_APPROVAL_1))){ 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)); log.info("初始化流程调用方法 projectID："+id + " isReviewMethod："+isReviewMethod + " sectionMaps："+JsonUtils.objectToJson(sectionMaps));
initialize(id, isReviewMethod, sectionMaps); initialize(id, isReviewMethod, sectionMaps);
} }
@ -303,12 +303,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
SectionSupplierVO supplierVO = new SectionSupplierVO(); SectionSupplierVO supplierVO = new SectionSupplierVO();
supplierVO.setProjectId(projectRecord.getId()); supplierVO.setProjectId(projectRecord.getId());
List<SectionSupplier> resultList = sectionSupplierService.getList(supplierVO); List<SectionSupplier> resultList = sectionSupplierService.getList(supplierVO);
log.info("调用邀请方式供应商初始化接口参数：{}",JsonUtils.objectToJson(resultList));
Integer code = ebtpMallBidApi.entrustInsert(JsonUtils.jsonToList(resultList,SectionSupplierVO.class)).getCode(); BaseResponse<Boolean> baseResponse= ebtpMallBidApi.entrustInsert(JsonUtils.jsonToList(resultList,SectionSupplierVO.class));
log.info("调用邀请方式供应商初始化返回结果：{}",JsonUtils.objectToJson(baseResponse));
if(code != ResponseEnum.SUCCESS.getCode()){ ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_SUPPLIER_ERROR.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_SUPPLIER_ERROR.throwException();
}
} }
} }