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-04-14 16:06:50 +08:00
parent b52be6eeab
commit f80a9b6e39
16 changed files with 184 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-system/src/main/java/com/ruoyi/zbf/service/IZbfProjectSubcontractingApplyService.java
View File

@ -65,5 +65,9 @@ public interface IZbfProjectSubcontractingApplyService extends IServicePlus<ZbfP
*/
TableDataInfo<ZbfProjectSubcontractingApplyListVO> getFbsList(ZbfProjectSubApplyListDTO dto);
/**
* 根据分包商Id和分包ID查询申请
*/
ZbfProjectSubcontractingApply queryBySubIdAndFbsUserId(Long subId, Long fbsUserId);
}

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

@ -220,7 +220,8 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
.eq(ZbfProjectSubcontractingApply::getProjectId, projectId)
.eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId())
.in(ZbfProjectSubcontractingApply::getApplyStatus, SubcontractingApplyStatus.getApplyStatus()));
List<Long> applyIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSubId).collect(Collectors.toList());
Map<Long, String> map = applyList.stream().collect(Collectors.toMap(ZbfProjectSubcontractingApply::getSubId, ZbfProjectSubcontractingApply::getApplyStatus));
//标段处理
List<FbsProjectSectionListVO> sectionListVO = new ArrayList<>();
@ -235,11 +236,12 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId()));
//排除掉未申请和已同意的分包
for (ZbfProjectSubcontracting sub : subList) {
if (!applyIds.contains(sub.getId())) {
if (map.get(sub.getId()) == null) {
continue;
}
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
fbsProjectSubcontractingListVO.setApplyStatus(map.get(sub.getId()));
subListVO.add(fbsProjectSubcontractingListVO);
}
if (CollectionUtil.isEmpty(subListVO)) {
@ -485,6 +487,8 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
for (ZbfProjectSubcontracting sub : subList) {
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
//写死 已加入和已竣工的申请状态都是已同意
fbsProjectSubcontractingListVO.setApplyStatus(SubcontractingApplyStatus.PASS.getCode());
subListVO.add(fbsProjectSubcontractingListVO);
}
if (CollectionUtil.isEmpty(subListVO)) {
@ -617,14 +621,14 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
.eq(ZbfProjectSection::getProjectId, zbfProjectListVO.getId()));
for (ZbfProjectSection zbfProjectSection : sectionList) {
//分包处理
List<ZbfProjectSubcontractingListVO> subListVO = new ArrayList<>();
//查询标段下的所有的分包
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId()));
List<ZbfProjectSubcontractingListVO> zbfProjectSubcontractingListVOS = BeanUtil.copyToList(subList, ZbfProjectSubcontractingListVO.class);
ZbfProjectSectionListVO zbfProjectSectionListVO = new ZbfProjectSectionListVO();
BeanUtil.copyProperties(zbfProjectSection, zbfProjectSectionListVO);
zbfProjectSectionListVO.setSubList(subListVO);
zbfProjectSectionListVO.setSubList(zbfProjectSubcontractingListVOS);
sectionListVO.add(zbfProjectSectionListVO);
}
zbfProjectListVO.setSectionList(sectionListVO);

10
ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectSubcontractingApplyServiceImpl.java
View File

@ -251,4 +251,14 @@ public class ZbfProjectSubcontractingApplyServiceImpl extends ServicePlusImpl<Zb
Page<ZbfProjectSubcontractingApplyListVO> fbsList = baseMapper.getFbsList(queryDTOPage, dto);
return PageUtils.buildDataInfo(fbsList);
}
@Override
public ZbfProjectSubcontractingApply queryBySubIdAndFbsUserId(Long subId, Long fbsUserId) {
LambdaQueryWrapper<ZbfProjectSubcontractingApply> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ZbfProjectSubcontractingApply::getSubId, subId);
wrapper.eq(ZbfProjectSubcontractingApply::getFbsUserId, fbsUserId);
wrapper.orderByDesc(ZbfProjectSubcontractingApply::getId);
List<ZbfProjectSubcontractingApply> list = baseMapper.selectList(wrapper);
return CollectionUtil.getFirst(list);
}
}