Merge branch 'master' into 'pro'
增加供应商id不能为空校验修改提示信息 See merge request eshop/biz_service_ebtp_project!30
This commit is contained in:
@ -165,6 +165,8 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert {
|
||||
FRAME_EXCEPTION_INQUIRY_DELEGATION_CODE_EMPTY(110073,"询价单委托招标代理机构编码不能为空"),
|
||||
|
||||
FRAME_EXCEPTION_PROJECT_SECTION_NOT_STATUS(110074, "项目标段信息已经异常处理不可以进行操作!"),
|
||||
|
||||
FRAME_EXCEPTION_PROJECT_SUPP_REL_VO_LIST_EMPTY(110075, "供应商ID不能为空!"),
|
||||
;
|
||||
|
||||
/**
|
||||
|
@ -23,10 +23,7 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.dao.ProjectEntrustMapper
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrust;
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustExpand;
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustVO;
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.ProjBaseInfoVO;
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpBaseInfoVO;
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpImplementSendVO;
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpSuperVO;
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.*;
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryNoticeVO;
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustExpandService;
|
||||
import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustService;
|
||||
@ -578,6 +575,14 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
|
||||
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_SUBOR_PROVINCE_EMPTY.throwException();
|
||||
}
|
||||
|
||||
List<ProjSuppRelVO> projSuppRelVOList = purpBaseInfo.getProjBaseInfoVO().getProjSuppRelVOList();
|
||||
if(null != projSuppRelVOList && projSuppRelVOList.size() > 0){
|
||||
Long suppIdCount = projSuppRelVOList.stream().filter(n -> null == n.getSuppId()).count();
|
||||
if(suppIdCount > 0){
|
||||
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SUPP_REL_VO_LIST_EMPTY.throwException();
|
||||
}
|
||||
}
|
||||
|
||||
//资金来源 寻源业务
|
||||
if(StringUtils.equals(EbpProjectCommonUtil.BUSINESS_TYPE_001,purpSuperVo.getBusinessType())&&
|
||||
StringUtils.isEmpty((purpBaseInfo.getProjBaseInfoVO().getFundOrign()))){
|
||||
|
@ -213,7 +213,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
@GlobalTransactional(rollbackFor = Exception.class)
|
||||
@GlobalTransactional(rollbackFor = Exception.class,timeoutMills = 60000 * 2)
|
||||
public boolean callbackApproval(WasUpdateBizDTO dto) {
|
||||
boolean result = false;
|
||||
if(StringUtils.equals(EbpProjectCommonUtil.CALLBACK_APPROVAL_STATUS_YES,dto.getAuditState())){
|
||||
|
@ -131,12 +131,12 @@ hystrix:
|
||||
thread:
|
||||
timeoutInMilliseconds: 200000 #熔断超时时间
|
||||
circuitBreaker:
|
||||
sleepWindowInMilliseconds: 20000
|
||||
sleepWindowInMilliseconds: 200000
|
||||
forceClosed: true
|
||||
|
||||
ribbon:
|
||||
ReadTimeout: 20000 #请求处理的超时时间
|
||||
ConnectTimeout: 20000 #请求连接超时时间
|
||||
ReadTimeout: 200000 #请求处理的超时时间
|
||||
ConnectTimeout: 200000 #请求连接超时时间
|
||||
MaxAutoRetries: 0 #对当前实例的重试次数
|
||||
MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1
|
||||
|
||||
|
Reference in New Issue
Block a user