1、解决异常处理项目状态不改变

2、增加项目委托初始化信息邀请招标后审校验
This commit is contained in:
dxc
2021-02-24 14:45:34 +08:00
parent ddadd50d1d
commit e9a25210a5
3 changed files with 11 additions and 3 deletions

View File

@ -157,6 +157,8 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert {
FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CODE_EMPTY(110069,"询价应答格式列表数据中类别编码不能为空"), FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CODE_EMPTY(110069,"询价应答格式列表数据中类别编码不能为空"),
FRAME_EXCEPTION_PROJECT_ENTRUST_PURP_IMPLEMENT_NO_EMPTY(110070, "项目委托信息实施项目编号不能为空!"), FRAME_EXCEPTION_PROJECT_ENTRUST_PURP_IMPLEMENT_NO_EMPTY(110070, "项目委托信息实施项目编号不能为空!"),
FRAME_EXCEPTION_PROJECT_ENTRUST_SUPP_QUALIFY_ERROR(110071, "邀请招标资审方式应为后审方式!"),
; ;
/** /**

View File

@ -591,6 +591,12 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_SUPP_QUALIFY_EMPTY.throwException(); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_SUPP_QUALIFY_EMPTY.throwException();
} }
//招标邀请资审方式必须为后审
if(StringUtils.equals(purpBaseInfo.getProjBaseInfoVO().getPurcMode(),EbpProjectCommonUtil.PURC_MODE_002) &&
!StringUtils.equals(purpBaseInfo.getProjBaseInfoVO().getSuppQualify(),EbpProjectCommonUtil.SUPP_QUALIFY_002)){
ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_SUPP_QUALIFY_ERROR.throwException();
}
//比选方式 字典 //比选方式 字典
if(StringUtils.equals(purpBaseInfo.getProjBaseInfoVO().getPurcMode(),EbpProjectCommonUtil.PURC_MODE_005) if(StringUtils.equals(purpBaseInfo.getProjBaseInfoVO().getPurcMode(),EbpProjectCommonUtil.PURC_MODE_005)
&& StringUtils.isEmpty(purpBaseInfo.getProjBaseInfoVO().getComparSelectMode())){ && StringUtils.isEmpty(purpBaseInfo.getProjBaseInfoVO().getComparSelectMode())){

View File

@ -182,12 +182,12 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
projectSectionVO.setProjectId(projectException.getProjectId()); projectSectionVO.setProjectId(projectException.getProjectId());
List<ProjectSection> sectionList = projectSectionService.getList(projectSectionVO); List<ProjectSection> sectionList = projectSectionService.getList(projectSectionVO);
/*标段是否全部废止状态*/
long isAllAbolish = sectionList.stream().filter(n -> n.getStatus() != ProjectCommonUtil.SECTION_STATUS_9).count();
//提取异常标段ID //提取异常标段ID
List<String> sectionExceptionIds = sectionExceptionList.stream().map(ProjectSectionException::getSectionId).collect(Collectors.toList()); List<String> sectionExceptionIds = sectionExceptionList.stream().map(ProjectSectionException::getSectionId).collect(Collectors.toList());
/*标段是否全部废止状态*/
long isAllAbolish = sectionList.stream().filter(n -> !sectionExceptionIds.contains(n.getId())).count();
//获取异常标段信息 //获取异常标段信息
sectionList = sectionList.stream().filter(n -> sectionExceptionIds.contains(n.getId())).collect(Collectors.toList()); sectionList = sectionList.stream().filter(n -> sectionExceptionIds.contains(n.getId())).collect(Collectors.toList());