Merge branch 'dev' into 'master'

增加供应商id不能为空校验修改提示信息

See merge request eshop/biz_service_ebtp_project!29
This commit is contained in:
代兴成
2021-03-28 19:07:26 +08:00
2 changed files with 11 additions and 4 deletions

View File

@ -165,6 +165,8 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert {
FRAME_EXCEPTION_INQUIRY_DELEGATION_CODE_EMPTY(110073,"询价单委托招标代理机构编码不能为空"), FRAME_EXCEPTION_INQUIRY_DELEGATION_CODE_EMPTY(110073,"询价单委托招标代理机构编码不能为空"),
FRAME_EXCEPTION_PROJECT_SECTION_NOT_STATUS(110074, "项目标段信息已经异常处理不可以进行操作!"), FRAME_EXCEPTION_PROJECT_SECTION_NOT_STATUS(110074, "项目标段信息已经异常处理不可以进行操作!"),
FRAME_EXCEPTION_PROJECT_SUPP_REL_VO_LIST_EMPTY(110075, "供应商ID不能为空"),
; ;
/** /**

View File

@ -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.ProjectEntrust;
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustExpand; 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.ProjectEntrustVO;
import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.ProjBaseInfoVO; import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.*;
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.inquiryentity.InquiryNoticeVO; 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.IProjectEntrustExpandService;
import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustService; 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(); 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())&& if(StringUtils.equals(EbpProjectCommonUtil.BUSINESS_TYPE_001,purpSuperVo.getBusinessType())&&
StringUtils.isEmpty((purpBaseInfo.getProjBaseInfoVO().getFundOrign()))){ StringUtils.isEmpty((purpBaseInfo.getProjBaseInfoVO().getFundOrign()))){