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、修改异常处理发布才能选择的标段过滤bug

See merge request eshop/biz_service_ebtp_project!23
This commit is contained in:
代兴成
2021-03-25 13:10:32 +08:00
parent 6125078dbd 1b6230312b
commit eb004e56a5
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java
View File

@ -494,7 +494,7 @@ public class ProjectCommonUtil {
public static final int INQUIRY_NOTICE_STATUS_2 = 2; public static final int INQUIRY_NOTICE_STATUS_2 = 2;
/** /**
* 异常处理标段是否被选中 1 否 * 异常处理标段是否被选中 1 选中
*/ */
public static final int IS_EXCEPTION_CHECK_1 = 1; public static final int IS_EXCEPTION_CHECK_1 = 1;

2
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java
View File

@ -31,7 +31,7 @@ public class ProjectSectionVO extends ProjectSection implements Serializable {
private BasePageRequest basePageRequest; private BasePageRequest basePageRequest;
/** /**
* 是否被选中 0 是 1 否 * 是否被选中 0 不选中 1 选中
*/ */
@ApiModelProperty(value = "是否被选中 0 不选中 1 选中") @ApiModelProperty(value = "是否被选中 0 不选中 1 选中")
private Integer isExceptionCheck; private Integer isExceptionCheck;

9
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.getBusinessModule() > (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) sectionVOList = 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;
} }
@ -498,9 +498,10 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
boolean isReviewMethod = recordService.isReviewMethod(recordService.getById(projectId)); boolean isReviewMethod = recordService.isReviewMethod(recordService.getById(projectId));
//项目异常修改 //项目异常修改
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 = sectionVOList.stream().filter(n -> !(
&& (n.getBusinessModule() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) n.getIsExceptionCheck() != ProjectCommonUtil.IS_EXCEPTION_CHECK_1 //不选中状态and(标段在发布之前的流程and归档流程)
&& n.getBusinessModule() >= ProjectCommonUtil.BUSINESS_MODULE_12))).collect(Collectors.toList()); && (n.getBusinessModule() <= (isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2 : ProjectCommonUtil.BUSINESS_MODULE_7) && n.getBusinessModule() >= ProjectCommonUtil.BUSINESS_MODULE_12)
)).collect(Collectors.toList());
return sectionVOList; return sectionVOList;
} }