zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-05-23 14:27:40 +08:00
parent 8651495124
commit 1612bbaf5c
7 changed files with 83 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java
View File

@ -171,7 +171,9 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
//查询项目下的所有申请
List<ZbfProjectSubcontractingApply> applyList = zbfProjectSubcontractingApplyService.list(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
.eq(ZbfProjectSubcontractingApply::getProjectId, projectId)
.eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId()));
.eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId())
.eq(ZbfProjectSubcontractingApply::getApplyStatus, SubcontractingApplyStatus.APPLY.getCode())
);
HashMap<Long, String> map = applyList.stream()
.collect(Collectors.toMap(
ZbfProjectSubcontractingApply::getSubId,
@ -188,22 +190,29 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
for (ZbfProjectSection zbfProjectSection : sectionList) {
//分包处理
List<FbsProjectSubcontractingListVO> subListVO = new ArrayList<>();
//查询标段下的所有的分包
//查询标段下的所有选择的分包
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId())
//.isNull(ZbfProjectSubcontracting::getUserId)
.isNull(ZbfProjectSubcontracting::getUserId)
);
//排除掉已申请的分包
for (ZbfProjectSubcontracting sub : subList) {
//排除掉已申请的分包
if( map.get(sub.getId()) != null){
continue;
}
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
String applyStatus = map.get(sub.getId());
fbsProjectSubcontractingListVO.setApplyStatus(applyStatus);
if (sub.getUserId() != null && !sub.getUserId().equals(SecurityUtils.getAppUserId())) {
fbsProjectSubcontractingListVO.setApplyStatus(SubcontractingApplyStatus.CHOOSE.getCode());
}
// String applyStatus = map.get(sub.getId());
// fbsProjectSubcontractingListVO.setApplyStatus(applyStatus);
// if (sub.getUserId() != null && !sub.getUserId().equals(SecurityUtils.getAppUserId())) {
// fbsProjectSubcontractingListVO.setApplyStatus(SubcontractingApplyStatus.CHOOSE.getCode());
// }
subListVO.add(fbsProjectSubcontractingListVO);
}
if(CollectionUtil.isEmpty(subListVO)){
continue;
}
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
BeanUtil.copyProperties(zbfProjectSection, fbsProjectSectionListVO);
fbsProjectSectionListVO.setSubList(subListVO);
@ -327,7 +336,9 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
//查询项目下的所有申请
List<ZbfProjectSubcontractingApply> applyList = zbfProjectSubcontractingApplyService.list(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
.eq(ZbfProjectSubcontractingApply::getProjectId, projectId)
.eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId()));
.eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId())
.eq(ZbfProjectSubcontractingApply::getApplyStatus, SubcontractingApplyStatus.APPLY.getCode())
);
HashMap<Long, String> map = applyList.stream()
.collect(Collectors.toMap(
ZbfProjectSubcontractingApply::getSubId,
@ -346,20 +357,27 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
//查询标段下的所有的分包
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId())
//.isNull(ZbfProjectSubcontracting::getUserId)
.isNull(ZbfProjectSubcontracting::getUserId)
);
//排除掉已申请的分包
for (ZbfProjectSubcontracting sub : subList) {
for (ZbfProjectSubcontracting sub : subList) {
//排除掉已申请的分包
if (map.get(sub.getId()) != null) {
continue;
}
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
String applyStatus = map.get(sub.getId());
fbsProjectSubcontractingListVO.setApplyStatus(applyStatus);
if (sub.getUserId() != null && !sub.getUserId().equals(SecurityUtils.getAppUserId())) {
fbsProjectSubcontractingListVO.setApplyStatus(SubcontractingApplyStatus.CHOOSE.getCode());
}
// String applyStatus = map.get(sub.getId());
// fbsProjectSubcontractingListVO.setApplyStatus(applyStatus);
// if (sub.getUserId() != null && !sub.getUserId().equals(SecurityUtils.getAppUserId())) {
// fbsProjectSubcontractingListVO.setApplyStatus(SubcontractingApplyStatus.CHOOSE.getCode());
// }
subListVO.add(fbsProjectSubcontractingListVO);
}
if (CollectionUtil.isEmpty(subListVO)) {
continue;
}
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
BeanUtil.copyProperties(zbfProjectSection, fbsProjectSectionListVO);
fbsProjectSectionListVO.setSubList(subListVO);