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

Merge branch 'dev' into 'master'

Browse Source 
1、增加异常处理发布才能选择的标段过滤

See merge request eshop/biz_service_ebtp_project!22
This commit is contained in:
代兴成
2021-03-25 12:31:37 +08:00
parent 79ec1a4e4b 266d528c0a
commit 6125078dbd
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml
View File

@ -144,6 +144,7 @@
select t.id, select t.id,
t.bid_sect_name as bidSectName, t.bid_sect_name as bidSectName,
t.bid_sect_biz_num as bidSectBizNum, t.bid_sect_biz_num as bidSectBizNum,
t.business_module as businessModule,
t.status as status t.status as status
from biz_project_section t from biz_project_section t
where t.project_id = ${projectId} where t.project_id = ${projectId}
@ -156,6 +157,7 @@
(case when e.id is not null then '1' else '0' end) as isExceptionCheck, (case when e.id is not null then '1' else '0' end) as isExceptionCheck,
t.bid_sect_name as bidSectName, t.bid_sect_name as bidSectName,
t.bid_sect_biz_num as bidSectBizNum, t.bid_sect_biz_num as bidSectBizNum,
t.business_module as businessModule,
t.status as status t.status as status
from biz_project_section t from biz_project_section t
left join biz_project_section_exception e on e.section_id = t.id and e.exception_id = ${exceptionId} left join biz_project_section_exception e on e.section_id = t.id and e.exception_id = ${exceptionId}
@ -170,6 +172,7 @@
select t.id, select t.id,
t.bid_sect_name as bidSectName, t.bid_sect_name as bidSectName,
t.bid_sect_biz_num as bidSectBizNum, t.bid_sect_biz_num as bidSectBizNum,
t.business_module as businessModule,
t.status as status t.status as status
from biz_project_section t,biz_project_section_exception e from biz_project_section t,biz_project_section_exception e
where e.section_id = t.id where e.section_id = t.id

6
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
View File

@ -488,7 +488,7 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
boolean isReviewMethod = recordService.isReviewMethod(recordService.getById(projectId)); boolean isReviewMethod = recordService.isReviewMethod(recordService.getById(projectId));
//项目异常新增 //项目异常新增
List<ProjectSectionVO> sectionVOList = projectSectionMapper.selectEditSectionBySave(projectId); List<ProjectSectionVO> sectionVOList = projectSectionMapper.selectEditSectionBySave(projectId);
sectionVOList.stream().filter(n -> (n.getStatus() > (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) sectionVOList.stream().filter(n -> (n.getBusinessModule() > (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7)
&& n.getStatus() < ProjectCommonUtil.BUSINESS_MODULE_12)).collect(Collectors.toList()); && n.getStatus() < ProjectCommonUtil.BUSINESS_MODULE_12)).collect(Collectors.toList());
return sectionVOList; return sectionVOList;
} }
@ -499,8 +499,8 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
//项目异常修改 //项目异常修改
List<ProjectSectionVO> sectionVOList = projectSectionMapper.selectEditSectionByUpdate(projectId, exceptionId); List<ProjectSectionVO> sectionVOList = projectSectionMapper.selectEditSectionByUpdate(projectId, exceptionId);
sectionVOList.stream().filter(n -> !(n.getIsExceptionCheck() == ProjectCommonUtil.IS_EXCEPTION_CHECK_1 sectionVOList.stream().filter(n -> !(n.getIsExceptionCheck() == ProjectCommonUtil.IS_EXCEPTION_CHECK_1
&& (n.getStatus() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) && (n.getBusinessModule() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7)
&& n.getStatus() >= ProjectCommonUtil.BUSINESS_MODULE_12))).collect(Collectors.toList()); && n.getBusinessModule() >= ProjectCommonUtil.BUSINESS_MODULE_12))).collect(Collectors.toList());
return sectionVOList; return sectionVOList;
} }