优化
This commit is contained in:
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -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> {
|
||||
|
||||
}
|
||||
@ -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> {
|
||||
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
@ -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));
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user