Merge branch 'master' into 'pro'
合并请求 See merge request eshop/biz_service_ebtp_project!33
This commit is contained in:
@ -255,7 +255,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
|
||||
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));
|
||||
initialize(id, isReviewMethod, sectionMaps);
|
||||
}
|
||||
@ -303,12 +303,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
|
||||
SectionSupplierVO supplierVO = new SectionSupplierVO();
|
||||
supplierVO.setProjectId(projectRecord.getId());
|
||||
List<SectionSupplier> resultList = sectionSupplierService.getList(supplierVO);
|
||||
|
||||
Integer code = ebtpMallBidApi.entrustInsert(JsonUtils.jsonToList(resultList,SectionSupplierVO.class)).getCode();
|
||||
|
||||
if(code != ResponseEnum.SUCCESS.getCode()){
|
||||
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_SUPPLIER_ERROR.throwException();
|
||||
}
|
||||
log.info("调用邀请方式供应商初始化接口参数:{}",JsonUtils.objectToJson(resultList));
|
||||
BaseResponse<Boolean> baseResponse= ebtpMallBidApi.entrustInsert(JsonUtils.jsonToList(resultList,SectionSupplierVO.class));
|
||||
log.info("调用邀请方式供应商初始化返回结果:{}",JsonUtils.objectToJson(baseResponse));
|
||||
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_SUPPLIER_ERROR.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user