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-03-27 10:44:14 +08:00
parent 1972e3e4f4
commit 4027127dfd
64 changed files with 3303 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
ruoyi-system/src/main/java/com/ruoyi/zbf/bo/ZbfProjectSubcontractingApplyQueryBo.java Normal file
View File

@ -0,0 +1,58 @@
package com.ruoyi.zbf.bo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.LocalDate;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 总包方项目分包申请分页查询对象 zbf_project_subcontracting_apply
*
* @author ruoyi
* @date 2025-03-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("总包方项目分包申请分页查询对象")
public class ZbfProjectSubcontractingApplyQueryBo extends BaseEntity {
/** 分页大小 */
@ApiModelProperty("分页大小")
private Integer pageSize;
/** 当前页数 */
@ApiModelProperty("当前页数")
private Integer pageNum;
/** 排序列 */
@ApiModelProperty("排序列")
private String orderByColumn;
/** 排序的方向desc或者asc */
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
private String isAsc;
/** 项目ID */
@ApiModelProperty("项目ID")
private Long projectId;
/** 标段ID */
@ApiModelProperty("标段ID")
private Long sectionId;
/** 分包ID */
@ApiModelProperty("分包ID")
private Long subId;
/** 分包商用户ID */
@ApiModelProperty("分包商用户ID")
private Long fbsUserId;
/** 申请状态（0申请中 1已同意 2已拒绝） */
@ApiModelProperty("申请状态（0申请中 1已同意 2已拒绝）")
private String applyStatus;
}

108
ruoyi-system/src/main/java/com/ruoyi/zbf/controller/ZbfProjectSubcontractingApplyController.java Normal file
View File

@ -0,0 +1,108 @@
package com.ruoyi.zbf.controller;
import java.util.List;
import java.util.Arrays;
import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
import lombok.RequiredArgsConstructor;
import javax.validation.constraints.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.zbf.bo.ZbfProjectSubcontractingApplyQueryBo;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingApplyService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* 总包方项目分包申请Controller
*
* @author ruoyi
* @date 2025-03-26
*/
@Api(value = "总包方项目分包申请控制器", tags = {"总包方项目分包申请管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/zbf/apply")
public class ZbfProjectSubcontractingApplyController extends BaseController {
private final IZbfProjectSubcontractingApplyService iZbfProjectSubcontractingApplyService;
/**
* 查询总包方项目分包申请列表
*/
@ApiOperation("查询总包方项目分包申请列表")
@PreAuthorize("@ss.hasPermi('zbf:apply:list')")
@GetMapping("/list")
public TableDataInfo<ZbfProjectSubcontractingApply> list(@Validated ZbfProjectSubcontractingApplyQueryBo bo) {
return iZbfProjectSubcontractingApplyService.queryPageList(bo);
}
/**
* 导出总包方项目分包申请列表
*/
@ApiOperation("导出总包方项目分包申请列表")
@PreAuthorize("@ss.hasPermi('zbf:apply:export')")
@Log(title = "总包方项目分包申请", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult<ZbfProjectSubcontractingApply> export(@Validated ZbfProjectSubcontractingApplyQueryBo bo) {
List<ZbfProjectSubcontractingApply> list = iZbfProjectSubcontractingApplyService.queryList(bo);
ExcelUtil<ZbfProjectSubcontractingApply> util = new ExcelUtil<ZbfProjectSubcontractingApply>(ZbfProjectSubcontractingApply.class);
return util.exportExcel(list, "总包方项目分包申请");
}
/**
* 获取总包方项目分包申请详细信息
*/
@ApiOperation("获取总包方项目分包申请详细信息")
@PreAuthorize("@ss.hasPermi('zbf:apply:query')")
@GetMapping("/{id}")
public AjaxResult<ZbfProjectSubcontractingApply> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iZbfProjectSubcontractingApplyService.queryById(id));
}
/**
* 新增总包方项目分包申请
*/
@ApiOperation("新增总包方项目分包申请")
@PreAuthorize("@ss.hasPermi('zbf:apply:add')")
@Log(title = "总包方项目分包申请", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public AjaxResult<Void> add(@Validated @RequestBody ZbfProjectSubcontractingApply bo) {
return toAjax(iZbfProjectSubcontractingApplyService.insert(bo) ? 1 : 0);
}
/**
* 修改总包方项目分包申请
*/
@ApiOperation("修改总包方项目分包申请")
@PreAuthorize("@ss.hasPermi('zbf:apply:edit')")
@Log(title = "总包方项目分包申请", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Void> edit(@Validated @RequestBody ZbfProjectSubcontractingApply bo) {
return toAjax(iZbfProjectSubcontractingApplyService.update(bo) ? 1 : 0);
}
/**
* 删除总包方项目分包申请
*/
@ApiOperation("删除总包方项目分包申请")
@PreAuthorize("@ss.hasPermi('zbf:apply:remove')")
@Log(title = "总包方项目分包申请" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iZbfProjectSubcontractingApplyService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
}
}

3
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/ZbfProject.java
View File

@ -71,6 +71,9 @@ public class ZbfProject implements Serializable {
@ApiModelProperty("联系电话")
private String contactPhone;
@ApiModelProperty("项目状态(0-未开工，1-已开工，2已竣工，3已停工)")
private String projectStatus;
/** 删除标志（0代表存在 2代表删除） */
@Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除")
@ApiModelProperty("删除标志（0代表存在 2代表删除）")

96
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/ZbfProjectSubcontractingApply.java Normal file
View File

@ -0,0 +1,96 @@
package com.ruoyi.zbf.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 总包方项目分包申请对象 zbf_project_subcontracting_apply
*
* @author ruoyi
* @date 2025-03-26
*/
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("zbf_project_subcontracting_apply")
@ApiModel("总包方项目分包申请视图对象")
public class ZbfProjectSubcontractingApply implements Serializable {
private static final long serialVersionUID=1L;
/** 主键ID */
@ApiModelProperty("主键ID")
@TableId(value = "id")
private Long id;
/** 项目ID */
@Excel(name = "项目ID")
@ApiModelProperty("项目ID")
private Long projectId;
/** 标段ID */
@Excel(name = "标段ID")
@ApiModelProperty("标段ID")
private Long sectionId;
/** 分包ID */
@Excel(name = "分包ID")
@ApiModelProperty("分包ID")
private Long subId;
/** 分包商用户ID */
@Excel(name = "分包商用户ID")
@ApiModelProperty("分包商用户ID")
private Long fbsUserId;
/** 申请状态（0申请中 1已同意 2已拒绝） */
@Excel(name = "申请状态" , readConverterExp = "0=申请中,1=已同意,2=已拒绝")
@ApiModelProperty("申请状态（0申请中 1已同意 2已拒绝）")
private String applyStatus;
/** 删除标志（0代表存在 2代表删除） */
@Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除")
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
/** 创建者 */
@Excel(name = "创建者")
@ApiModelProperty("创建者")
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** 创建时间 */
@Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
/** 更新者 */
@Excel(name = "更新者")
@ApiModelProperty("更新者")
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 更新时间 */
@Excel(name = "更新时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("更新时间")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
/** 备注 */
@Excel(name = "备注")
@ApiModelProperty("备注")
private String remark;
}

15
ruoyi-system/src/main/java/com/ruoyi/zbf/mapper/ZbfProjectMapper.java
View File

@ -1,10 +1,14 @@
package com.ruoyi.zbf.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.fbs.domain.dto.FbsProjectListDTO;
import com.ruoyi.fbs.domain.vo.FbsProjectListVO;
import com.ruoyi.zbf.domain.ZbfProject;
import org.apache.ibatis.annotations.CacheNamespace;
import org.apache.ibatis.annotations.Param;
/**
* 总包方项目Mapper接口
@ -16,4 +20,15 @@ import org.apache.ibatis.annotations.CacheNamespace;
@CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
public interface ZbfProjectMapper extends BaseMapperPlus<ZbfProject> {
// 查询分包商可报名项目列表
Page<FbsProjectListVO> signUpList(@Param("page") Page<FbsProjectListDTO> page, @Param("dto") FbsProjectListDTO dto);
// 查询分包商申请中的项目列表
Page<FbsProjectListVO> applyList(@Param("page") Page<FbsProjectListDTO> page, @Param("dto") FbsProjectListDTO dto);
// 查询分包商已加入的项目列表
Page<FbsProjectListVO> joinList(@Param("page") Page<FbsProjectListDTO> page, @Param("dto") FbsProjectListDTO dto);
// 查询分包商已竣工的项目列表
Page<FbsProjectListVO> completeList(@Param("page") Page<FbsProjectListDTO> page, @Param("dto") FbsProjectListDTO dto);
}

18
ruoyi-system/src/main/java/com/ruoyi/zbf/mapper/ZbfProjectSubcontractingApplyMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.ruoyi.zbf.mapper;
import com.ruoyi.zbf.domain.ZbfProjectSubcontractingApply;
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
import org.apache.ibatis.annotations.CacheNamespace;
/**
* 总包方项目分包申请Mapper接口
*
* @author ruoyi
* @date 2025-03-26
*/
// 如使需切换数据源 请勿使用缓存 会造成数据不一致现象
@CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
public interface ZbfProjectSubcontractingApplyMapper extends BaseMapperPlus<ZbfProjectSubcontractingApply> {
}

39
ruoyi-system/src/main/java/com/ruoyi/zbf/service/IZbfProjectService.java
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);
}

55
ruoyi-system/src/main/java/com/ruoyi/zbf/service/IZbfProjectSubcontractingApplyService.java Normal file
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);
}

287
ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectServiceImpl.java
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;
}
}

88
ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfProjectSubcontractingApplyServiceImpl.java Normal file
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);
}
}