Skip to content

Y
yifu-mvp
Commit 4378d128 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

测试环境校验服务

parent e1eaf909
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1626 additions and 229 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @ 4378d128
......@@ -94,7 +94,7 @@ public class TEmployeeContractInfo extends BaseEntity {
@Schema(description = "合同类型", name = "contractName")
private String contractName;
/**
* 签订期限employee_contract_type
* 签订期限e
* 0 已完成一定工作任务为期限
* 1 固定期限
* 2 无固定期限
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/DispatchAddVo.java 0 → 100644
View file @ 4378d128
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import java.util.List;
/**
* @Author fxj
* @Date 2022/7/19
* @Description 派单新增档案|项目档案|员工合同
* @Version 1.0
*/
public class DispatchAddVo {
/**
* 员工档案
**/
private List<EmpAddDispatchVo> empAdds;
/**
* 员工合同
**/
private List<EmpContractDispatchVo> contracts;
/**
* 员工项目档案
**/
private List<EmpProjectDispatchVo> projects;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/DispatchCheckVo.java 0 → 100644
View file @ 4378d128
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Author fxj
* @Date 2022/7/18
* @Description
* @Version 1.0
*/
@Data
public class DispatchCheckVo implements Serializable {
private List<String> idCards;
private List<String> codes;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/DispatchEmpVo.java 0 → 100644
View file @ 4378d128
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.Date;
/**
* @Author fxj
* @Date 2022/7/18
* @Description 派单新增档案
* @Version 1.0
*/
@Data
public class DispatchEmpVo implements Serializable {
/*******************对应项目编码档案&项目档案相关信息*************************/
/**
* 主键
*/
@Schema(description = "主键")
private String id;
@ExcelProperty(value = "员工主码")
private String empCode;
@Schema(description = "员工类型")
@ExcelAttribute(name = "员工类型", isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
@ExcelProperty(value = "员工类型")
private String empNatrue;
@Schema(description = "员工姓名")
@ExcelProperty(value = "员工姓名")
private String empName;
/**
* 身份证号码
*/
@Schema(description = "身份证号码")
@NotNull(message = "身份证号码不可为空")
@Size(max = 20, message = "身份证号码不可超过20位")
private String empIdcard;
/**
* 民族
*/
@Schema(description = "民族")
private String empNational;
/**
* 手机号码
*/
@Schema(description = "手机号码")
private String empPhone;
/**
* 身份证-省
*/
@Schema(description = "身份证-省")
private Integer idProvince;
/**
* 身份证-市
*/
@Schema(description = "身份证-市")
private Integer idCity;
/**
* 身份证-县
*/
@Schema(description = "身份证-县")
private Integer idTown;
/**
* 户口性质
*/
@Schema(description = "户口性质")
private String empRegisType;
/**
* 档案-省
*/
@Schema(description = "档案-省")
private Integer fileProvince;
/**
* 档案-市
*/
@Schema(description = "档案-市")
private Integer fileCity;
/**
* 档案-县
*/
@Schema(description = "档案-县")
private Integer fileTown;
/**
* 最高学历（字典值）
*/
@Schema(description = "最高学历（字典值）")
private String hignEducation;
/**
* 档案状态（0正常；1已减档）
*/
@Schema(description = "档案状态（0正常；1已减档）")
private Integer fileStatus;
// 以下是项目档案信息
@TableField(exist = false)
@Schema(description = "单位名称")
private String unitName;
@TableField(exist = false)
@Schema(description = "单位编码")
private String unitNo;
@TableField(exist = false)
@Schema(description = "项目id")
private String deptId;
@TableField(exist = false)
@Schema(description = "项目名称")
private String deptName;
@TableField(exist = false)
@Schema(description = "项目编码")
private String deptNo;
@TableField(exist = false)
@Schema(description = "就职岗位")
private String post;
/*******************对应项目编码合同相关信息*************************/
/**
* 合同类型
*/
@NotBlank(message = "合同类型不能为空")
@Length(max = 32, message = "合同类型不能超过32个字符")
@ExcelAttribute(name = "合同类型", maxLength = 32, needExport = true)
@Schema(description = "合同类型", name = "contractName")
private String contractName;
/**
* 签订期限
* 0 已完成一定工作任务为期限
* 1 固定期限
* 2 无固定期限
*/
@NotBlank(message = "签订期限不能为空")
@Length(max = 32, message = "签订期限不能超过32个字符")
@ExcelAttribute(name = "签订期限", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE, needExport = true)
@Schema(description = "签订期限", name = "contractType")
private String contractType;
/**
* 合同起始时间
*/
@NotBlank(message = "合同起始时间不能为空")
@ExcelAttribute(name = "合同起始时间", needExport = true)
@Schema(description = "合同起始时间", name = "contractStart")
private Date contractStart;
/**
* 合同到期时间
*/
@ExcelAttribute(name = "合同到期时间", needExport = true)
@Schema(description = "合同到期时间", name = "contractEnd")
private Date contractEnd;
/**
* 合同年限
*/
@NotBlank(message = "合同年限不能为空")
@ExcelAttribute(name = "合同年限", errorInfo = "合同年限不能为空")
@Schema(description = "合同年限", name = "contractTerm")
private String contractTerm;
/**
* 业务细分
*/
@NotBlank(message = "业务细分不能为空")
@Length(max = 32, message = "业务细分不能超过32个字符")
@ExcelAttribute(name = "业务细分", maxLength = 32, needExport = true)
@Schema(description = "业务细分（存lable）", name = "contractName")
private String contractSubName;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpAddDispatchVo.java 0 → 100644
View file @ 4378d128
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
* @Author fxj
* @Date 2022/7/19
* @Description
* @Version 1.0
*/
@Data
public class EmpAddDispatchVo extends TEmployeeInfo {
/**
* 员工类型（字典值，0外包1派遣2代理）
*/
@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@Schema(description = "员工类型（字典值，0外包1派遣2代理）")
private String empNatrue;
/**
* 员工姓名
*/
@Schema(description = "员工姓名")
@NotNull(message = "员工姓名不可为空")
@Size(max = 20, message = "员工姓名不可超过20位")
private String empName;
/**
* 身份证号码
*/
@Schema(description = "身份证号码")
@NotNull(message = "身份证号码不可为空")
@Size(max = 20, message = "身份证号码不可超过20位")
private String empIdcard;
/**
* 民族
*/
@Schema(description = "民族")
private String empNational;
/**
* 手机号码
*/
@Schema(description = "手机号码")
@NotNull(message = "手机号码不可为空")
@Size(max = 11, min = 11, message = "手机号码只能11位")
private String empPhone;
/**
* 身份证-省
*/
@Schema(description = "身份证-省")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer idProvince;
/**
* 身份证-市
*/
@Schema(description = "身份证-市")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer idCity;
/**
* 身份证-县
*/
@Schema(description = "身份证-县")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer idTown;
/**
* 户口性质
*/
@Schema(description = "户口性质")
private String empRegisType;
/**
* 档案-省
*/
@Schema(description = "档案-省")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer fileProvince;
/**
* 档案-市
*/
@Schema(description = "档案-市")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer fileCity;
/**
* 档案-县
*/
@Schema(description = "档案-县")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer fileTown;
/**
* 备注
*/
@Schema(description = "备注")
private String remark;
/**
* 人员档案来源（字典：4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬）
* 1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入
*/
@Schema(description = "人员档案来源（字典：1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入）")
private String fileSource;
/**
* 人员档案状态（0草稿、1已审核）
*/
@Schema(description = "人员档案状态（0草稿、1已审核）")
private Integer status;
/**
* 档案状态（0正常；1已减档）
*/
@Schema(description = "档案状态（0正常；1已减档）")
private Integer fileStatus;
/**
* 现存项目数
*/
@Schema(description = "现存项目数")
private Integer projectNum;
/**
* 员工合同状态（字典）
*/
@Schema(description = "员工合同状态（字典）0初始状态")
private Integer contractStatus;
/**
* 社保状态（字典）
*/
@Schema(description = "社保状态（字典）0初始状态")
private Integer socialStatus;
/**
* 公积金状态（字典）0初始状态
*/
@Schema(description = "公积金状态（字典）0初始状态")
private Integer fundStatus;
/**
* 是否删除 0否/1是
*/
@Schema(description = "是否删除 0否/1是")
private String deleteFlag;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java 0 → 100644
View file @ 4378d128
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.Date;
/**
* @Author fxj
* @Date 2022/7/19
* @Description 派单新增合同
* @Version 1.0
*/
@Data
public class EmpContractDispatchVo implements Serializable {
/**
* 员工主键
*/
@Length(max = 32, message = "员工主键不能超过32个字符")
@ExcelAttribute(name = "员工主键", maxLength = 32)
@Schema(description = "员工主键", name = "empId")
private String empId;
/**
* 员工编码
*/
@NotBlank(message = "员工编码不能为空")
@Length(max = 32, message = "员工编码不能超过32个字符")
@ExcelAttribute(name = "员工编码", isNotEmpty = true, errorInfo = "员工编码不能为空", maxLength = 32)
@Schema(description = "员工编码", name = "empNo")
private String empNo;
/**
* 员工姓名
*/
@Length(max = 20, message = "员工姓名不能超过20个字符")
@ExcelAttribute(name = "员工姓名", isNotEmpty = true, maxLength = 20, needExport = true)
@Schema(description = "员工姓名", name = "empName")
private String empName;
/**
* 员工身份证号
*/
@Length(max = 20, message = "身份证号不能超过20个字符")
@ExcelAttribute(name = "身份证号", isNotEmpty = true, maxLength = 20, isIdCard = true, needExport = true)
@Schema(description = "身份证号", name = "empIdcard")
private String empIdcard;
/**
* 员工类型
*/
@ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
@TableField(exist = false)
private String empType;
/**
* 项目编码
*/
@Length(max = 20, message = "项目编码不能超过20个字符")
@ExcelAttribute(name = "项目编码", isNotEmpty = true, maxLength = 20, needExport = true)
@Schema(description = "项目编码")
private String deptNo;
/**
* 签订类型（字典）
*/
@NotBlank(message = "签订类型不能为空")
@Length(max = 20, message = "签订类型不能超过20个字符")
@ExcelAttribute(name = "签订类型", isNotEmpty = true, errorInfo = "签订类型不能为空", maxLength = 20, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_SITUATION_TYPE)
@Schema(description = "签订类型（字典）", name = "situation")
private String situation;
/**
* 合同类型
*/
@NotBlank(message = "合同类型不能为空")
@Length(max = 32, message = "合同类型不能超过32个字符")
@ExcelAttribute(name = "合同类型", maxLength = 32, needExport = true)
@Schema(description = "合同类型", name = "contractName")
private String contractName;
/**
* 业务细分
*/
@NotBlank(message = "业务细分不能为空")
@Length(max = 32, message = "业务细分不能超过32个字符")
@ExcelAttribute(name = "业务细分", maxLength = 32, needExport = true)
@Schema(description = "业务细分", name = "contractName")
private String contractSubName;
/**
* 合同甲方
*/
@Length(max = 50, message = "原因说明不能超过200个字符")
@ExcelAttribute(name = "合同甲方", maxLength = 50, needExport = true)
@Schema(description = "合同甲方")
@Size(max = 50, message = "合同甲方不可超过50位")
private String contractParty;
/**
* 签订期限
* 0 已完成一定工作任务为期限
* 1 固定期限
* 2 无固定期限
*/
@NotBlank(message = "签订期限不能为空")
@Length(max = 32, message = "签订期限不能超过32个字符")
@ExcelAttribute(name = "签订期限", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE, needExport = true)
@Schema(description = "签订期限", name = "contractType")
private String contractType;
/**
* 合同起始时间
*/
@NotBlank(message = "起始日期不能为空")
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "起始日期", isDate = true)
@Schema(description = "起始日期", name = "contractStart")
private Date contractStart;
/**
* 合同到期时间
*/
@ExcelAttribute(name = "截止日期", needExport = true, isDate = true)
@DateTimeFormat("yyyy-MM-dd")
@Schema(description = "截止日期", name = "contractEnd")
private Date contractEnd;
/**
* 合同岗位
*/
@Length(max = 32, message = "合同岗位不能超过32个字符")
@ExcelAttribute(name = "合同岗位", maxLength = 32, needExport = true)
@Schema(description = "合同岗位", name = "post")
private String post;
/**
* 工时制（数据字典） 1标准工时 2 综合工时 3不定时工时制
*/
@Length(max = 32, message = "工时制不能超过32个字符")
@ExcelAttribute(name = "工时制", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.WORKING_HOURS)
@Schema(description = "工时制（数据字典） 1标准工时 2 综合工时 3不定时工时制", name = "workingHours")
private String workingHours;
/**
* 备注
*/
@Length(max = 200, message = "不能超过200个字符")
@ExcelAttribute(name = "备注", maxLength = 200)
@Schema(description = "备注", name = "remark")
private String remark;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpProjectDispatchVo.java 0 → 100644
View file @ 4378d128
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
/**
* @Author fxj
* @Date 2022/7/19
* @Description 派单新增项目档案
* @Version 1.0
*/
@Data
public class EmpProjectDispatchVo implements Serializable {
/**
* 人员档案主表id
*/
@Schema(description ="人员档案主表id")
@Size(max = 32, message = "人员档案主表id不可超过32位")
private String empId;
/**
* 员工编码
*/
@Schema(description ="员工编码")
@Size(max = 20, message = "员工编码不可超过20位")
private String empNo;
/**
* 员工类型（字典值，0外包1派遣2代理）
*/
@NotNull(message = "员工类型不能为空")
@ExcelAttribute(name = "员工类型",isNotEmpty = true, errorInfo = "员工类型不能为空",maxLength = 2,isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
@ExcelProperty(value ="员工类型")
private String empNatrue;
/**
* 员工姓名
*/
@NotNull(message = "员工姓名不能为空")
@ExcelAttribute(name = "员工姓名",isNotEmpty = true, errorInfo = "员工姓名不能为空",maxLength = 20)
@ExcelProperty(value ="员工姓名")
private String empName;
/**
* 身份证号码
*/
@NotNull(message = "身份证号不能为空")
@ExcelAttribute(name = "身份证号",isNotEmpty = true, errorInfo = "身份证号不能为空",maxLength = 20)
@ExcelProperty(value ="身份证号")
private String empIdcard;
/**
* 项目编码
*/
@NotNull(message = "项目编码不能为空")
@ExcelProperty(value ="项目编码")
@ExcelAttribute(name = "项目编码",isNotEmpty = true, errorInfo = "项目编码不能为空",maxLength = 20)
private String deptNo;
/**
* 合同类型（字典值）
*/
@NotNull(message = "合同类型不能为空")
@ExcelProperty(value ="合同类型")
@ExcelAttribute(name = "合同类型",isNotEmpty = true, errorInfo = "合同类型不能为空",maxLength = 10,isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
private String contractType;
/**
* 工时制
*/
@ExcelProperty(value ="工时制")
@ExcelAttribute(name = "工时制",maxLength = 10,isDataId = true,dataType = ExcelAttributeConstants.WORKING_HOURS)
private String workingHours;
/**
* 就职岗位
*/
@NotNull(message = "就职岗位不能为空")
@ExcelProperty(value ="就职岗位")
@ExcelAttribute(name = "就职岗位",isNotEmpty = true, errorInfo = "就职岗位不能为空",maxLength = 20)
private String post;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @ 4378d128
......@@ -107,7 +107,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
private String contractParty;
/**
* 签订期限employee_contract_type
* 签订期限
* 0 已完成一定工作任务为期限
* 1 固定期限
* 2 无固定期限
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddCompanyInfoController.java
View file @ 4378d128
......@@ -22,12 +22,12 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddCompanyInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.FddCompanyInfoService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddContractAttachInfoController.java
View file @ 4378d128
......@@ -27,14 +27,14 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.net.URLDecoder;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddContractInfoController.java
View file @ 4378d128
......@@ -31,12 +31,12 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddContractTemplateController.java
View file @ 4378d128
......@@ -23,12 +23,12 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractTemplate;
import com.yifu.cloud.plus.v1.yifu.archives.service.FddContractTemplateService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddContractTemplateFileController.java
View file @ 4378d128
......@@ -23,12 +23,12 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractTemplateFile;
import com.yifu.cloud.plus.v1.yifu.archives.service.FddContractTemplateFileService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddGlobalFieldInfoController.java
View file @ 4378d128
......@@ -23,12 +23,12 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddGlobalFieldInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.FddGlobalFieldInfoService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddPersonAccountController.java
View file @ 4378d128
......@@ -24,12 +24,12 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddPersonAccount;
import com.yifu.cloud.plus.v1.yifu.archives.service.FddPersonAccountService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddReqLogController.java
View file @ 4378d128
......@@ -22,12 +22,12 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddReqLog;
import com.yifu.cloud.plus.v1.yifu.archives.service.FddReqLogService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddSealInfoController.java
View file @ 4378d128
......@@ -17,18 +17,17 @@
package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fadada.api.exception.ApiException;
import com.yifu.cloud.plus.v1.yifu.archives.entity.FddSealInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.FddSealInfoService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddSealPersonAuthController.java
View file @ 4378d128
......@@ -23,12 +23,12 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddSealPersonAuth;
import com.yifu.cloud.plus.v1.yifu.archives.service.FddSealPersonAuthService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddTemplateFieldInfoController.java
View file @ 4378d128
......@@ -23,12 +23,12 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.FddTemplateFieldInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.FddTemplateFieldInfoService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCertRecordController.java
View file @ 4378d128
......@@ -18,7 +18,6 @@
package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TCertRecord;
import com.yifu.cloud.plus.v1.yifu.archives.service.TCertRecordService;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCutsomerDataPermissonController.java
View file @ 4378d128
......@@ -16,8 +16,6 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpBadRecordController.java
View file @ 4378d128
......@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpBadRecord;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpBadRecordService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpBadRecordSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
......@@ -36,10 +35,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpContractAlertController.java
View file @ 4378d128
......@@ -26,17 +26,13 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.java.Log;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
......@@ -147,7 +143,7 @@ public class TEmpContractAlertController {
* @Date 2022-07-4
**/
@SysLog("定时任务生成合同续签代码信息")
@PostMapping("/inner/taskCreateContractAlert")
@PostMapping("/taskCreateContractAlert")
@Inner
public R taskCreateContractAlert() {
return tEmpContractAlertService.taskCreateContractAlert();
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpDisabilityInfoController.java
View file @ 4378d128
......@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpDisabilityInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpDisabilityInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DisabilitySearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpFamilyController.java
View file @ 4378d128
......@@ -27,14 +27,12 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.SettleDomainUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpProfessionalQualificationController.java
View file @ 4378d128
......@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpProfessionalQualification;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpProfessionalQualificationService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.CertifySearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpWorkRecordingController.java
View file @ 4378d128
......@@ -23,7 +23,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpWorkRecording;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpWorkRecordingService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.WorkRecordSearchVO;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @ 4378d128
......@@ -23,6 +23,8 @@ import com.pig4cloud.plugin.excel.vo.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDataAuth;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchCheckVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchEmpVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ErrorMessageVO;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
......@@ -33,6 +35,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
......@@ -49,6 +52,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
/**
......@@ -420,4 +424,18 @@ public class TEmployeeInfoController {
tEmployeeInfoService.exportLeaveEmployee(employeeInfo, response);
}
/**
* 通过身份和编码查询档案 项目档案 合同信息
*
* @Author hgw
* @Date 2022-6-24 09:36:06
**/
@Operation(description = "通过身份和编码查询档案 项目档案 合同信息")
@SysLog("通过身份和编码查询档案 项目档案 合同信息")
@Inner
@GetMapping("/getDispatchEmpVo")
public Map<String, DispatchEmpVo> getDispatchEmpVo(@RequestBody(required = true)DispatchCheckVo checkVo) {
return tEmployeeInfoService.getDispatchEmpVo(checkVo);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeLogController.java
View file @ 4378d128
......@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeLog;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeLogService;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @ 4378d128
......@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
......@@ -34,7 +33,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeInfoMapper.java
View file @ 4378d128
......@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchCheckVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchEmpVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpEducationUpdateVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeExportVO;
import org.apache.ibatis.annotations.Mapper;
......@@ -73,4 +75,5 @@ public interface TEmployeeInfoMapper extends BaseMapper<TEmployeeInfo> {
**/
String getMaxEmpCode();
List<DispatchEmpVo> getDispatchEmpVo(@Param("checkVo")DispatchCheckVo checkVo);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeInfoService.java
View file @ 4378d128
......@@ -22,16 +22,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.pig4cloud.plugin.excel.vo.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpEducationUpdateVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeLeaveVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ErrorMessageVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import org.springframework.validation.BindingResult;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
/**
* 人员档案表
......@@ -183,4 +181,5 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
**/
void exportLeaveEmployee(TEmployeeInfo employeeVo, HttpServletResponse response);
Map<String,DispatchEmpVo> getDispatchEmpVo(DispatchCheckVo checkVo);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @ 4378d128
......@@ -29,8 +29,10 @@ import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpBadRecord;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContractAlert;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmpContractAlertMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpContractAlertService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ContractAlertSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
......@@ -61,6 +63,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
private final TEmployeeContractInfoMapper contractInfoMapper;
private final TEmployeeInfoMapper employeeInfoMapper;
@Override
public IPage<TEmpContractAlert> pageDiy(Page page, ContractAlertSearchVo searchVo) {
LambdaQueryWrapper<TEmpContractAlert> wrapper = buildQueryWrapper(searchVo);
......@@ -207,16 +211,20 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
@Override
public R<Boolean> taskCreateContractAlert() {
baseMapper.truncate();
// 获取合同为在档、员工类型为“派遣”、“外包”、最近一次合同审核通过、过期或离过期还有3个月的数据
// 获取合同为在档、员工类型为“0外包”、“1派遣”、最近一次合同审核通过、过期或离过期还有3个月的数据
List<TEmployeeContractInfo> alertList = contractInfoMapper.selectList(Wrappers.<TEmployeeContractInfo>query()
.lambda().eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
.isNotNull(TEmployeeContractInfo::getAuditTimeLast)
.eq(TEmployeeContractInfo::getContractType,"1")
.eq(TEmployeeContractInfo::getWorkFlag,CommonConstants.ZERO_STRING)
.ge(TEmployeeContractInfo::getAuditTimeLast,DateUtil.dateIncreaseByMonth(DateUtil.getCurrentDateTime(),CommonConstants.THREE_INT_NEGATE))
.le(TEmployeeContractInfo::getContractEnd,DateUtil.dateIncreaseByDay(
DateUtil.dateIncreaseByMonth(DateUtil.getCurrentDateTime(),
CommonConstants.dingleDigitIntArray[3]),CommonConstants.dingleDigitIntArray[1]))
.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING));
// 获取所有未审核通过的合同数据
List<TEmployeeContractInfo> notAccessList = contractInfoMapper.selectList(Wrappers.<TEmployeeContractInfo>query()
.lambda().ne(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
.eq(TEmployeeContractInfo::getContractType,"1")
.eq(TEmployeeContractInfo::getWorkFlag,CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING));
Map<String,TEmpContractAlert> alertMap = new HashMap<>();
......@@ -246,10 +254,18 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
private void extracted(Date nowDate,
TEmployeeContractInfo contract,
Map<String,TEmpContractAlert> alertMap) {
TEmployeeInfo employeeInfo = employeeInfoMapper.selectById(contract.getEmpId());
if (Common.isNotNull(employeeInfo)
&& !CommonConstants.ZERO_STRING.equals(employeeInfo.getEmpNatrue())
&& !CommonConstants.ONE_STRING.equals(employeeInfo.getEmpNatrue())){
return;
}
TEmpContractAlert alert = alertMap.get(contract.getEmpIdcard());
// 存在多个审核通过的数据 用最新的审核通过的合同覆盖已有的
if (Common.isNotNull(alert) &&
alert.getContractEnd().after(contract.getContractEnd())){
if (Common.isNotNull(alert)
&& Common.isNotNull(alert.getContractEnd())
&& Common.isNotNull(contract.getContractEnd())
&& alert.getContractEnd().after(contract.getContractEnd())){
return;
}
alert = new TEmpContractAlert();
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @ 4378d128
......@@ -65,6 +65,7 @@ import java.io.InputStream;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
/**
* 人员档案表
......@@ -2041,4 +2042,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
@Override
public Map<String,DispatchEmpVo> getDispatchEmpVo(DispatchCheckVo checkVo) {
List<DispatchEmpVo> voList = baseMapper.getDispatchEmpVo(checkVo);
if (Common.isNotNull(voList)){
return voList.stream().collect(Collectors.toMap(k->k.getEmpIdcard(), k->k));
}
return null;
}
}
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ExcelAttributeConstants.java
View file @ 4378d128
......@@ -41,7 +41,7 @@ public class ExcelAttributeConstants {
public static final String CUSTOMER_BUSSINESS_SUB_TYPE = "customer_business_sub_type";
//员工合同类型
//员工合同类型---签订期限
public static final String EMPLOYEE_CONTRACT_TYPE = "employee_contract_type" ;
//员工合同工时制 1标准工时 2 综合工时 3不定时工时制
......@@ -57,6 +57,7 @@ public class ExcelAttributeConstants {
public static final String IS_ILLNESS = "is_illness";
//社保大病取值方式 0 按比例 1按定值
public static final String VALUE_TYPE = "value_type";
public static final String NATION = "nation";
//家庭信息：与本人关系
public static final String RELATIONSHIP_SELF = "relationship_self";
......@@ -68,8 +69,12 @@ public class ExcelAttributeConstants {
public static final String NATURE ="nature";
//员工档案：婚姻状况
public static final String MARITAL_STATUS = "marital_status";
//员工档案：人员类型
//员工档案：人员类型(合同类型)
public static final String PERSONNEL_TYPE = "personnel_type";
//合同业务细分
public static final String PERSONNEL_TYPE_SUB = "personnel_type_sub";
//员工档案：员工标签
public static final String EMPLOYEE_LABLE = "employee_lable";
//员工档案：政治面貌
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java
View file @ 4378d128
......@@ -335,4 +335,47 @@ public interface ErrorCodes {
* 派单员工社保相关信息不可为空
*/
String EMP_DISPATCH_SOCIAL_NOT_EMPTY = "emp.dispatch.social.not.empty";
/**
* 派单员工公积金相关信息不可为空
*/
String EMP_DISPATCH_FUND_NOT_EMPTY = "emp.dispatch.fund.not.empty";
/**
* 新增异常：存在派增待审核|待办理|办理成功但未派减办理成功的社保数据
*/
String EMP_DISPATCH_SOCIAL_EXISTING = "emp.dispatch.social.existing";
/**
* 新增异常：存在办理成功未派减的工伤社保数据
*/
String EMP_DISPATCH_SOCIAL_INJURY_EXISTING = "emp.dispatch.social.injury.existing";
/**
* 新增异常：存在办理成功未派减的五险社保数据，禁止新增工伤
*/
String EMP_DISPATCH_SOCIAL_NOT_REDUCE = "emp.dispatch.social.not.reduce";
/**
* 新增异常：存在办理成功未派减的工伤社保数据，禁止新增五险
*/
String EMP_DISPATCH_SOCIAL_INJURY_NOT_REDUCE = "emp.dispatch.social.injury.not.reduce";
/**
* 新增异常：未找到对应社保户名称的可用基数配置信息
*/
String EMP_DISPATCH_SOCIAL_HOLD_NOT_EXIST = "emp.dispatch.social.hold.not.exist";
/**
* 新增异常：未找到对应公积金户名称的可用基数配置信息
*/
String EMP_DISPATCH_FUND_HOLD_NOT_EXIST = "emp.dispatch.fund.hold.not.exist";
/**
* 新增异常：未找到对应公积金比例配置信息
*/
String EMP_DISPATCH_FUND_PERCENT_NOT_EXIST = "emp.dispatch.fund.percent.not.exist";
/**
* 新增异常：单次导入不支持社保公积金分开派单
*/
String EMP_DISPATCH_SOCIAL_EXIST = "emp.dispatch.social.exist";
/**
* 新增异常：必须派单社保或公积金，不支持单派档案
*/
String EMP_DISPATCH_SOCIAL_AND_FUND_NOT_EMPTY = "emp.dispatch.social.and.fund.not.empty";
}
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @ 4378d128
......@@ -113,6 +113,25 @@ emp.dispatch.contract.not.empty=\u6D3E\u5355\u5458\u5DE5\u5408\u540C\u76F8\u5173
emp.dispatch.social.not.empty=\u6D3E\u5355\u5458\u5DE5\u793E\u4FDD\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.fund.not.empty=\u6D3E\u5355\u5458\u5DE5\u516C\u79EF\u91D1\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.social.existing=\u65B0\u589E\u5F02\u5E38\uFF1A\u5B58\u5728\u6D3E\u589E\u5F85\u5BA1\u6838|\u5F85\u529E\u7406|\u529E\u7406\u6210\u529F\u4F46\u672A\u6D3E\u51CF\u529E\u7406\u6210\u529F\u7684\u793E\u4FDD\u6570\u636E
emp.dispatch.social.injury.existing=\u65B0\u589E\u5F02\u5E38\uFF1A\u5B58\u5728\u529E\u7406\u6210\u529F\u672A\u6D3E\u51CF\u7684\u5DE5\u4F24\u793E\u4FDD\u6570\u636E
emp.dispatch.social.not.reduce=\u65B0\u589E\u5F02\u5E38\uFF1A\u5B58\u5728\u529E\u7406\u6210\u529F\u672A\u6D3E\u51CF\u7684\u4E94\u9669\u793E\u4FDD\u6570\u636E\uFF0C\u7981\u6B62\u65B0\u589E\u5DE5\u4F24
emp.dispatch.social.injury.not.reduce=\u65B0\u589E\u5F02\u5E38\uFF1A\u5B58\u5728\u529E\u7406\u6210\u529F\u672A\u6D3E\u51CF\u7684\u5DE5\u4F24\u793E\u4FDD\u6570\u636E\uFF0C\u7981\u6B62\u65B0\u589E\u4E94\u9669
emp.dispatch.social.hold.not.exist=\u65B0\u589E\u5F02\u5E38\uFF1A\u672A\u627E\u5230\u5BF9\u5E94\u793E\u4FDD\u6237\u540D\u79F0\u7684\u53EF\u7528\u57FA\u6570\u914D\u7F6E\u4FE1\u606F
emp.dispatch.fund.hold.not.exist=\u65B0\u589E\u5F02\u5E38\uFF1A\u672A\u627E\u5230\u5BF9\u5E94\u516C\u79EF\u91D1\u6237\u540D\u79F0\u7684\u53EF\u7528\u57FA\u6570\u914D\u7F6E\u4FE1\u606F
emp.dispatch.fund.percent.not.exist=\u65B0\u589E\u5F02\u5E38\uFF1A\u672A\u627E\u5230\u5BF9\u5E94\u516C\u79EF\u91D1\u6BD4\u4F8B\u914D\u7F6E\u4FE1\u606F
emp.dispatch.social.exist=\u65B0\u589E\u5F02\u5E38\uFF1A\u5355\u6B21\u5BFC\u5165\u4E0D\u652F\u6301\u793E\u4FDD\u516C\u79EF\u91D1\u5206\u5F00\u6D3E\u5355
emp.dispatch.social.and.fund.not.empty=\u65B0\u589E\u5F02\u5E38\uFF1A\u5FC5\u987B\u6D3E\u5355\u793E\u4FDD\u6216\u516C\u79EF\u91D1\uFF0C\u4E0D\u652F\u6301\u5355\u6D3E\u6863\u6848
......
yifu-common/yifu-common-dapr/pom.xml
View file @ 4378d128
......@@ -17,7 +17,13 @@
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-upms-api</artifactId>
</dependency>
</dependencies>
<dependency>
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-archives-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
......
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SettleDomainUtil.java → yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @ 4378d128
package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchCheckVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchEmpVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
......@@ -7,9 +9,9 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
/**
* @Author fxj
......@@ -19,9 +21,16 @@ import java.util.List;
*/
@Log4j2
@EnableConfigurationProperties(DaprArchivesProperties.class)
public class SettleDomainUtil {
public class ArchivesDaprUtil {
@Autowired
private DaprArchivesProperties daprArchivesProperties;
/**
* @Author fxj
* @Description 获取登录用户对应的计算主体权限
* @Date 21:15 2022/7/18
* @Param
* @return
**/
public R<List<String>> getSettleDomainIdsByUserId(){
R<List<String>> res = HttpDaprUtil.invokeMethodGet(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainIdsByUserId","", Object.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
......@@ -29,4 +38,18 @@ public class SettleDomainUtil {
}
return res;
}
/**
* @Author fxj
* @Description 获取派单校验需要的档案信息
* @Date 21:18 2022/7/18
* @Param
* @return
**/
public R<Map> getDispatchEmpVo(DispatchCheckVo checkVo){
R<Map> res = HttpDaprUtil.invokeMethodGet(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeinfo/getDispatchEmpVo","", Map.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("获取档案派单信息失败！");
}
return res;
}
}
yifu-common/yifu-common-dapr/src/main/resources/META-INF/spring.factories
View file @ 4378d128
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SettleDomainUtil
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/CreateContractAlertTask.java
View file @ 4378d128
......@@ -30,7 +30,7 @@ public class CreateContractAlertTask {
**/
public void createContractAlertTask() {
log.info("------------定时任务生成续签代办提醒-定时任务开始------------");
HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tempcontractalert/inner/taskCreateContractAlert","", Object.class, SecurityConstants.FROM_IN);
HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tempcontractalert/taskCreateContractAlert","", Object.class, SecurityConstants.FROM_IN);
log.info("------------定时任务生成续签代办提醒-定时任务结束------------");
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysBaseSetInfo.java
View file @ 4378d128
......@@ -465,4 +465,5 @@ public class SysBaseSetInfo extends BaseEntity {
@TableField(exist = false)
private List<SysPayProportion> fundProList;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TProvidentFund.java
View file @ 4378d128
......@@ -118,21 +118,21 @@ public class TProvidentFund extends BaseEntity {
@ExcelProperty("原ID（数据迁移）" )
private String oldId;
/**
* 审核状态（0待审核/1已审核）
* 审核状态（0 未审核 1 审核通过 2审核不通过）
*/
@NotBlank(message = "审核状态（0待审核/1已审核）不能为空" )
@Length(max = 32, message = "审核状态（0待审核/1已审核） 不能超过32个字符" )
@ExcelAttribute(name = "审核状态（0待审核/1已审核）", isNotEmpty = true, errorInfo = "审核状态（0待审核/1已审核）不能为空", maxLength = 32)
@Schema(description = "审核状态（0待审核/1已审核）" )
@Schema(description = "审核状态:（0 未审核 1 审核通过 2审核不通过）" )
@ExcelProperty("审核状态（0待审核/1已审核）" )
private String auditStatus;
/**
* 办理状态（0待办理/1已办理）
* 办理状态（0待办理/1已办理2办理失败3已派减）
*/
@NotBlank(message = "办理状态（0待办理/1已办理）不能为空" )
@Length(max = 32, message = "办理状态（0待办理/1已办理） 不能超过32个字符" )
@ExcelAttribute(name = "办理状态（0待办理/1已办理）", isNotEmpty = true, errorInfo = "办理状态（0待办理/1已办理）不能为空", maxLength = 32)
@Schema(description = "办理状态（0待办理/1已办理）" )
@Schema(description = "办理状态（0待办理/1已办理2办理失败3已派减）" )
@ExcelProperty("办理状态（0待办理/1已办理）" )
private String handleStatus;
/**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @ 4378d128
......@@ -203,36 +203,34 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("缴纳地-县" )
private String fundTown;
/**
* 社保派增状态：待审核、待办理、办理成功、部分办理失败、办理失败
* 社保派增状态：0待审核、1待办理、2办理成功、3部分办理失败、4办理失败
*/
@Length(max = 1, message = "社保派增状态：待审核、待办理、办理成功、部分办理失败、办理失败 不能超过1个字符" )
@ExcelAttribute(name = "社保派增状态：待审核、待办理、办理成功、部分办理失败、办理失败", maxLength = 1)
@Schema(description = "社保派增状态：待审核、待办理、办理成功、部分办理失败、办理失败" )
@ExcelProperty("社保派增状态：待审核、待办理、办理成功、部分办理失败、办理失败" )
@Length(max = 1, message = "社保派增状态 不能超过1个字符" )
@ExcelAttribute(name = "社保派增状态", maxLength = 1)
@Schema(description = "社保派增状态：0待审核、1待办理、2办理成功、3部分办理失败、4办理失败" )
@ExcelProperty("社保派增状态" )
private String socialAddStatus;
/**
* 公积金派增状态：待审核、待办理、办理成功、部分办理失败、办理失败
* 公积金派增状态：0待审核、1待办理、2办理成功、3办理失败
*/
@Length(max = 1, message = "公积金派增状态：待审核、待办理、办理成功、部分办理失败、办理失败 不能超过1个字符" )
@ExcelAttribute(name = "公积金派增状态：待审核、待办理、办理成功、部分办理失败、办理失败", maxLength = 1)
@Schema(description = "公积金派增状态：待审核、待办理、办理成功、部分办理失败、办理失败" )
@ExcelProperty("公积金派增状态：待审核、待办理、办理成功、部分办理失败、办理失败" )
@Length(max = 1, message = "公积金派增状态 不能超过1个字符" )
@ExcelAttribute(name = "公积金派增状态", maxLength = 1)
@Schema(description = "公积金派增状态：0待审核、1待办理、2办理成功、3办理失败" )
@ExcelProperty("公积金派增状态" )
private String fundAddStatus;
/**
* “待审核、待办理、办理成功、办理失败”
* 社保派减状态：0待审核、1待办理、2办理成功、3办理失败
*/
@Length(max = 1, message = "“待审核、待办理、办理成功、办理失败” 不能超过1个字符" )
@ExcelAttribute(name = "“待审核、待办理、办理成功、办理失败”", maxLength = 1)
@Schema(description = "“待审核、待办理、办理成功、办理失败”" )
@ExcelProperty("“待审核、待办理、办理成功、办理失败”" )
@ExcelAttribute(name = "社保派减状态", maxLength = 1)
@Schema(description = "社保派减状态：0待审核、1待办理、2办理成功、3办理失败" )
@ExcelProperty("社保派减状态" )
private String socialReduceStatus;
/**
* “待审核、待办理、办理成功、办理失败”
* 公积金派减状态：0待审核、1待办理、2办理成功、3办理失败
*/
@Length(max = 1, message = "“待审核、待办理、办理成功、办理失败” 不能超过1个字符" )
@ExcelAttribute(name = "“待审核、待办理、办理成功、办理失败”", maxLength = 1)
@Schema(description = "“待审核、待办理、办理成功、办理失败”" )
@ExcelProperty("“待审核、待办理、办理成功、办理失败”" )
@ExcelAttribute(name = "公积金派减状态", maxLength = 1)
@Schema(description = "公积金派减状态：0待审核、1待办理、2办理成功、3办理失败" )
@ExcelProperty("公积金派减状态" )
private String fundReduceStatus;
/**
* 社保ID(取值最新社保ID）
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @ 4378d128
......@@ -135,13 +135,7 @@ public class TSocialInfo extends BaseEntity {
@Schema(description = "个人失业基数" )
@ExcelProperty("个人失业基数" )
private BigDecimal personalUnemploymentCardinal;
/**
* 单位工伤基数
*/
@ExcelAttribute(name = "单位工伤基数" )
@Schema(description = "单位工伤基数" )
@ExcelProperty("单位工伤基数" )
private BigDecimal personalWorkInjuryCardinal;
/**
* 员工ID（数据引用）
*/
......@@ -231,12 +225,12 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty("个人失业比例" )
private BigDecimal personalUnemploymentPer;
/**
* 审核状态
* 审核状态 0 未审核 1 审核通过 2审核不通过
*/
@NotBlank(message = "审核状态不能为空" )
@Length(max = 32, message = "审核状态 不能超过32个字符" )
@ExcelAttribute(name = "审核状态", isNotEmpty = true, errorInfo = "审核状态不能为空", maxLength = 32)
@Schema(description = "审核状态" )
@Schema(description = "审核状态:0 未审核 1 审核通过 2审核不通过" )
@ExcelProperty("审核状态" )
private String auditStatus;
/**
......@@ -245,7 +239,7 @@ public class TSocialInfo extends BaseEntity {
@NotBlank(message = "办理状态不能为空" )
@Length(max = 32, message = "办理状态 不能超过32个字符" )
@ExcelAttribute(name = "办理状态", isNotEmpty = true, errorInfo = "办理状态不能为空", maxLength = 32)
@Schema(description = "办理状态" )
@Schema(description = "办理状态：0待办理/1已办理2办理失败3已派减" )
@ExcelProperty("办理状态" )
private String handleStatus;
/**
......@@ -264,7 +258,7 @@ public class TSocialInfo extends BaseEntity {
@ExcelAttribute(name = "社保基数配置ID（数据引用）", maxLength = 32)
@Schema(description = "社保基数配置ID（数据引用）" )
@ExcelProperty("社保基数配置ID（数据引用）" )
private String cardinalIid;
private String cardinalId;
/**
* 原ID（数据迁移）
*/
......@@ -356,7 +350,7 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty("单位生育金额" )
private BigDecimal unitBirthMoney;
/**
* 单位大病救助金额
* 单位大病救助金额 (按定时时此值有数据)
*/
@ExcelAttribute(name = "单位大病救助金额" )
@Schema(description = "单位大病救助金额" )
......@@ -384,7 +378,7 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty("个人失业金额" )
private BigDecimal personalUnemploymentMoney;
/**
* 个人大病金额
* 个人大病金额(按定时时此值有数据)
*/
@ExcelAttribute(name = "个人大病金额" )
@Schema(description = "个人大病金额" )
......@@ -583,12 +577,12 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty("派减办理时间" )
private Date reduceHandleTime;
/**
* 新员工入职收费：0是1否
* 收费模式：0立即收1次年收
*/
@Length(max = 1, message = "新员工入职收费：0是1否 不能超过1个字符" )
@ExcelAttribute(name = "新员工入职收费：0是1否", maxLength = 1)
@Schema(description = "新员工入职收费：0是1否" )
@ExcelProperty("新员工入职收费：0是1否" )
@Length(max = 1, message = "收费模式 不能超过1个字符" )
@ExcelAttribute(name = "收费模式", maxLength = 1)
@Schema(description = "收费模式：0立即收1次年收" )
@ExcelProperty("收费模式" )
private String isChargePersonal;
/**
* 委托备注
......@@ -646,14 +640,7 @@ public class TSocialInfo extends BaseEntity {
@Schema(description = "社保类型区分（0五险、1单独兼职工伤）" )
@ExcelProperty("社保类型区分（0五险、1单独兼职工伤）" )
private Integer socialType;
/**
* 0不随配置 1随配置 2.单位大病随配置 3个人大病随配置
*/
@Length(max = 1, message = "0不随配置 1随配置 2.单位大病随配置 3个人大病随配置 不能超过1个字符" )
@ExcelAttribute(name = "0不随配置 1随配置 2.单位大病随配置 3个人大病随配置", maxLength = 1)
@Schema(description = "0不随配置 1随配置 2.单位大病随配置 3个人大病随配置" )
@ExcelProperty("0不随配置 1随配置 2.单位大病随配置 3个人大病随配置" )
private String bigailmentVaryFlag;
/**
* 养老起缴日期
*/
......
yifu-social/yifu-social-biz/pom.xml
View file @ 4378d128
......@@ -63,7 +63,13 @@
<version>5.8.0</version>
<artifactId>hutool-all</artifactId>
</dependency>
</dependencies>
<dependency>
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-archives-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/SysBaseSetInfoMapper.java
View file @ 4378d128
......@@ -43,4 +43,13 @@ public interface SysBaseSetInfoMapper extends BaseMapper<SysBaseSetInfo> {
IPage<SysBaseSetInfo> getSysBaseSetInfoPage(Page<SysBaseSetInfo> page, @Param("sysBaseSetInfo") SysBaseSetInfo sysBaseSetInfo);
List<SysBaseSetInfo> getAllByEntity(@Param("sysBaseSetInfo")SysBaseSetInfo sysBaseSetInfo);
/**
* @Author fxj
* @Description 获取对应户名称的公积金基数信息
* @Date 17:27 2022/7/19
* @Param
* @return
**/
List<SysBaseSetInfo> getFundBaseSet(@Param("fundHolds")List<String> fundHolds);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/SysPayProportionMapper.java
View file @ 4378d128
......@@ -24,6 +24,8 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
import java.util.List;
/**
* 公积金政策对应的缴费比例表
*
......@@ -39,4 +41,6 @@ public interface SysPayProportionMapper extends BaseMapper<SysPayProportion> {
* @return
*/
IPage<SysPayProportion> getSysPayProportionPage(Page<SysPayProportion> page, @Param("sysPayProportion") SysPayProportion sysPayProportion);
List<SysPayProportion> selectByPrimaryId(@Param("id") String id);
}
yifu-social/yifu-social-biz/src/main/resources/mapper/SysBaseSetInfoMapper.xml
View file @ 4378d128
......@@ -81,6 +81,9 @@
<result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/>
<collection property="fundProList" ofType="com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion"
select="com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper.selectByPrimaryId" column="id">
</collection>
</resultMap>
<sql id="base_column_list">
SELECT
......@@ -343,4 +346,22 @@
<include refid="sysBaseSetInfo_where"/>
</where>
</select>
<!--获取对应户名称的公积金基数信息-->
<select id="getFundBaseSet" resultMap="sysBaseSetInfoMap">
<include refid="base_column_list"/>
FROM sys_base_set_info a
<where>
1=1
<if test="fundHolds != null and fundHolds.size > 0">
a.DEPART_NAME in
<foreach collection="fundHolds" item="item" open="(" close=")" separator="," >
#{item}
</foreach>
</if>
and a.APPLY_START_DATE <![CDATA[ <= ]]> now()
and a.APPLY_END_DATE <![CDATA[ >= ]] now()
and a.DELETE_FLAG = '0' and a.status='0' and a.BASE_TYPE = '1'
</where>
</select>
</mapper>
yifu-social/yifu-social-biz/src/main/resources/mapper/SysPayProportionMapper.xml
View file @ 4378d128
......@@ -30,14 +30,18 @@
<result property="sysBaseSetId" column="SYS_BASE_SET_ID"/>
</resultMap>
<sql id="Base_Column_List">
a
.
ID
,
a.COMPANY_PRO,
a.PERSONAL_PRO,
a.SYS_BASE_SET_ID
a.ID,a.COMPANY_PRO,a.PERSONAL_PRO,a.SYS_BASE_SET_ID
</sql>
<select id="selectByPrimaryId" resultMap="sysPayProportionMap">
SELECT
Id,
company_pro,
personal_pro,
sys_base_set_id
FROM sys_pay_proportion
WHERE
sys_pay_proportion.sys_base_set_id = #{id}
</select>
<sql id="sysPayProportion_where">
<if test="sysPayProportion != null">
<if test="sysPayProportion.id != null and sysPayProportion.id.trim() != ''">
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialInfoMapper.xml
View file @ 4378d128
......@@ -53,7 +53,7 @@
<result property="auditStatus" column="AUDIT_STATUS"/>
<result property="handleStatus" column="HANDLE_STATUS"/>
<result property="draftStatus" column="DRAFT_STATUS"/>
<result property="cardinalIid" column="CARDINAL_IID"/>
<result property="cardinalId" column="CARDINAL_ID"/>
<result property="oldId" column="OLD_ID"/>
<result property="settleDomain" column="SETTLE_DOMAIN"/>
<result property="socialProvince" column="SOCIAL_PROVINCE"/>
......@@ -104,7 +104,6 @@
<result property="paymentType" column="PAYMENT_TYPE"/>
<result property="recordBase" column="RECORD_BASE"/>
<result property="socialType" column="SOCIAL_TYPE"/>
<result property="bigailmentVaryFlag" column="BIGAILMENT_VARY_FLAG"/>
<result property="pensionStart" column="PENSION_START"/>
<result property="medicalStart" column="MEDICAL_START"/>
<result property="unemployStart" column="UNEMPLOY_START"/>
......@@ -310,8 +309,8 @@
<if test="tSocialInfo.draftStatus != null and tSocialInfo.draftStatus.trim() != ''">
AND a.DRAFT_STATUS = #{tSocialInfo.draftStatus}
</if>
<if test="tSocialInfo.cardinalIid != null and tSocialInfo.cardinalIid.trim() != ''">
AND a.CARDINAL_IID = #{tSocialInfo.cardinalIid}
<if test="tSocialInfo.cardinalId != null and tSocialInfo.cardinalId.trim() != ''">
AND a.CARDINAL_IID = #{tSocialInfo.cardinalId}
</if>
<if test="tSocialInfo.oldId != null">
AND a.OLD_ID = #{tSocialInfo.oldId}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment