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

2
ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitApplyMapper.java
View File

@ -31,7 +31,7 @@ public interface BgtProjectRecruitApplyMapper extends BaseMapperPlus<BgtProjectR
List<BgtProjectRecruitApplyVO> appQueryList(@Param("dto") BgtProjectRecruitApplyQueryDTO dto);
List<BgtProjectRecruitApplyVO> htmlList(@Param("recruitId") Long recruitId);
List<BgtProjectRecruitApplyVO> htmlList(@Param("recruitId") Long recruitId,@Param("isNotUpload")Boolean isNotUpload);
// Page<BgtProjectRecruitApplyVO> dayAttendanceList(@Param("page")Page<BgtAttendanceDayDTO> queryDTOPage,@Param("dto") BgtAttendanceDayDTO dto);

7
ruoyi-system/src/main/java/com/ruoyi/bgt/service/IBgtProjectRecruitApplyService.java
View File

@ -81,7 +81,7 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus<BgtProjectR
*/
List<BgtProjectRecruitApplyVO> appAllList(BgtProjectRecruitApplyQueryDTO dto);
List<BgtProjectRecruitApplyVO> htmlList(Long recruitId);
List<BgtProjectRecruitApplyVO> htmlList(Long recruitId,Boolean isNotUpload);
/**
* LC-APP相关
@ -170,8 +170,11 @@ public interface IBgtProjectRecruitApplyService extends IServicePlus<BgtProjectR
BgtProjectRecruitApply getOne(Long taskId,Long userId);
/**
* 根据招工和务工者Id获该务工者的最近一条申请信息(只查进场和立场)
* 根据招工和务工者Id获该务工者的最近一条申请信息(只查已同意和进场状态的)
*/
BgtProjectRecruitApply getOneByUserIdAndRecruitId(Long userId, Long recruitId);
}

10
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java
View File

@ -17,7 +17,6 @@ import com.ruoyi.bgt.mapper.BgtProjectRecruitApplyMapper;
import com.ruoyi.bgt.service.IBgtMessageService;
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
@ -219,8 +218,8 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
@Override
public List<BgtProjectRecruitApplyVO> htmlList(Long recruitId) {
return baseMapper.htmlList(recruitId);
public List<BgtProjectRecruitApplyVO> htmlList(Long recruitId,Boolean isNotUpload) {
return baseMapper.htmlList(recruitId,isNotUpload);
}
@Override
@ -789,13 +788,12 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
@Override
public BgtProjectRecruitApply getOneByUserIdAndRecruitId(Long userId, Long recruitId) {
List<BgtProjectRecruitApply> list = baseMapper.selectList(Wrappers.<BgtProjectRecruitApply>lambdaQuery()
.eq(BgtProjectRecruitApply::getRecruitId, recruitId)
.eq(BgtProjectRecruitApply::getUserId, userId)
.in(BgtProjectRecruitApply::getStatus, RecruitApplyStatus.getWorkStatus())
.in(BgtProjectRecruitApply::getStatus, RecruitApplyStatus.getFile())
.orderByDesc(BgtProjectRecruitApply::getCreateTime));
return list.get(0);
return CollectionUtil.isEmpty(list)?null:list.get(0);
}
}

70
ruoyi-system/src/main/java/com/ruoyi/common/bo/CompanyQueryBo.java Normal file
View File

@ -0,0 +1,70 @@
package com.ruoyi.common.bo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 企业认证分页查询对象 common_company
*
* @author ruoyi
* @date 2025-03-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("企业认证分页查询对象")
public class CompanyQueryBo extends BaseEntity {
/** 分页大小 */
@ApiModelProperty("分页大小")
private Integer pageSize;
/** 当前页数 */
@ApiModelProperty("当前页数")
private Integer pageNum;
/** 排序列 */
@ApiModelProperty("排序列")
private String orderByColumn;
/** 排序的方向desc或者asc */
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
private String isAsc;
/** 企业名称 */
@ApiModelProperty("企业名称")
private String companyName;
/** 统一社会信用代码 */
@ApiModelProperty("统一社会信用代码")
private String creditCode;
/** 营业执照 */
@ApiModelProperty("营业执照")
private String licenseImg;
/** 法人 */
@ApiModelProperty("法人")
private String corporation;
/** 成立日期 */
@ApiModelProperty("成立日期")
private LocalDate establishmentDate;
/** 注册资本 */
@ApiModelProperty("注册资本")
private BigDecimal registrationAmount;
/** 企业简介 */
@ApiModelProperty("企业简介")
private String introduce;
/** 项目经验 */
@ApiModelProperty("项目经验")
private String experience;
/** 员工数量 */
@ApiModelProperty("员工数量")
private Integer employeeNum;
/** 资质与荣誉 */
@ApiModelProperty("资质与荣誉")
private String url;
}

108
ruoyi-system/src/main/java/com/ruoyi/common/controller/CompanyController.java Normal file
View File

@ -0,0 +1,108 @@
package com.ruoyi.common.controller;
import java.util.List;
import java.util.Arrays;
import com.ruoyi.common.domain.Company;
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.common.bo.CompanyQueryBo;
import com.ruoyi.common.service.ICompanyService;
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("/common/company")
public class CompanyController extends BaseController {
private final ICompanyService iCommonCompanyService;
/**
* 查询企业认证列表
*/
@ApiOperation("查询企业认证列表")
@PreAuthorize("@ss.hasPermi('common:company:list')")
@GetMapping("/list")
public TableDataInfo<Company> list(@Validated CompanyQueryBo bo) {
return iCommonCompanyService.queryPageList(bo);
}
/**
* 导出企业认证列表
*/
@ApiOperation("导出企业认证列表")
@PreAuthorize("@ss.hasPermi('common:company:export')")
@Log(title = "企业认证", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult<Company> export(@Validated CompanyQueryBo bo) {
List<Company> list = iCommonCompanyService.queryList(bo);
ExcelUtil<Company> util = new ExcelUtil<Company>(Company.class);
return util.exportExcel(list, "企业认证");
}
/**
* 获取企业认证详细信息
*/
@ApiOperation("获取企业认证详细信息")
@PreAuthorize("@ss.hasPermi('common:company:query')")
@GetMapping("/{id}")
public AjaxResult<Company> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iCommonCompanyService.queryById(id));
}
/**
* 新增企业认证
*/
@ApiOperation("新增企业认证")
@PreAuthorize("@ss.hasPermi('common:company:add')")
@Log(title = "企业认证", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public AjaxResult<Void> add(@Validated @RequestBody Company bo) {
return toAjax(iCommonCompanyService.insert(bo) ? 1 : 0);
}
/**
* 修改企业认证
*/
@ApiOperation("修改企业认证")
@PreAuthorize("@ss.hasPermi('common:company:edit')")
@Log(title = "企业认证", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Void> edit(@Validated @RequestBody Company bo) {
return toAjax(iCommonCompanyService.update(bo) ? 1 : 0);
}
/**
* 删除企业认证
*/
@ApiOperation("删除企业认证")
@PreAuthorize("@ss.hasPermi('common:company:remove')")
@Log(title = "企业认证" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iCommonCompanyService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
}
}

3
ruoyi-system/src/main/java/com/ruoyi/common/domain/Annex.java
View File

@ -44,6 +44,9 @@ public class Annex implements Serializable {
@ApiModelProperty("招工任务ID")
private Long recruitId;
@ApiModelProperty("招工任务申请Id")
private Long recruitApplyId;
/** 附件类型 */
@Excel(name = "附件类型")
@ApiModelProperty("附件类型")

3
ruoyi-system/src/main/java/com/ruoyi/common/domain/AnnexRecord.java
View File

@ -49,6 +49,9 @@ public class AnnexRecord implements Serializable {
@ApiModelProperty("招工任务ID")
private Long recruitId;
@ApiModelProperty("招工任务申请Id")
private Long recruitApplyId;
/** 附件类型 */
@Excel(name = "附件类型")
@ApiModelProperty("附件类型")

123
ruoyi-system/src/main/java/com/ruoyi/common/domain/Company.java Normal file
View File

@ -0,0 +1,123 @@
package com.ruoyi.common.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.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 企业认证对象 common_company
*
* @author ruoyi
* @date 2025-03-26
*/
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("common_company")
@ApiModel("企业认证视图对象")
public class Company implements Serializable {
private static final long serialVersionUID=1L;
/** 主键ID */
@ApiModelProperty("主键ID")
@TableId(value = "id")
private Long id;
/** 企业名称 */
@Excel(name = "企业名称")
@ApiModelProperty("企业名称")
private String companyName;
/** 统一社会信用代码 */
@Excel(name = "统一社会信用代码")
@ApiModelProperty("统一社会信用代码")
private String creditCode;
/** 营业执照 */
@Excel(name = "营业执照")
@ApiModelProperty("营业执照")
private String licenseImg;
/** 法人 */
@Excel(name = "法人")
@ApiModelProperty("法人")
private String corporation;
/** 成立日期 */
@Excel(name = "成立日期")
@ApiModelProperty("成立日期")
private LocalDate establishmentDate;
/** 注册资本 */
@Excel(name = "注册资本")
@ApiModelProperty("注册资本")
private BigDecimal registrationAmount;
/** 企业简介 */
@Excel(name = "企业简介")
@ApiModelProperty("企业简介")
private String introduce;
/** 项目经验 */
@Excel(name = "项目经验")
@ApiModelProperty("项目经验")
private String experience;
/** 员工数量 */
@Excel(name = "员工数量")
@ApiModelProperty("员工数量")
private Integer employeeNum;
/** 资质与荣誉 */
@Excel(name = "资质与荣誉")
@ApiModelProperty("资质与荣誉")
private String url;
/** 删除标志（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;
}

55
ruoyi-system/src/main/java/com/ruoyi/common/domain/dto/CompanyAuthenticateDTO.java Normal file
View File

@ -0,0 +1,55 @@
package com.ruoyi.common.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 企业认证
*
* @author ruoyi
* @date 2025-03-26
*/
@Data
@ApiModel("企业认证")
public class CompanyAuthenticateDTO {
@ApiModelProperty("企业名称")
private String companyName;
@ApiModelProperty("统一社会信用代码")
private String creditCode;
@ApiModelProperty("营业执照")
private String licenseImg;
@ApiModelProperty("法人")
private String corporation;
@ApiModelProperty("成立日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate establishmentDate;
@ApiModelProperty("注册资本")
private BigDecimal registrationAmount;
@ApiModelProperty("企业简介")
private String introduce;
@ApiModelProperty("项目经验")
private String experience;
@ApiModelProperty("员工数量")
private Integer employeeNum;
@ApiModelProperty("资质与荣誉")
private String url;
}

18
ruoyi-system/src/main/java/com/ruoyi/common/mapper/CommonCompanyMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.ruoyi.common.mapper;
import com.ruoyi.common.domain.Company;
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 CommonCompanyMapper extends BaseMapperPlus<Company> {
}

4
ruoyi-system/src/main/java/com/ruoyi/common/service/IAnnexService.java
View File

@ -82,9 +82,9 @@ public interface IAnnexService extends IServicePlus<Annex> {
List<Annex> findByUserIdAndRecruitId(Long userId,Long recruitId,String[] types);
/**
* 根据务工者唯一标识+招工标识+附件类型 删除文件
* 根据务工者唯一标识+招工标识+附件类型+招工ID 删除文件
*/
void deleteByUserIdAndRecruitIdAndType(List<Long> userIds,Long recruitId,String type);
void deleteByUserIdAndRecruitIdAndType(List<Long> userIds,Long recruitId,String type,List<Long> recruitApplyIds);
/**
* 检查入场材料

55
ruoyi-system/src/main/java/com/ruoyi/common/service/ICompanyService.java Normal file
View File

@ -0,0 +1,55 @@
package com.ruoyi.common.service;
import com.ruoyi.common.domain.Company;
import com.ruoyi.common.bo.CompanyQueryBo;
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 ICompanyService extends IServicePlus<Company> {
/**
* 查询单个
* @return
*/
Company queryById(Long id);
/**
* 查询列表
*/
TableDataInfo<Company> queryPageList(CompanyQueryBo bo);
/**
* 查询列表
*/
List<Company> queryList(CompanyQueryBo bo);
/**
* 根据新增业务对象插入企业认证
* @param bo 企业认证新增业务对象
* @return
*/
Boolean insert(Company bo);
/**
* 根据编辑业务对象修改企业认证
* @param bo 企业认证编辑业务对象
* @return
*/
Boolean update(Company bo);
/**
* 校验并删除数据
* @param ids 主键集合
* @param isValid 是否校验,true-删除前校验,false-不校验
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

5
ruoyi-system/src/main/java/com/ruoyi/common/service/impl/AnnexServiceImpl.java
View File

@ -158,9 +158,10 @@ public class AnnexServiceImpl extends ServicePlusImpl<AnnexMapper, Annex> implem
}
@Override
public void deleteByUserIdAndRecruitIdAndType(List<Long> userIds, Long recruitId, String type) {
public void deleteByUserIdAndRecruitIdAndType(List<Long> userIds, Long recruitId, String type,List<Long> recruitApplyIds) {
baseMapper.delete(Wrappers.<Annex>lambdaUpdate().in(Annex::getUserId,userIds)
.eq(Annex::getRecruitId,recruitId).eq(Annex::getAnnexType,type).eq(Annex::getUserType,WGZ));
.eq(Annex::getRecruitId,recruitId).eq(Annex::getAnnexType,type).eq(Annex::getUserType,WGZ)
.in(Annex::getRecruitApplyId,recruitApplyIds));
}
@Override

92
ruoyi-system/src/main/java/com/ruoyi/common/service/impl/CompanyServiceImpl.java Normal file
View File

@ -0,0 +1,92 @@
package com.ruoyi.common.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.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.common.bo.CompanyQueryBo;
import com.ruoyi.common.domain.Company;
import com.ruoyi.common.mapper.CommonCompanyMapper;
import com.ruoyi.common.service.ICompanyService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 企业认证Service业务层处理
*
* @author ruoyi
* @date 2025-03-26
*/
@Service
public class CompanyServiceImpl extends ServicePlusImpl<CommonCompanyMapper, Company> implements ICompanyService {
@Override
public Company queryById(Long id){
return getById(id);
}
@Override
public TableDataInfo<Company> queryPageList(CompanyQueryBo bo) {
Page<Company> result = page(PageUtils.buildPage(), buildQueryWrapper(bo));
return PageUtils.buildDataInfo(result);
}
@Override
public List<Company> queryList(CompanyQueryBo bo) {
return list(buildQueryWrapper(bo));
}
private LambdaQueryWrapper<Company> buildQueryWrapper(CompanyQueryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
lqw.like(StrUtil.isNotBlank(bo.getCompanyName()), Company::getCompanyName, bo.getCompanyName());
lqw.eq(StrUtil.isNotBlank(bo.getCreditCode()), Company::getCreditCode, bo.getCreditCode());
lqw.eq(StrUtil.isNotBlank(bo.getLicenseImg()), Company::getLicenseImg, bo.getLicenseImg());
lqw.eq(StrUtil.isNotBlank(bo.getCorporation()), Company::getCorporation, bo.getCorporation());
lqw.eq(bo.getEstablishmentDate() != null, Company::getEstablishmentDate, bo.getEstablishmentDate());
lqw.eq(bo.getRegistrationAmount() != null, Company::getRegistrationAmount, bo.getRegistrationAmount());
lqw.eq(StrUtil.isNotBlank(bo.getIntroduce()), Company::getIntroduce, bo.getIntroduce());
lqw.eq(StrUtil.isNotBlank(bo.getExperience()), Company::getExperience, bo.getExperience());
lqw.eq(bo.getEmployeeNum() != null, Company::getEmployeeNum, bo.getEmployeeNum());
lqw.eq(StrUtil.isNotBlank(bo.getUrl()), Company::getUrl, bo.getUrl());
return lqw;
}
@Override
public Boolean insert(Company bo) {
Company add = BeanUtil.toBean(bo, Company.class);
validEntityBeforeSave(add);
return save(add);
}
@Override
public Boolean update(Company bo) {
Company update = BeanUtil.toBean(bo, Company.class);
validEntityBeforeSave(update);
return updateById(update);
}
/**
* 保存前的数据校验
*
* @param entity 实体类数据
*/
private void validEntityBeforeSave(Company entity){
//TODO 做一些数据校验,如唯一约束
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return removeByIds(ids);
}
}

97
ruoyi-system/src/main/java/com/ruoyi/fbs/bo/FbsUserQueryBo.java Normal file
View File

@ -0,0 +1,97 @@
package com.ruoyi.fbs.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;
/**
* APP分包商用户分页查询对象 fbs_user
*
* @author ruoyi
* @date 2025-03-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("APP分包商用户分页查询对象")
public class FbsUserQueryBo extends BaseEntity {
/** 分页大小 */
@ApiModelProperty("分页大小")
private Integer pageSize;
/** 当前页数 */
@ApiModelProperty("当前页数")
private Integer pageNum;
/** 排序列 */
@ApiModelProperty("排序列")
private String orderByColumn;
/** 排序的方向desc或者asc */
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
private String isAsc;
/** 唯一标识 */
@ApiModelProperty("唯一标识")
private Long userId;
/** 联系电话 */
@ApiModelProperty("联系电话")
private String phone;
/** 姓名 */
@ApiModelProperty("姓名")
private String username;
/** 性别（0男 1女 2未知） */
@ApiModelProperty("性别（0男 1女 2未知）")
private String gender;
/** 民族 */
@ApiModelProperty("民族")
private String nation;
/** 出生日期 */
@ApiModelProperty("出生日期")
private String birthdate;
/** 身份证号码 */
@ApiModelProperty("身份证号码")
private String identityCard;
/** 所在区域 */
@ApiModelProperty("所在区域")
private String area;
/** 地址 */
@ApiModelProperty("地址")
private String site;
/** 银行 */
@ApiModelProperty("银行")
private String bank;
/** 银行卡号 */
@ApiModelProperty("银行卡号")
private String cardNo;
/** 头像地址 */
@ApiModelProperty("头像地址")
private String avatarName;
/** 密码 */
@ApiModelProperty("密码")
private String password;
/** 身份证正面图路径 */
@ApiModelProperty("身份证正面图路径")
private String frontPath;
/** 身份证反面图路径 */
@ApiModelProperty("身份证反面图路径")
private String reverseSidePath;
/** 银行卡图路径 */
@ApiModelProperty("银行卡图路径")
private String bankCardPath;
/** 关联公司Id */
@ApiModelProperty("关联公司Id")
private Long companyId;
/** 帐号状态（0正常 1停用） */
@ApiModelProperty("帐号状态（0正常 1停用）")
private String status;
}

96
ruoyi-system/src/main/java/com/ruoyi/fbs/bo/FbsWageApplicationQueryBo.java Normal file
View File

@ -0,0 +1,96 @@
package com.ruoyi.fbs.bo;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 分包商工资申请分页查询对象 fbs_wage_application
*
* @author ruoyi
* @date 2025-03-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("分包商工资申请分页查询对象")
public class FbsWageApplicationQueryBo 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;
/** 项目名称 */
@ApiModelProperty("项目名称")
private String projectName;
/** 标段ID */
@ApiModelProperty("标段ID")
private Long sectionId;
/** 分包ID */
@ApiModelProperty("分包ID")
private Long subId;
/** 分包主题 */
@ApiModelProperty("分包主题")
private String subName;
/** 任务地址(项目地址) */
@ApiModelProperty("任务地址(项目地址)")
private String projectAddress;
/** 申请人ID */
@ApiModelProperty("申请人ID")
private Long userId;
/** 申请人 */
@ApiModelProperty("申请人")
private String username;
/** 银行 */
@ApiModelProperty("银行")
private String bank;
/** 银行卡号 */
@ApiModelProperty("银行卡号")
private String cardNo;
/** 联系电话 */
@ApiModelProperty("联系电话")
private String phone;
/** 申请金额 */
@ApiModelProperty("申请金额")
private BigDecimal applicantAmount;
/** 申请时间 */
@ApiModelProperty("申请时间")
private LocalDateTime applyTime;
/** 用工情况 */
@ApiModelProperty("用工情况")
private String employmentSituation;
/** 完工情况 */
@ApiModelProperty("完工情况")
private String completionSituation;
/** 任务情况 */
@ApiModelProperty("任务情况")
private String taskSituation;
/** 审核状态（1审核中 2已审核 3未通过） */
@ApiModelProperty("审核状态（1审核中 2已审核 3未通过）")
private String auditStatus;
/** 审核人Id */
@ApiModelProperty("审核人Id")
private Long reviewerId;
/** 审核人名字 */
@ApiModelProperty("审核人名字")
private String reviewerName;
}

167
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsWageApplication.java Normal file
View File

@ -0,0 +1,167 @@
package com.ruoyi.fbs.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.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 分包商工资申请对象 fbs_wage_application
*
* @author ruoyi
* @date 2025-03-26
*/
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("fbs_wage_application")
@ApiModel("分包商工资申请视图对象")
public class FbsWageApplication 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;
/** 项目名称 */
@Excel(name = "项目名称")
@ApiModelProperty("项目名称")
private String projectName;
/** 标段ID */
@Excel(name = "标段ID")
@ApiModelProperty("标段ID")
private Long sectionId;
/** 分包ID */
@Excel(name = "分包ID")
@ApiModelProperty("分包ID")
private Long subId;
/** 分包主题 */
@Excel(name = "分包主题")
@ApiModelProperty("分包主题")
private String subName;
/** 任务地址(项目地址) */
@Excel(name = "任务地址(项目地址)")
@ApiModelProperty("任务地址(项目地址)")
private String projectAddress;
/** 申请人ID */
@Excel(name = "申请人ID")
@ApiModelProperty("申请人ID")
private Long userId;
/** 申请人 */
@Excel(name = "申请人")
@ApiModelProperty("申请人")
private String username;
/** 银行 */
@Excel(name = "银行")
@ApiModelProperty("银行")
private String bank;
/** 银行卡号 */
@Excel(name = "银行卡号")
@ApiModelProperty("银行卡号")
private String cardNo;
/** 联系电话 */
@Excel(name = "联系电话")
@ApiModelProperty("联系电话")
private String phone;
/** 申请金额 */
@Excel(name = "申请金额")
@ApiModelProperty("申请金额")
private BigDecimal applicantAmount;
/** 申请时间 */
@Excel(name = "申请时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("申请时间")
private LocalDateTime applyTime;
/** 用工情况 */
@Excel(name = "用工情况")
@ApiModelProperty("用工情况")
private String employmentSituation;
/** 完工情况 */
@Excel(name = "完工情况")
@ApiModelProperty("完工情况")
private String completionSituation;
/** 任务情况 */
@Excel(name = "任务情况")
@ApiModelProperty("任务情况")
private String taskSituation;
/** 审核状态（1审核中 2已审核 3未通过） */
@Excel(name = "审核状态" , readConverterExp = "1=审核中,2=已审核,3=未通过")
@ApiModelProperty("审核状态（1审核中 2已审核 3未通过）")
private String auditStatus;
/** 审核人Id */
@Excel(name = "审核人Id")
@ApiModelProperty("审核人Id")
private Long reviewerId;
/** 审核人名字 */
@Excel(name = "审核人名字")
@ApiModelProperty("审核人名字")
private String reviewerName;
/** 删除标志（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;
}

23
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsProjectListDTO.java Normal file
View File

@ -0,0 +1,23 @@
package com.ruoyi.fbs.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("分包商项目列表查询条件")
public class FbsProjectListDTO {
@ApiModelProperty("分页大小")
private Integer pageSize;
/** 当前页数 */
@ApiModelProperty("当前页数")
private Integer pageNum;
@ApiModelProperty("类型：0申请中，1已加入，2已竣工")
private Integer type;
@ApiModelProperty(value = "分包商Id",hidden = true)
private Long fbsUserId;
}

29
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/dto/FbsWageApplicationListDTO.java Normal file
View File

@ -0,0 +1,29 @@
package com.ruoyi.fbs.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 分包商工资申请分页查询对象 fbs_wage_application
*
* @author ruoyi
* @date 2025-03-26
*/
@Data
@ApiModel("分包商工资分页查询对象")
public class FbsWageApplicationListDTO {
/** 分页大小 */
@ApiModelProperty("分页大小")
private Integer pageSize;
/** 当前页数 */
@ApiModelProperty("当前页数")
private Integer pageNum;
@ApiModelProperty("类型：0-申请中 1-已结算")
private Integer type;
}

46
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/FbsProjectDetailVO.java Normal file
View File

@ -0,0 +1,46 @@
package com.ruoyi.fbs.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
@ApiModel("分包商项目详情")
public class FbsProjectDetailVO {
@ApiModelProperty("主键ID")
private Long id;
@ApiModelProperty("统一社会信用代码")
private String creditCode;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("单位名称")
private String unitName;
@ApiModelProperty("项目地址")
private String projectAddress;
@ApiModelProperty("项目状态(0-未开工，1-已开工，2已竣工，3已停工)")
private String projectStatus;
@ApiModelProperty("联系人")
private String contactPerson;
@ApiModelProperty("联系电话")
private String contactPhone;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
@ApiModelProperty("标段列表")
private List<FbsProjectSectionListVO> sectionList;
}

31
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/FbsProjectListVO.java Normal file
View File

@ -0,0 +1,31 @@
package com.ruoyi.fbs.domain.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel("分包商项目列表")
public class FbsProjectListVO {
@ApiModelProperty("主键ID")
private Long id;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("单位名称")
private String unitName;
@ApiModelProperty("项目地址")
private String projectAddress;
@ApiModelProperty("项目状态(0-未开工，1-已开工，2已竣工，3已停工)")
private String projectStatus;
@ApiModelProperty("标段列表")
private List<FbsProjectSectionListVO> sectionList;
}

26
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/FbsProjectSectionListVO.java Normal file
View File

@ -0,0 +1,26 @@
package com.ruoyi.fbs.domain.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel("分包商项目标段列表")
public class FbsProjectSectionListVO {
@ApiModelProperty("主键ID")
private Long id;
@ApiModelProperty("项目ID")
private Long projectId;
/** 标段名称 */
@ApiModelProperty("标段名称")
private String sectionName;
@ApiModelProperty("分包列表")
private List<FbsProjectSubcontractingListVO> subList;
}

38
ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/FbsProjectSubcontractingListVO.java Normal file
View File

@ -0,0 +1,38 @@
package com.ruoyi.fbs.domain.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel("分包商项目分包列表")
public class FbsProjectSubcontractingListVO {
@ApiModelProperty("主键ID")
private Long id;
@ApiModelProperty("项目ID")
private Long projectId;
/** 标段ID */
@ApiModelProperty("标段ID")
private Long sectionId;
/** 分包主题 */
@ApiModelProperty("分包主题")
private String subName;
/** 分包描述 */
@ApiModelProperty("分包描述")
private String subDescribe;
/** 分包金额 */
@ApiModelProperty("分包金额")
private BigDecimal subAmount;
/** 资质要求 */
@ApiModelProperty("资质要求")
private String qualification;
}

18
ruoyi-system/src/main/java/com/ruoyi/fbs/mapper/FbsUserMapper.java Normal file
View File

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

18
ruoyi-system/src/main/java/com/ruoyi/fbs/mapper/FbsWageApplicationMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.ruoyi.fbs.mapper;
import com.ruoyi.fbs.domain.FbsWageApplication;
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 FbsWageApplicationMapper extends BaseMapperPlus<FbsWageApplication> {
}

71
ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsUserService.java Normal file
View File

@ -0,0 +1,71 @@
package com.ruoyi.fbs.service;
import com.ruoyi.common.core.domain.entity.FbsUser;
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.domain.dto.CompanyAuthenticateDTO;
import com.ruoyi.fbs.bo.FbsUserQueryBo;
import java.util.Collection;
import java.util.List;
/**
* APP分包商用户Service接口
*
* @author ruoyi
* @date 2025-03-26
*/
public interface IFbsUserService extends IServicePlus<FbsUser> {
/**
* 查询单个
* @return
*/
FbsUser queryById(Long id);
/**
* 查询列表
*/
TableDataInfo<FbsUser> queryPageList(FbsUserQueryBo bo);
/**
* 查询列表
*/
List<FbsUser> queryList(FbsUserQueryBo bo);
/**
* 根据新增业务对象插入APP分包商用户
* @param bo APP分包商用户新增业务对象
* @return
*/
Boolean insert(FbsUser bo);
/**
* 根据编辑业务对象修改APP分包商用户
* @param bo APP分包商用户编辑业务对象
* @return
*/
Boolean update(FbsUser bo);
/**
* 校验并删除数据
* @param ids 主键集合
* @param isValid 是否校验,true-删除前校验,false-不校验
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 通过电话查询用户
*/
FbsUser selectUserByPhone(String phone);
/**
* 企业认证
*/
Boolean authenticate(CompanyAuthenticateDTO dto);
/**
* 企业认证
*/
FbsUser selectUserByUserId(Long userId);
}

61
ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsWageApplicationService.java Normal file
View File

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

128
ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsUserServiceImpl.java Normal file
View File

@ -0,0 +1,128 @@
package com.ruoyi.fbs.service.impl;
import cn.hutool.core.bean.BeanUtil;
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.domain.entity.FbsUser;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.domain.Company;
import com.ruoyi.common.domain.dto.CompanyAuthenticateDTO;
import com.ruoyi.common.service.ICompanyService;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.fbs.bo.FbsUserQueryBo;
import com.ruoyi.fbs.mapper.FbsUserMapper;
import com.ruoyi.fbs.service.IFbsUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* APP分包商用户Service业务层处理
*
* @author ruoyi
* @date 2025-03-26
*/
@Service
public class FbsUserServiceImpl extends ServicePlusImpl<FbsUserMapper, FbsUser> implements IFbsUserService {
@Autowired
private ICompanyService companyService;
@Override
public FbsUser queryById(Long id){
return getById(id);
}
@Override
public TableDataInfo<FbsUser> queryPageList(FbsUserQueryBo bo) {
Page<FbsUser> result = page(PageUtils.buildPage(), buildQueryWrapper(bo));
return PageUtils.buildDataInfo(result);
}
@Override
public List<FbsUser> queryList(FbsUserQueryBo bo) {
return list(buildQueryWrapper(bo));
}
private LambdaQueryWrapper<FbsUser> buildQueryWrapper(FbsUserQueryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<FbsUser> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getUserId() != null, FbsUser::getUserId, bo.getUserId());
lqw.eq(StrUtil.isNotBlank(bo.getPhone()), FbsUser::getPhone, bo.getPhone());
lqw.like(StrUtil.isNotBlank(bo.getUsername()), FbsUser::getUsername, bo.getUsername());
lqw.eq(StrUtil.isNotBlank(bo.getGender()), FbsUser::getGender, bo.getGender());
lqw.eq(StrUtil.isNotBlank(bo.getNation()), FbsUser::getNation, bo.getNation());
lqw.eq(StrUtil.isNotBlank(bo.getBirthdate()), FbsUser::getBirthdate, bo.getBirthdate());
lqw.eq(StrUtil.isNotBlank(bo.getIdentityCard()), FbsUser::getIdentityCard, bo.getIdentityCard());
lqw.eq(StrUtil.isNotBlank(bo.getArea()), FbsUser::getArea, bo.getArea());
lqw.eq(StrUtil.isNotBlank(bo.getSite()), FbsUser::getSite, bo.getSite());
lqw.eq(StrUtil.isNotBlank(bo.getBank()), FbsUser::getBank, bo.getBank());
lqw.eq(StrUtil.isNotBlank(bo.getCardNo()), FbsUser::getCardNo, bo.getCardNo());
lqw.like(StrUtil.isNotBlank(bo.getAvatarName()), FbsUser::getAvatarName, bo.getAvatarName());
lqw.eq(StrUtil.isNotBlank(bo.getPassword()), FbsUser::getPassword, bo.getPassword());
lqw.eq(StrUtil.isNotBlank(bo.getFrontPath()), FbsUser::getFrontPath, bo.getFrontPath());
lqw.eq(StrUtil.isNotBlank(bo.getReverseSidePath()), FbsUser::getReverseSidePath, bo.getReverseSidePath());
lqw.eq(StrUtil.isNotBlank(bo.getBankCardPath()), FbsUser::getBankCardPath, bo.getBankCardPath());
lqw.eq(bo.getCompanyId() != null, FbsUser::getCompanyId, bo.getCompanyId());
lqw.eq(StrUtil.isNotBlank(bo.getStatus()), FbsUser::getStatus, bo.getStatus());
return lqw;
}
@Override
public Boolean insert(FbsUser bo) {
FbsUser add = BeanUtil.toBean(bo, FbsUser.class);
validEntityBeforeSave(add);
return save(add);
}
@Override
public Boolean update(FbsUser bo) {
FbsUser update = BeanUtil.toBean(bo, FbsUser.class);
validEntityBeforeSave(update);
return updateById(update);
}
/**
* 保存前的数据校验
*
* @param entity 实体类数据
*/
private void validEntityBeforeSave(FbsUser entity){
//TODO 做一些数据校验,如唯一约束
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return removeByIds(ids);
}
@Override
public FbsUser selectUserByPhone(String phone) {
return baseMapper.selectOne(new LambdaQueryWrapper<FbsUser>().eq(FbsUser::getPhone, phone));
}
@Override
public Boolean authenticate(CompanyAuthenticateDTO dto) {
Company company = BeanUtil.copyProperties(dto, Company.class);
companyService.insert(company);
FbsUser fbsUser = selectUserByUserId(SecurityUtils.getAppUserId());
fbsUser.setCompanyId(company.getId());
return updateById(fbsUser);
}
@Override
public FbsUser selectUserByUserId(Long userId) {
return baseMapper.selectOne(new LambdaQueryWrapper<FbsUser>().eq(FbsUser::getUserId, userId));
}
}

114
ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsWageApplicationServiceImpl.java Normal file
View File

@ -0,0 +1,114 @@
package com.ruoyi.fbs.service.impl;
import cn.hutool.core.bean.BeanUtil;
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.AuditStatus;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.fbs.bo.FbsWageApplicationQueryBo;
import com.ruoyi.fbs.domain.FbsWageApplication;
import com.ruoyi.fbs.domain.dto.FbsWageApplicationListDTO;
import com.ruoyi.fbs.mapper.FbsWageApplicationMapper;
import com.ruoyi.fbs.service.IFbsWageApplicationService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 分包商工资申请Service业务层处理
*
* @author ruoyi
* @date 2025-03-26
*/
@Service
public class FbsWageApplicationServiceImpl extends ServicePlusImpl<FbsWageApplicationMapper, FbsWageApplication> implements IFbsWageApplicationService {
@Override
public FbsWageApplication queryById(Long id){
return getById(id);
}
@Override
public TableDataInfo<FbsWageApplication> queryPageList(FbsWageApplicationQueryBo bo) {
Page<FbsWageApplication> result = page(PageUtils.buildPage(), buildQueryWrapper(bo));
return PageUtils.buildDataInfo(result);
}
@Override
public List<FbsWageApplication> queryList(FbsWageApplicationQueryBo bo) {
return list(buildQueryWrapper(bo));
}
private LambdaQueryWrapper<FbsWageApplication> buildQueryWrapper(FbsWageApplicationQueryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<FbsWageApplication> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getProjectId() != null, FbsWageApplication::getProjectId, bo.getProjectId());
lqw.like(StrUtil.isNotBlank(bo.getProjectName()), FbsWageApplication::getProjectName, bo.getProjectName());
lqw.eq(bo.getSectionId() != null, FbsWageApplication::getSectionId, bo.getSectionId());
lqw.eq(bo.getSubId() != null, FbsWageApplication::getSubId, bo.getSubId());
lqw.like(StrUtil.isNotBlank(bo.getSubName()), FbsWageApplication::getSubName, bo.getSubName());
lqw.eq(StrUtil.isNotBlank(bo.getProjectAddress()), FbsWageApplication::getProjectAddress, bo.getProjectAddress());
lqw.eq(bo.getUserId() != null, FbsWageApplication::getUserId, bo.getUserId());
lqw.like(StrUtil.isNotBlank(bo.getUsername()), FbsWageApplication::getUsername, bo.getUsername());
lqw.eq(StrUtil.isNotBlank(bo.getBank()), FbsWageApplication::getBank, bo.getBank());
lqw.eq(StrUtil.isNotBlank(bo.getCardNo()), FbsWageApplication::getCardNo, bo.getCardNo());
lqw.eq(StrUtil.isNotBlank(bo.getPhone()), FbsWageApplication::getPhone, bo.getPhone());
lqw.eq(bo.getApplicantAmount() != null, FbsWageApplication::getApplicantAmount, bo.getApplicantAmount());
lqw.eq(bo.getApplyTime() != null, FbsWageApplication::getApplyTime, bo.getApplyTime());
lqw.eq(StrUtil.isNotBlank(bo.getEmploymentSituation()), FbsWageApplication::getEmploymentSituation, bo.getEmploymentSituation());
lqw.eq(StrUtil.isNotBlank(bo.getCompletionSituation()), FbsWageApplication::getCompletionSituation, bo.getCompletionSituation());
lqw.eq(StrUtil.isNotBlank(bo.getTaskSituation()), FbsWageApplication::getTaskSituation, bo.getTaskSituation());
lqw.eq(StrUtil.isNotBlank(bo.getAuditStatus()), FbsWageApplication::getAuditStatus, bo.getAuditStatus());
lqw.eq(bo.getReviewerId() != null, FbsWageApplication::getReviewerId, bo.getReviewerId());
lqw.like(StrUtil.isNotBlank(bo.getReviewerName()), FbsWageApplication::getReviewerName, bo.getReviewerName());
return lqw;
}
@Override
public Boolean insert(FbsWageApplication bo) {
FbsWageApplication add = BeanUtil.toBean(bo, FbsWageApplication.class);
validEntityBeforeSave(add);
return save(add);
}
@Override
public Boolean update(FbsWageApplication bo) {
FbsWageApplication update = BeanUtil.toBean(bo, FbsWageApplication.class);
validEntityBeforeSave(update);
return updateById(update);
}
/**
* 保存前的数据校验
*
* @param entity 实体类数据
*/
private void validEntityBeforeSave(FbsWageApplication entity){
//TODO 做一些数据校验,如唯一约束
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return removeByIds(ids);
}
@Override
public TableDataInfo<FbsWageApplication> record(FbsWageApplicationListDTO dto) {
LambdaQueryWrapper<FbsWageApplication> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(FbsWageApplication::getUserId, SecurityUtils.getAppUserId())
.eq(dto.getType() == 0, FbsWageApplication::getAuditStatus, AuditStatus.AUDIT.getCode())
.in(dto.getType() == 1, FbsWageApplication::getAuditStatus, AuditStatus.getAudit());
Page<FbsWageApplication> result = page(PageUtils.buildPage(), wrapper);
return PageUtils.buildDataInfo(result);
}
}

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);
}
}