This commit is contained in:
zt
2025-03-27 10:44:14 +08:00
parent 1972e3e4f4
commit 4027127dfd
64 changed files with 3303 additions and 135 deletions

View File

@ -3,6 +3,9 @@ package com.ruoyi.zbf.service;
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.fbs.domain.dto.FbsProjectListDTO;
import com.ruoyi.fbs.domain.vo.FbsProjectDetailVO;
import com.ruoyi.fbs.domain.vo.FbsProjectListVO;
import com.ruoyi.zbf.bo.ZbfProjectQueryBo;
import com.ruoyi.zbf.domain.ZbfProject;
@ -53,4 +56,40 @@ public interface IZbfProjectService extends IServicePlus<ZbfProject> {
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 查询分包商可报名项目列表
*/
TableDataInfo<FbsProjectListVO> signUpList(FbsProjectListDTO dto);
/**
* 查询分包商申请中的项目列表
*/
TableDataInfo<FbsProjectListVO> applyList(FbsProjectListDTO dto);
/**
* 查询分包商已加入的项目列表
*/
TableDataInfo<FbsProjectListVO> joinList(FbsProjectListDTO dto);
/**
* 查询分包商已竣工的项目列表
*/
TableDataInfo<FbsProjectListVO> completeList(FbsProjectListDTO dto);
/**
* 分包商查看可报名项目详情
*/
FbsProjectDetailVO signUpDetail(Long projectId);
/**
* 分包商查看已申请项目详情
*/
FbsProjectDetailVO applyDetail(Long projectId);
/**
* 分包商查看已加入或已竣工项目详情
*/
FbsProjectDetailVO joinOrCompleteDetail(Long projectId);
}

View File

@ -0,0 +1,55 @@
package com.ruoyi.zbf.service;
import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
import com.ruoyi.zbf.bo.ZbfProjectSubcontractingApplyQueryBo;
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.Collection;
import java.util.List;
/**
* 总包方项目分包申请Service接口
*
* @author ruoyi
* @date 2025-03-26
*/
public interface IZbfProjectSubcontractingApplyService extends IServicePlus<ZbfProjectSubcontractingApply> {
/**
* 查询单个
* @return
*/
ZbfProjectSubcontractingApply queryById(Long id);
/**
* 查询列表
*/
TableDataInfo<ZbfProjectSubcontractingApply> queryPageList(ZbfProjectSubcontractingApplyQueryBo bo);
/**
* 查询列表
*/
List<ZbfProjectSubcontractingApply> queryList(ZbfProjectSubcontractingApplyQueryBo bo);
/**
* 根据新增业务对象插入总包方项目分包申请
* @param bo 总包方项目分包申请新增业务对象
* @return
*/
Boolean insert(ZbfProjectSubcontractingApply bo);
/**
* 根据编辑业务对象修改总包方项目分包申请
* @param bo 总包方项目分包申请编辑业务对象
* @return
*/
Boolean update(ZbfProjectSubcontractingApply bo);
/**
* 校验并删除数据
* @param ids 主键集合
* @param isValid 是否校验,true-删除前校验,false-不校验
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@ -1,22 +1,39 @@
package com.ruoyi.zbf.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.SubcontractingApplyStatus;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.fbs.domain.dto.FbsProjectListDTO;
import com.ruoyi.fbs.domain.vo.FbsProjectDetailVO;
import com.ruoyi.fbs.domain.vo.FbsProjectListVO;
import com.ruoyi.fbs.domain.vo.FbsProjectSectionListVO;
import com.ruoyi.fbs.domain.vo.FbsProjectSubcontractingListVO;
import com.ruoyi.zbf.bo.ZbfProjectQueryBo;
import com.ruoyi.zbf.domain.ZbfProject;
import com.ruoyi.zbf.domain.ZbfProjectSection;
import com.ruoyi.zbf.domain.ZbfProjectSubcontracting;
import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
import com.ruoyi.zbf.mapper.ZbfProjectMapper;
import com.ruoyi.zbf.service.IZbfProjectSectionService;
import com.ruoyi.zbf.service.IZbfProjectService;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingApplyService;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 总包方项目Service业务层处理
@ -27,6 +44,13 @@ import java.util.Map;
@Service
public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, ZbfProject> implements IZbfProjectService {
@Autowired
private IZbfProjectSectionService zbfProjectSectionService;
@Autowired
private IZbfProjectSubcontractingService zbfProjectSubcontractingService;
@Autowired
private IZbfProjectSubcontractingApplyService zbfProjectSubcontractingApplyService;
@Override
public ZbfProject queryById(Long id){
return getById(id);
@ -87,4 +111,267 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
}
return removeByIds(ids);
}
@Override
public TableDataInfo<FbsProjectListVO> signUpList(FbsProjectListDTO dto) {
Page<FbsProjectListDTO> queryDTOPage = new Page<>();
queryDTOPage.setCurrent(dto.getPageNum());
queryDTOPage.setSize(dto.getPageSize());
dto.setFbsUserId(SecurityUtils.getAppUserId());
Page<FbsProjectListVO> queryVOPage = baseMapper.signUpList(queryDTOPage, dto);
//处理标段和分包
for (FbsProjectListVO fbsProjectListVO : queryVOPage.getRecords()) {
Long projectId = fbsProjectListVO.getId();
//查询项目下的所有申请
List<ZbfProjectSubcontractingApply> applyList = zbfProjectSubcontractingApplyService.list(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
.eq(ZbfProjectSubcontractingApply::getProjectId, projectId).eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId()));
List<Long> applyIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSubId).collect(Collectors.toList());
//标段处理
List<FbsProjectSectionListVO> sectionListVO = new ArrayList<>();
//查询项目下的所有标段
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
.eq(ZbfProjectSection::getProjectId, projectId));
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));
//排除掉已申请的分包
for (ZbfProjectSubcontracting sub : subList){
if(applyIds.contains(sub.getId())){
continue;
}
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
subListVO.add(fbsProjectSubcontractingListVO);
}
if(CollectionUtil.isEmpty(subListVO)){
continue;
}
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
BeanUtil.copyProperties(zbfProjectSection, fbsProjectSectionListVO);
fbsProjectSectionListVO.setSubList(subListVO);
sectionListVO.add(fbsProjectSectionListVO);
}
fbsProjectListVO.setSectionList(sectionListVO);
}
return PageUtils.buildDataInfo(queryVOPage);
}
@Override
public TableDataInfo<FbsProjectListVO> applyList(FbsProjectListDTO dto) {
Page<FbsProjectListDTO> queryDTOPage = new Page<>();
queryDTOPage.setCurrent(dto.getPageNum());
queryDTOPage.setSize(dto.getPageSize());
dto.setFbsUserId(SecurityUtils.getAppUserId());
Page<FbsProjectListVO> queryVOPage = baseMapper.applyList(queryDTOPage, dto);
//处理标段和分包
for (FbsProjectListVO fbsProjectListVO : queryVOPage.getRecords()) {
Long projectId = fbsProjectListVO.getId();
//查询项目下的所有已申请和已拒绝申请
List<ZbfProjectSubcontractingApply> applyList = zbfProjectSubcontractingApplyService.list(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
.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());
//标段处理
List<FbsProjectSectionListVO> sectionListVO = new ArrayList<>();
//查询项目下的所有标段
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
.eq(ZbfProjectSection::getProjectId, projectId));
for (ZbfProjectSection zbfProjectSection : sectionList){
//分包处理
List<FbsProjectSubcontractingListVO> subListVO = new ArrayList<>();
//查询标段下的所有的分包
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId()));
//排除掉未申请和已同意的分包
for (ZbfProjectSubcontracting sub : subList){
if(!applyIds.contains(sub.getId())){
continue;
}
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
subListVO.add(fbsProjectSubcontractingListVO);
}
if(CollectionUtil.isEmpty(subListVO)){
continue;
}
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
BeanUtil.copyProperties(zbfProjectSection, fbsProjectSectionListVO);
fbsProjectSectionListVO.setSubList(subListVO);
sectionListVO.add(fbsProjectSectionListVO);
}
fbsProjectListVO.setSectionList(sectionListVO);
}
return PageUtils.buildDataInfo(queryVOPage);
}
@Override
public TableDataInfo<FbsProjectListVO> joinList(FbsProjectListDTO dto) {
Page<FbsProjectListDTO> queryDTOPage = new Page<>();
queryDTOPage.setCurrent(dto.getPageNum());
queryDTOPage.setSize(dto.getPageSize());
dto.setFbsUserId(SecurityUtils.getAppUserId());
Page<FbsProjectListVO> queryVOPage = baseMapper.joinList(queryDTOPage, dto);
//处理标段和分包
for (FbsProjectListVO fbsProjectListVO : queryVOPage.getRecords()) {
Long projectId = fbsProjectListVO.getId();
fbsProjectListVO.setSectionList(handleSection(projectId));
}
return PageUtils.buildDataInfo(queryVOPage);
}
@Override
public TableDataInfo<FbsProjectListVO> completeList(FbsProjectListDTO dto) {
Page<FbsProjectListDTO> queryDTOPage = new Page<>();
queryDTOPage.setCurrent(dto.getPageNum());
queryDTOPage.setSize(dto.getPageSize());
dto.setFbsUserId(SecurityUtils.getAppUserId());
Page<FbsProjectListVO> queryVOPage = baseMapper.completeList(queryDTOPage, dto);
//处理标段和分包
for (FbsProjectListVO fbsProjectListVO : queryVOPage.getRecords()) {
Long projectId = fbsProjectListVO.getId();
fbsProjectListVO.setSectionList(handleSection(projectId));
}
return PageUtils.buildDataInfo(queryVOPage);
}
@Override
public FbsProjectDetailVO signUpDetail(Long projectId) {
ZbfProject byId = getById(projectId);
FbsProjectDetailVO fbsProjectDetailVO = BeanUtil.copyProperties(byId, FbsProjectDetailVO.class);
//查询项目下的所有申请
List<ZbfProjectSubcontractingApply> applyList = zbfProjectSubcontractingApplyService.list(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
.eq(ZbfProjectSubcontractingApply::getProjectId, projectId).eq(ZbfProjectSubcontractingApply::getFbsUserId, SecurityUtils.getAppUserId()));
List<Long> applyIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSubId).collect(Collectors.toList());
//标段处理
List<FbsProjectSectionListVO> sectionListVO = new ArrayList<>();
//查询项目下的所有标段
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
.eq(ZbfProjectSection::getProjectId, projectId));
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));
//排除掉已申请的分包
for (ZbfProjectSubcontracting sub : subList){
if(applyIds.contains(sub.getId())){
continue;
}
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
subListVO.add(fbsProjectSubcontractingListVO);
}
if(CollectionUtil.isEmpty(subListVO)){
continue;
}
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
BeanUtil.copyProperties(zbfProjectSection, fbsProjectSectionListVO);
fbsProjectSectionListVO.setSubList(subListVO);
sectionListVO.add(fbsProjectSectionListVO);
}
fbsProjectDetailVO.setSectionList(sectionListVO);
return fbsProjectDetailVO;
}
@Override
public FbsProjectDetailVO applyDetail(Long projectId) {
ZbfProject byId = getById(projectId);
FbsProjectDetailVO fbsProjectDetailVO = BeanUtil.copyProperties(byId, FbsProjectDetailVO.class);
//查询项目下的所有申请中的申请和已拒绝的申请
List<ZbfProjectSubcontractingApply> applyList = zbfProjectSubcontractingApplyService.list(Wrappers.<ZbfProjectSubcontractingApply>lambdaQuery()
.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());
//标段处理
List<FbsProjectSectionListVO> sectionListVO = new ArrayList<>();
//查询项目下的所有标段
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
.eq(ZbfProjectSection::getProjectId, projectId));
for (ZbfProjectSection zbfProjectSection : sectionList){
//分包处理
List<FbsProjectSubcontractingListVO> subListVO = new ArrayList<>();
//查询标段下的所有的分包
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId()));
//排除掉未申请和已同意的分包
for (ZbfProjectSubcontracting sub : subList){
if(!applyIds.contains(sub.getId())){
continue;
}
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
subListVO.add(fbsProjectSubcontractingListVO);
}
if(CollectionUtil.isEmpty(subListVO)){
continue;
}
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
BeanUtil.copyProperties(zbfProjectSection, fbsProjectSectionListVO);
fbsProjectSectionListVO.setSubList(subListVO);
sectionListVO.add(fbsProjectSectionListVO);
}
fbsProjectDetailVO.setSectionList(sectionListVO);
return fbsProjectDetailVO;
}
@Override
public FbsProjectDetailVO joinOrCompleteDetail(Long projectId) {
ZbfProject byId = getById(projectId);
FbsProjectDetailVO fbsProjectDetailVO = BeanUtil.copyProperties(byId, FbsProjectDetailVO.class);
fbsProjectDetailVO.setSectionList(handleSection(projectId));
return fbsProjectDetailVO;
}
/**
* 已加入和已竣工项目标段处理
*/
private List<FbsProjectSectionListVO> handleSection(Long projectId) {
//标段处理
List<FbsProjectSectionListVO> sectionListVO = new ArrayList<>();
//查询项目下的所有标段
List<ZbfProjectSection> sectionList = zbfProjectSectionService.list(Wrappers.<ZbfProjectSection>lambdaQuery()
.eq(ZbfProjectSection::getProjectId, projectId));
for (ZbfProjectSection zbfProjectSection : sectionList){
//分包处理
List<FbsProjectSubcontractingListVO> subListVO = new ArrayList<>();
//查询标段下的所有已承接的分包
List<ZbfProjectSubcontracting> subList = zbfProjectSubcontractingService.list(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
.eq(ZbfProjectSubcontracting::getSectionId, zbfProjectSection.getId())
.eq(ZbfProjectSubcontracting::getUserId, SecurityUtils.getAppUserId()));
for (ZbfProjectSubcontracting sub : subList){
FbsProjectSubcontractingListVO fbsProjectSubcontractingListVO = new FbsProjectSubcontractingListVO();
BeanUtil.copyProperties(sub, fbsProjectSubcontractingListVO);
subListVO.add(fbsProjectSubcontractingListVO);
}
if(CollectionUtil.isEmpty(subListVO)){
continue;
}
FbsProjectSectionListVO fbsProjectSectionListVO = new FbsProjectSectionListVO();
BeanUtil.copyProperties(zbfProjectSection, fbsProjectSectionListVO);
fbsProjectSectionListVO.setSubList(subListVO);
sectionListVO.add(fbsProjectSectionListVO);
}
return sectionListVO;
}
}

View File

@ -0,0 +1,88 @@
package com.ruoyi.zbf.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.zbf.bo.ZbfProjectSubcontractingApplyQueryBo;
import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
import com.ruoyi.zbf.mapper.ZbfProjectSubcontractingApplyMapper;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingApplyService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 总包方项目分包申请Service业务层处理
*
* @author ruoyi
* @date 2025-03-26
*/
@Service
public class ZbfProjectSubcontractingApplyServiceImpl extends ServicePlusImpl<ZbfProjectSubcontractingApplyMapper, ZbfProjectSubcontractingApply> implements IZbfProjectSubcontractingApplyService {
@Override
public ZbfProjectSubcontractingApply queryById(Long id){
return getById(id);
}
@Override
public TableDataInfo<ZbfProjectSubcontractingApply> queryPageList(ZbfProjectSubcontractingApplyQueryBo bo) {
Page<ZbfProjectSubcontractingApply> result = page(PageUtils.buildPage(), buildQueryWrapper(bo));
return PageUtils.buildDataInfo(result);
}
@Override
public List<ZbfProjectSubcontractingApply> queryList(ZbfProjectSubcontractingApplyQueryBo bo) {
return list(buildQueryWrapper(bo));
}
private LambdaQueryWrapper<ZbfProjectSubcontractingApply> buildQueryWrapper(ZbfProjectSubcontractingApplyQueryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ZbfProjectSubcontractingApply> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getProjectId() != null, ZbfProjectSubcontractingApply::getProjectId, bo.getProjectId());
lqw.eq(bo.getSectionId() != null, ZbfProjectSubcontractingApply::getSectionId, bo.getSectionId());
lqw.eq(bo.getSubId() != null, ZbfProjectSubcontractingApply::getSubId, bo.getSubId());
lqw.eq(bo.getFbsUserId() != null, ZbfProjectSubcontractingApply::getFbsUserId, bo.getFbsUserId());
lqw.eq(StrUtil.isNotBlank(bo.getApplyStatus()), ZbfProjectSubcontractingApply::getApplyStatus, bo.getApplyStatus());
return lqw;
}
@Override
public Boolean insert(ZbfProjectSubcontractingApply bo) {
ZbfProjectSubcontractingApply add = BeanUtil.toBean(bo, ZbfProjectSubcontractingApply.class);
validEntityBeforeSave(add);
return save(add);
}
@Override
public Boolean update(ZbfProjectSubcontractingApply bo) {
ZbfProjectSubcontractingApply update = BeanUtil.toBean(bo, ZbfProjectSubcontractingApply.class);
validEntityBeforeSave(update);
return updateById(update);
}
/**
* 保存前的数据校验
*
* @param entity 实体类数据
*/
private void validEntityBeforeSave(ZbfProjectSubcontractingApply entity){
//TODO 做一些数据校验,如唯一约束
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return removeByIds(ids);
}
}