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-17 17:04:25 +08:00
parent 871fa55af1
commit d6efd8c450
14 changed files with 132 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsUserServiceImpl.java
View File

@ -142,6 +142,7 @@ public class FbsUserServiceImpl extends ServicePlusImpl<FbsUserMapper, FbsUser>
companyService.save(company);
FbsUser fbsUser = selectUserByUserId(SecurityUtils.getAppUserId());
fbsUser.setCompanyId(company.getId());
fbsUser.setUsername(company.getCompanyName());
updateById(fbsUser);
return company.getId();
}

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

@ -18,6 +18,9 @@ import java.util.List;
@ApiModel("总包方项目新增视图对象")
public class ZbfProjectAddDTO {
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("单位名称")
private String unitName;

5
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectSectionAddDTO.java
View File

@ -18,7 +18,10 @@ import java.util.List;
@ApiModel("总包方项目标段新增视图对象")
public class ZbfProjectSectionAddDTO {
@ApiModelProperty("标段名称")
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("标段名称")
private String sectionName;
@ApiModelProperty("标段描述")

4
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/dto/ZbfProjectSubcontractingAddDTO.java
View File

@ -18,8 +18,10 @@ import java.math.BigDecimal;
@ApiModel("总包方项目分包新增视图对象")
public class ZbfProjectSubcontractingAddDTO {
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("分包主题")
@ApiModelProperty("分包主题")
private String subName;
@ApiModelProperty("分包描述")

9
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectDetailVO.java
View File

@ -23,6 +23,15 @@ public class ZbfProjectDetailVO {
@ApiModelProperty("项目图片")
private String projectImg;
@ApiModelProperty("联系人")
private String contactPerson;
@ApiModelProperty("联系电话")
private String contactPhone;
@ApiModelProperty("统一社会信用代码")
private String creditCode;
@ApiModelProperty("项目状态(0-未开工，1-已开工，2已竣工，3已停工)")
private String projectStatus;

2
ruoyi-system/src/main/java/com/ruoyi/zbf/domain/vo/ZbfProjectSubcontractingDetailVO.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.zbf.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -45,6 +46,7 @@ public class ZbfProjectSubcontractingDetailVO {
private String qualification;
@ApiModelProperty("分包商用户ID")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long userId;
@ApiModelProperty("备注")

5
ruoyi-system/src/main/java/com/ruoyi/zbf/service/IZbfProjectService.java
View File

@ -134,6 +134,11 @@ public interface IZbfProjectService extends IServicePlus<ZbfProject> {
*/
Boolean add(ZbfProjectAddDTO dto);
/**
* 总包方编辑项目
*/
Boolean edit(ZbfProjectAddDTO dto);
/**
* 总包方查询我的项目列表
*/

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

@ -70,4 +70,8 @@ public interface IZbfProjectSubcontractingApplyService extends IServicePlus<ZbfP
*/
ZbfProjectSubcontractingApply queryBySubIdAndFbsUserId(Long subId, Long fbsUserId);
/**
* 根据项目Id查询申请
*/
List<ZbfProjectSubcontractingApply> queryByProjectId(Long projectId);
}

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

@ -17,6 +17,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.ProjectStatus;
import com.ruoyi.common.enums.RecruitApplyStatus;
import com.ruoyi.common.enums.SubcontractingApplyStatus;
import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.util.DataUtil;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
@ -584,17 +585,17 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean add(ZbfProjectAddDTO dto) {
ZbfProject project = BeanUtil.copyProperties(dto, ZbfProject.class);
ZbfProject project = BeanUtil.copyProperties(dto, ZbfProject.class, "id");
project.setUserId(SecurityUtils.getAppUserId());
boolean save = save(project);
for (ZbfProjectSectionAddDTO section : dto.getSectionList()) {
ZbfProjectSection projectSection = BeanUtil.copyProperties(section, ZbfProjectSection.class);
ZbfProjectSection projectSection = BeanUtil.copyProperties(section, ZbfProjectSection.class,"id");
projectSection.setProjectId(project.getId());
zbfProjectSectionService.save(projectSection);
List<ZbfProjectSubcontracting> addList = new ArrayList<>();
for (ZbfProjectSubcontractingAddDTO sub : section.getSubList()) {
ZbfProjectSubcontracting projectSubcontracting = BeanUtil.copyProperties(sub, ZbfProjectSubcontracting.class);
ZbfProjectSubcontracting projectSubcontracting = BeanUtil.copyProperties(sub, ZbfProjectSubcontracting.class,"id");
projectSubcontracting.setProjectId(project.getId());
projectSubcontracting.setSectionId(projectSection.getId());
addList.add(projectSubcontracting);
@ -604,6 +605,85 @@ public class ZbfProjectServiceImpl extends ServicePlusImpl<ZbfProjectMapper, Zbf
return save;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean edit(ZbfProjectAddDTO dto) {
//校验
//获取项目下的所有有人申请的分包
List<ZbfProjectSubcontractingApply> applyList = zbfProjectSubcontractingApplyService.queryByProjectId(dto.getId());
Set<Long> sectionIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSectionId).collect(Collectors.toSet());
Set<Long> subIds = applyList.stream().map(ZbfProjectSubcontractingApply::getSubId).collect(Collectors.toSet());
Set<Long> sectionUpdateIds = new HashSet<>();
Set<Long> sectionAddIds = new HashSet<>();
List<ZbfProjectSection> projectSectionUpdateList = new ArrayList<>();
Set<Long> subUpdateIds = new HashSet<>();
List<ZbfProjectSubcontracting> projectSubAddList = new ArrayList<>();
List<ZbfProjectSubcontracting> projectSubUpdateList = new ArrayList<>();
for (ZbfProjectSectionAddDTO section : dto.getSectionList()) {
ZbfProjectSection projectSection = BeanUtil.copyProperties(section, ZbfProjectSection.class);
projectSection.setProjectId(dto.getId());
if (section.getId() == null){
zbfProjectSectionService.save(projectSection);
sectionAddIds.add(projectSection.getId());
}else {
projectSectionUpdateList.add(projectSection);
sectionUpdateIds.add(section.getId());
}
for (ZbfProjectSubcontractingAddDTO sub : section.getSubList()) {
ZbfProjectSubcontracting projectSubcontracting = BeanUtil.copyProperties(sub, ZbfProjectSubcontracting.class,"id");
projectSubcontracting.setProjectId(dto.getId());
projectSubcontracting.setSectionId(projectSection.getId());
if(sub.getId() == null){
projectSubAddList.add(projectSubcontracting);
}else {
projectSubUpdateList.add(projectSubcontracting);
subUpdateIds.add(sub.getId());
}
}
}
if(!sectionUpdateIds.containsAll(sectionIds)){
throw new BaseException("不能删除包含存在申请的分包的标段");
}
if(!subUpdateIds.containsAll(subIds)){
throw new BaseException("不能删除存在申请的分包");
}
//更新项目
ZbfProject project = BeanUtil.copyProperties(dto, ZbfProject.class);
boolean update = updateById(project);
//更新标段
if(CollectionUtil.isNotEmpty(projectSectionUpdateList)){
zbfProjectSectionService.updateBatchById(projectSectionUpdateList);
}
//更新分包
if(CollectionUtil.isNotEmpty(projectSubUpdateList)){
zbfProjectSubcontractingService.updateBatchById(projectSubUpdateList);
}
//新增分包
if(CollectionUtil.isNotEmpty(projectSubAddList)){
zbfProjectSubcontractingService.saveBatch(projectSubAddList);
Set<Long> subAddIds = projectSubAddList.stream().map(ZbfProjectSubcontracting::getId).collect(Collectors.toSet());
subUpdateIds.addAll(subAddIds);
}
//删除标段
zbfProjectSectionService.remove(Wrappers.<ZbfProjectSection>lambdaQuery()
.eq(ZbfProjectSection::getProjectId, dto.getId())
.notIn(ZbfProjectSection::getId, sectionUpdateIds.addAll(sectionAddIds))
);
//删除分包
zbfProjectSubcontractingService.remove(Wrappers.<ZbfProjectSubcontracting>lambdaQuery()
.eq(ZbfProjectSubcontracting::getProjectId, dto.getId())
.notIn(ZbfProjectSubcontracting::getId, subUpdateIds)
);
return update;
}
@Override
public TableDataInfo<ZbfProjectListVO> queryZbfList(ZbfProjectListDTO dto) {
LambdaQueryWrapper<ZbfProject> wrapper = new LambdaQueryWrapper<>();

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

@ -261,4 +261,11 @@ public class ZbfProjectSubcontractingApplyServiceImpl extends ServicePlusImpl<Zb
List<ZbfProjectSubcontractingApply> list = baseMapper.selectList(wrapper);
return CollectionUtil.getFirst(list);
}
@Override
public List<ZbfProjectSubcontractingApply> queryByProjectId(Long projectId) {
LambdaQueryWrapper<ZbfProjectSubcontractingApply> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ZbfProjectSubcontractingApply::getProjectId, projectId);
return baseMapper.selectList(wrapper);
}
}

1
ruoyi-system/src/main/java/com/ruoyi/zbf/service/impl/ZbfUserServiceImpl.java
View File

@ -144,6 +144,7 @@ public class ZbfUserServiceImpl extends ServicePlusImpl<ZbfUserMapper, ZbfUser>
companyService.save(company);
ZbfUser zbfUser = selectUserByUserId(SecurityUtils.getAppUserId());
zbfUser.setCompanyId(company.getId());
zbfUser.setUsername(company.getCompanyName());
updateById(zbfUser);
return company.getId();
}

3
ruoyi-system/src/main/resources/mapper/zbf/ZbfProjectSubcontractingMapper.xml
View File

@ -22,7 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="bgtList" resultType="com.ruoyi.zbf.domain.vo.ZbfSubBgtListVO">
SELECT u.id,
SELECT distinct
u.id,
u.user_id,
u.username,
u.phone,