Skip to content

Y
yifu-mvp
Commit 4264478e authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 525135db 94e601ef
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 134 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FddContractAttachInfo.java
View file @ 4264478e
...@@ -23,9 +23,10 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; ...@@ -23,9 +23,10 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
/** /**
* 法大大合同附属信息表 * 法大大合同附属信息表
...@@ -56,25 +57,25 @@ public class FddContractAttachInfo extends BaseEntity { ...@@ -56,25 +57,25 @@ public class FddContractAttachInfo extends BaseEntity {
* 合同试用期开始时间 * 合同试用期开始时间
*/ */
@Schema(description ="合同试用期开始时间") @Schema(description ="合同试用期开始时间")
private LocalDate periodStart; private Date periodStart;
/** /**
* 合同试用期结束时间 * 合同试用期结束时间
*/ */
@Schema(description ="合同试用期结束时间") @Schema(description ="合同试用期结束时间")
private LocalDate periodEnd; private Date periodEnd;
/** /**
* 合同起始时间 * 合同起始时间
*/ */
@Schema(description ="合同起始时间") @Schema(description ="合同起始时间")
private LocalDate contractStart; private Date contractStart;
/** /**
* 合同到期时间 * 合同到期时间
*/ */
@Schema(description ="合同到期时间") @Schema(description ="合同到期时间")
private LocalDate contractEnd; private Date contractEnd;
/** /**
* 试用期工资 元/月 * 试用期工资 元/月
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @ 4264478e
...@@ -32,8 +32,8 @@ import org.hibernate.validator.constraints.Length; ...@@ -32,8 +32,8 @@ import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
...@@ -49,12 +49,12 @@ import java.util.Set; ...@@ -49,12 +49,12 @@ import java.util.Set;
@Schema(description = "员工合同") @Schema(description = "员工合同")
public class TEmployeeContractInfo extends BaseEntity { public class TEmployeeContractInfo extends BaseEntity {
/** /**
* 主键 * 主键
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@Schema(description ="主键") @Schema(description = "主键")
private String id; private String id;
/** /**
* 员工主键 * 员工主键
...@@ -75,14 +75,14 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -75,14 +75,14 @@ public class TEmployeeContractInfo extends BaseEntity {
* 员工姓名 * 员工姓名
*/ */
@Length(max = 32, message = "员工姓名不能超过32个字符") @Length(max = 32, message = "员工姓名不能超过32个字符")
@ExcelAttribute(name = "员工姓名", maxLength = 32,needExport = true) @ExcelAttribute(name = "员工姓名", maxLength = 32, needExport = true)
@Schema(description = "员工姓名", name = "empName") @Schema(description = "员工姓名", name = "empName")
private String empName; private String empName;
/** /**
* 员工身份证号 * 员工身份证号
*/ */
@Length(max = 32, message = "员工身份证号不能超过32个字符") @Length(max = 32, message = "员工身份证号不能超过32个字符")
@ExcelAttribute(name = "员工身份证号", maxLength = 32, isIdCard = true,needExport = true) @ExcelAttribute(name = "员工身份证号", maxLength = 32, isIdCard = true, needExport = true)
@Schema(description = "员工身份证号", name = "empIdcard") @Schema(description = "员工身份证号", name = "empIdcard")
private String empIdcard; private String empIdcard;
/** /**
...@@ -90,7 +90,7 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -90,7 +90,7 @@ public class TEmployeeContractInfo extends BaseEntity {
*/ */
@NotBlank(message = "合同类型不能为空") @NotBlank(message = "合同类型不能为空")
@Length(max = 32, message = "合同类型不能超过32个字符") @Length(max = 32, message = "合同类型不能超过32个字符")
@ExcelAttribute(name = "合同类型", isNotEmpty = true, errorInfo = "合同类型不能为空", maxLength = 32,needExport = true) @ExcelAttribute(name = "合同类型", isNotEmpty = true, errorInfo = "合同类型不能为空", maxLength = 32, needExport = true)
@Schema(description = "合同类型", name = "contractName") @Schema(description = "合同类型", name = "contractName")
private String contractName; private String contractName;
/** /**
...@@ -101,7 +101,7 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -101,7 +101,7 @@ public class TEmployeeContractInfo extends BaseEntity {
*/ */
@NotBlank(message = "签订期限不能为空") @NotBlank(message = "签订期限不能为空")
@Length(max = 32, message = "签订期限不能超过32个字符") @Length(max = 32, message = "签订期限不能超过32个字符")
@ExcelAttribute(name = "签订期限", isNotEmpty = true, errorInfo = "签订期限不能为空", maxLength = 32,isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE,needExport = true) @ExcelAttribute(name = "签订期限", isNotEmpty = true, errorInfo = "签订期限不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE, needExport = true)
@Schema(description = "签订期限", name = "contractType") @Schema(description = "签订期限", name = "contractType")
private String contractType; private String contractType;
/** /**
...@@ -110,13 +110,13 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -110,13 +110,13 @@ public class TEmployeeContractInfo extends BaseEntity {
@NotBlank(message = "合同起始时间不能为空") @NotBlank(message = "合同起始时间不能为空")
@ExcelAttribute(name = "合同起始时间", isNotEmpty = true, errorInfo = "合同起始时间不能为空") @ExcelAttribute(name = "合同起始时间", isNotEmpty = true, errorInfo = "合同起始时间不能为空")
@Schema(description = "合同起始时间", name = "contractStart") @Schema(description = "合同起始时间", name = "contractStart")
private LocalDate contractStart; private Date contractStart;
/** /**
* 合同到期时间 * 合同到期时间
*/ */
@ExcelAttribute(name = "合同到期时间",needExport = true) @ExcelAttribute(name = "合同到期时间", needExport = true)
@Schema(description = "合同到期时间", name = "contractEnd") @Schema(description = "合同到期时间", name = "contractEnd")
private LocalDate contractEnd; private Date contractEnd;
/** /**
* 项目名称 * 项目名称
*/ */
...@@ -136,14 +136,14 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -136,14 +136,14 @@ public class TEmployeeContractInfo extends BaseEntity {
*/ */
@NotBlank(message = "签订类型不能为空") @NotBlank(message = "签订类型不能为空")
@Length(max = 1, message = "签订类型不能超过1个字符") @Length(max = 1, message = "签订类型不能超过1个字符")
@ExcelAttribute(name = "签订类型", isNotEmpty = true, errorInfo = "签订类型不能为空", maxLength = 100,isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_SITUATION_TYPE) @ExcelAttribute(name = "签订类型", isNotEmpty = true, errorInfo = "签订类型不能为空", maxLength = 100, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_SITUATION_TYPE)
@Schema(description = "签订类型（字典）", name = "situation") @Schema(description = "签订类型（字典）", name = "situation")
private String situation; private String situation;
/** /**
* 合同年限 * 合同年限
*/ */
@NotBlank(message = "合同年限不能为空") @NotBlank(message = "合同年限不能为空")
@ExcelAttribute(name = "合同年限", errorInfo = "合同年限不能为空") @ExcelAttribute(name = "合同年限", errorInfo = "合同年限不能为空")
@Schema(description = "合同年限", name = "contractTerm") @Schema(description = "合同年限", name = "contractTerm")
private String contractTerm; private String contractTerm;
/** /**
...@@ -151,11 +151,11 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -151,11 +151,11 @@ public class TEmployeeContractInfo extends BaseEntity {
*/ */
@NotBlank(message = "合同编码不能为空") @NotBlank(message = "合同编码不能为空")
@Length(max = 50, message = "合同编码不能超过50个字符") @Length(max = 50, message = "合同编码不能超过50个字符")
@ExcelAttribute(name = "合同编码", maxLength = 50) @ExcelAttribute(name = "合同编码", maxLength = 50)
@Schema(description = "合同编码", name = "contractNo") @Schema(description = "合同编码", name = "contractNo")
private String contractNo; private String contractNo;
/** /**
* 备注 * 备注
*/ */
@Length(max = 200, message = "不能超过200个字符") @Length(max = 200, message = "不能超过200个字符")
@ExcelAttribute(name = "备注", maxLength = 200) @ExcelAttribute(name = "备注", maxLength = 200)
...@@ -210,7 +210,7 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -210,7 +210,7 @@ public class TEmployeeContractInfo extends BaseEntity {
* 合同岗位 * 合同岗位
*/ */
@Length(max = 32, message = "合同岗位不能超过32个字符") @Length(max = 32, message = "合同岗位不能超过32个字符")
@ExcelAttribute(name = "合同岗位", maxLength = 32 , needExport = true) @ExcelAttribute(name = "合同岗位", maxLength = 32, needExport = true)
@Schema(description = "合同岗位", name = "post") @Schema(description = "合同岗位", name = "post")
private String post; private String post;
/** /**
...@@ -233,14 +233,14 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -233,14 +233,14 @@ public class TEmployeeContractInfo extends BaseEntity {
*/ */
@NotBlank(message = "结算主体不能为空") @NotBlank(message = "结算主体不能为空")
@Length(max = 32, message = "结算主体不能超过32个字符") @Length(max = 32, message = "结算主体不能超过32个字符")
@ExcelAttribute(name = "结算主体", errorInfo = "结算主体不能为空",isOrgan=true, maxLength = 32) @ExcelAttribute(name = "结算主体", errorInfo = "结算主体不能为空", isOrgan = true, maxLength = 32)
@Schema(description = "结算主体", name = "settleDomain") @Schema(description = "结算主体", name = "settleDomain")
private String settleDomain; private String settleDomain;
/** /**
* 员工类型 * 员工类型
*/ */
@ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_TYPE) @ExcelAttribute(name = "员工类型", errorInfo = "员工类型不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
@TableField(exist = false) @TableField(exist = false)
private String empType; private String empType;
...@@ -252,22 +252,22 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -252,22 +252,22 @@ public class TEmployeeContractInfo extends BaseEntity {
**/ **/
@TableField(exist = false) @TableField(exist = false)
@Schema(description = "首页代办任务跳转(0:代办任务标识，其他：非代办任务标识", name = "workBranchjumpFlag") @Schema(description = "首页代办任务跳转(0:代办任务标识，其他：非代办任务标识", name = "workBranchjumpFlag")
private String workBranchjumpFlag; private String workBranchjumpFlag;
/******************************查询优化新增字段开始***********************************/ /******************************查询优化新增字段开始***********************************/
/** /**
* 档案-省 * 档案-省
*/ */
@ExcelAttribute(name = "档案-省", maxLength = 32, isDataId = true, isArea = true, parentField = "") @ExcelAttribute(name = "档案-省", maxLength = 32, isDataId = true, isArea = true, parentField = "")
@Schema(description = "档案-省", name = "fileProvince") @Schema(description = "档案-省", name = "fileProvince")
private Integer fileProvince; private Integer fileProvince;
/** /**
* 档案-市 * 档案-市
*/ */
@ExcelAttribute(name = "档案-市", maxLength = 32, isDataId = true, isArea = true, parentField = "fileProvince") @ExcelAttribute(name = "档案-市", maxLength = 32, isDataId = true, isArea = true, parentField = "fileProvince")
@Schema(description = "档案-市", name = "fileCity") @Schema(description = "档案-市", name = "fileCity")
private Integer fileCity; private Integer fileCity;
/** /**
* 档案-县 * 档案-县
*/ */
@ExcelAttribute(name = "档案-县", maxLength = 32, isDataId = true, isArea = true, parentField = "fileCity") @ExcelAttribute(name = "档案-县", maxLength = 32, isDataId = true, isArea = true, parentField = "fileCity")
@Schema(description = "档案-县", name = "fileTown") @Schema(description = "档案-县", name = "fileTown")
...@@ -276,59 +276,59 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -276,59 +276,59 @@ public class TEmployeeContractInfo extends BaseEntity {
/** /**
* 在职状态 0是/1否 * 在职状态 0是/1否
*/ */
@ExcelAttribute(name = "在职状态", errorInfo = "在职状态 0是/1否不能为空", maxLength = 1, isDataId =true, readConverterExp = "0=在职,1=离职") @ExcelAttribute(name = "在职状态", errorInfo = "在职状态 0是/1否不能为空", maxLength = 1, isDataId = true, readConverterExp = "0=在职,1=离职")
@Schema(description = "在职状态 0是/1否", name = "workFlag") @Schema(description = "在职状态 0是/1否", name = "workFlag")
private String workFlag; private String workFlag;
/** /**
* 在职状态扩展 0 在职 1 个人离职 2 单位辞退 3 临时 4 特殊人员 5 退休 6 退休返聘 * 在职状态扩展 0 在职 1 个人离职 2 单位辞退 3 临时 4 特殊人员 5 退休 6 退休返聘
*/ */
@ExcelAttribute(name = "在职细分",isDataId = true, dataType = "work_falg_sub") @ExcelAttribute(name = "在职细分", isDataId = true, dataType = "work_falg_sub")
@Schema(description = "在职细分 0 在职 1 个人离职 2 单位辞退 3 临时 4 特殊人员 5 退休 6 退休返聘", name = "workingStatusSub") @Schema(description = "在职细分 0 在职 1 个人离职 2 单位辞退 3 临时 4 特殊人员 5 退休 6 退休返聘", name = "workingStatusSub")
private String workingStatusSub; private String workingStatusSub;
/** /**
* 合同试用期开始时间 * 合同试用期开始时间
*/ */
@ExcelAttribute(name = "试用期开始时间" ) @ExcelAttribute(name = "试用期开始时间")
@Schema(description="合同试用期开始时间",name="periodStart") @Schema(description = "合同试用期开始时间", name = "periodStart")
private LocalDate periodStart; private Date periodStart;
/** /**
* 合同试用期结束时间 * 合同试用期结束时间
*/ */
@ExcelAttribute(name = "试用期结束时间" ) @ExcelAttribute(name = "试用期结束时间")
@Schema(description="合同试用期结束时间",name="periodEnd") @Schema(description = "合同试用期结束时间", name = "periodEnd")
private LocalDate periodEnd; private Date periodEnd;
/** /**
* 试用期工资元/月 * 试用期工资元/月
*/ */
@ExcelAttribute(name = "试用期工资元/月" ) @ExcelAttribute(name = "试用期工资元/月")
@Schema(description="试用期工资(元/月)",name="periodSalaryPerMonth") @Schema(description = "试用期工资(元/月)", name = "periodSalaryPerMonth")
private BigDecimal periodSalaryPerMonth; private BigDecimal periodSalaryPerMonth;
/** /**
* 工资形式 1.计时工资 2.计件工资 3.其他 * 工资形式 1.计时工资 2.计件工资 3.其他
*/ */
@Length(max=1,message = "工资形式不能超过1个字符") @Length(max = 1, message = "工资形式不能超过1个字符")
@ExcelAttribute(name = "工资形式" , maxLength = 1 , isDataId = true, dataType = ExcelAttributeConstants.SALARY_TYPE) @ExcelAttribute(name = "工资形式", maxLength = 1, isDataId = true, dataType = ExcelAttributeConstants.SALARY_TYPE)
@Schema(description="工资形式 1.计时工资 2.计件工资 3.其他",name="salaryType") @Schema(description = "工资形式 1.计时工资 2.计件工资 3.其他", name = "salaryType")
private String salaryType; private String salaryType;
/** /**
* 计时工资 工资标准 元/月 * 计时工资 工资标准 元/月
*/ */
@ExcelAttribute(name = "计时工资(元/月)" ) @ExcelAttribute(name = "计时工资(元/月)")
@Schema(description="计时工资 工资标准 元/月 ",name="salaryStandardPerHour") @Schema(description = "计时工资 工资标准 元/月 ", name = "salaryStandardPerHour")
private BigDecimal salaryStandardPerHour; private BigDecimal salaryStandardPerHour;
/** /**
* 计件工资 工资标准单价/元 * 计件工资 工资标准单价/元
*/ */
@ExcelAttribute(name = "计件工资(单价/元)" ) @ExcelAttribute(name = "计件工资(单价/元)")
@Schema(description="计件工资 工资标准单价/元 ",name="salaryStandardPerPiece") @Schema(description = "计件工资 工资标准单价/元 ", name = "salaryStandardPerPiece")
private BigDecimal salaryStandardPerPiece; private BigDecimal salaryStandardPerPiece;
/******************************查询优化新增字段结束***********************************/ /******************************查询优化新增字段结束***********************************/
/** /**
* 派单标识 默认null 如果派单产生 为1 派单审核通过 清空标识 2020-09-27 fxj * 派单标识 默认null 如果派单产生 为1 派单审核通过 清空标识 2020-09-27 fxj
*/ */
@ExcelAttribute(name = "派单标识" ) @ExcelAttribute(name = "派单标识")
@Schema(description="派单标识",name="dispatchFlag") @Schema(description = "派单标识", name = "dispatchFlag")
private String dispatchFlag; private String dispatchFlag;
/** /**
* 邮件提醒用户id * 邮件提醒用户id
...@@ -342,68 +342,68 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -342,68 +342,68 @@ public class TEmployeeContractInfo extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private String endDateStr; private String endDateStr;
@ExcelAttribute(name = "电子合同" ,readConverterExp = "0=不开通,1=开通" ) @ExcelAttribute(name = "电子合同", readConverterExp = "0=不开通,1=开通")
@Schema(description="电子合同:0不开通 1开通",name="fddFlag") @Schema(description = "电子合同:0不开通 1开通", name = "fddFlag")
private String fddFlag; private String fddFlag;
@ExcelAttribute(name = "是否需要电子签" ,readConverterExp = "0=正常合同,1=需要电子签" ) @ExcelAttribute(name = "是否需要电子签", readConverterExp = "0=正常合同,1=需要电子签")
@Schema(description="是否需要电子签:0正常合同 1需要电子签", name="isSign") @Schema(description = "是否需要电子签:0正常合同 1需要电子签", name = "isSign")
private Integer isSign; private Integer isSign;
/** /**
* 客户id * 客户id
*/ */
@Schema(description ="客户id") @Schema(description = "客户id")
private String customerId; private String customerId;
/** /**
* 客户编码 * 客户编码
*/ */
@Schema(description ="客户编码") @Schema(description = "客户编码")
private String unitNo; private String unitNo;
/** /**
* 项目编码 * 项目编码
*/ */
@Schema(description ="项目编码") @Schema(description = "项目编码")
private String deptNo; private String deptNo;
/** /**
* 申请编码 * 申请编码
*/ */
@Schema(description ="申请编码") @Schema(description = "申请编码")
private String applyNo; private String applyNo;
/** /**
* 审核状态（0：待提交；1：待审核；2审核通过；3审核不通过） * 审核状态（0：待提交；1：待审核；2审核通过；3审核不通过）
*/ */
@Schema(description ="审核状态（0：待提交；1：待审核；2审核通过；3审核不通过）") @Schema(description = "审核状态（0：待提交；1：待审核；2审核通过；3审核不通过）")
private Integer auditStatus; private Integer auditStatus;
/** /**
* 最新审核通过时间 * 最新审核通过时间
*/ */
@DateTimeFormat("yyyy-MM-dd HH:mm:ss") @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@Schema(description ="最新审核通过时间") @Schema(description = "最新审核通过时间")
private LocalDateTime auditTimeLast; private LocalDateTime auditTimeLast;
/** /**
* 删除状态（0未删除；1已删除） * 删除状态（0未删除；1已删除）
*/ */
@Schema(description ="删除状态（0未删除；1已删除）") @Schema(description = "删除状态（0未删除；1已删除）")
private Integer deleteFlag; private Integer deleteFlag;
/** /**
* 审核原因 * 审核原因
*/ */
@Schema(description ="审核说明，前端传参用，字段不存数据库，数据库存审核记录") @Schema(description = "审核说明，前端传参用，字段不存数据库，数据库存审核记录")
@TableField(exist = false) @TableField(exist = false)
private String auditRemark; private String auditRemark;
/** /**
* 员工类型（字典值，0外包1派遣2代理） * 员工类型（字典值，0外包1派遣2代理）
*/ */
@ExcelAttribute(name = "员工类型", isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE) @ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@Schema(description = "员工类型（字典值，0外包1派遣2代理）") @Schema(description = "员工类型（字典值，0外包1派遣2代理）")
@Size(max = 1, message = "员工类型不可超过1位") @Size(max = 1, message = "员工类型不可超过1位")
private String empNatrue; private String empNatrue;
...@@ -434,7 +434,7 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -434,7 +434,7 @@ public class TEmployeeContractInfo extends BaseEntity {
private String reason; private String reason;
@Schema(description ="附件idList") @Schema(description = "附件idList")
@TableField(exist = false) @TableField(exist = false)
private List<String> attaList; private List<String> attaList;
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @ 4264478e
...@@ -202,7 +202,7 @@ public class TEmployeeProject extends BaseEntity { ...@@ -202,7 +202,7 @@ public class TEmployeeProject extends BaseEntity {
*/ */
@Schema(description ="合同类型（字典值）") @Schema(description ="合同类型（字典值）")
@NotNull(message = "合同类型不能为空") @NotNull(message = "合同类型不能为空")
@Size(max = 1, message = "合同类型不可超过1位") @Size(max = 2, message = "合同类型不可超过2位")
private String contractType; private String contractType;
/** /**
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @ 4264478e
...@@ -26,7 +26,7 @@ import org.hibernate.validator.constraints.Length; ...@@ -26,7 +26,7 @@ import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate; import java.util.Date;
/** /**
* 员工合同-批量操作的VO * 员工合同-批量操作的VO
...@@ -122,16 +122,16 @@ public class EmployeeContractVO extends RowIndex implements Serializable { ...@@ -122,16 +122,16 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
*/ */
@NotBlank(message = "起始日期不能为空") @NotBlank(message = "起始日期不能为空")
@DateTimeFormat("yyyy-MM-dd") @DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "起始日期", isNotEmpty = true, errorInfo = "起始日期不能为空") @ExcelAttribute(name = "起始日期", isNotEmpty = true, errorInfo = "起始日期不能为空", isDate = true)
@Schema(description = "起始日期", name = "contractStart") @Schema(description = "起始日期", name = "contractStart")
private LocalDate contractStart; private Date contractStart;
/** /**
* 合同到期时间 * 合同到期时间
*/ */
@ExcelAttribute(name = "截止日期", needExport = true) @ExcelAttribute(name = "截止日期", needExport = true, isDate = true)
@DateTimeFormat("yyyy-MM-dd") @DateTimeFormat("yyyy-MM-dd")
@Schema(description = "截止日期", name = "contractEnd") @Schema(description = "截止日期", name = "contractEnd")
private LocalDate contractEnd; private Date contractEnd;
/** /**
* 合同岗位 * 合同岗位
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractAuditController.java
View file @ 4264478e
...@@ -26,7 +26,8 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; ...@@ -26,7 +26,8 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -55,8 +56,8 @@ public class TEmployeeContractAuditController { ...@@ -55,8 +56,8 @@ public class TEmployeeContractAuditController {
* @return * @return
*/ */
@Operation(summary = "获取list", description = "获取list") @Operation(summary = "获取list", description = "获取list")
@GetMapping("/getContractAuditList") @PostMapping("/getContractAuditList")
public R<List<TEmployeeContractAudit>> getContractAuditList(TEmployeeContractAudit tEmployeeContractAudit) { public R<List<TEmployeeContractAudit>> getContractAuditList(@RequestBody TEmployeeContractAudit tEmployeeContractAudit) {
return R.ok(tEmployeeContractAuditService.list(Wrappers.query(tEmployeeContractAudit))); return R.ok(tEmployeeContractAuditService.list(Wrappers.query(tEmployeeContractAudit)));
} }
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @ 4264478e
...@@ -40,7 +40,6 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -40,7 +40,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -121,7 +120,7 @@ public class TEmployeeProjectController { ...@@ -121,7 +120,7 @@ public class TEmployeeProjectController {
@PutMapping @PutMapping
@PreAuthorize("@pms.hasPermission('archives_temployeeproject_edit')" ) @PreAuthorize("@pms.hasPermission('archives_temployeeproject_edit')" )
public R updateById(@RequestBody TEmployeeProject tEmployeeProject) { public R updateById(@RequestBody TEmployeeProject tEmployeeProject) {
return R.ok(tEmployeeProjectService.updateById(tEmployeeProject)); return R.ok(tEmployeeProjectService.updateProject(tEmployeeProject));
} }
/** /**
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @ 4264478e
...@@ -48,6 +48,8 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -48,6 +48,8 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
R saveEmp(TEmployeeProject tEmployeeProject); R saveEmp(TEmployeeProject tEmployeeProject);
R updateProject(TEmployeeProject tEmployeeProject);
/** /**
* @param tEmployeeProject * @param tEmployeeProject
* @Description: 减项 * @Description: 减项
...@@ -97,8 +99,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -97,8 +99,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
List<TEmployeeProject> getListByEmpIdAndDeptNo(String empId, String deptNo); List<TEmployeeProject> getListByEmpIdAndDeptNo(String empId, String deptNo);
/** /**
* @param excelVOList * @param inputStream
* @param bindingResult
* @Description: 批量更新项目档案 * @Description: 批量更新项目档案
* @Author: huyc * @Author: huyc
* @Date: 2022/6/21 10:30 * @Date: 2022/6/21 10:30
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FddContractAttachInfoServiceImpl.java
View file @ 4264478e
...@@ -29,7 +29,10 @@ import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectMapper; ...@@ -29,7 +29,10 @@ import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.*; import com.yifu.cloud.plus.v1.yifu.archives.service.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*; 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.NoUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties; 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.dapr.util.HttpDaprUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -334,7 +337,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt ...@@ -334,7 +337,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING)); .eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING));
if (employeeContractInfo != null) { if (employeeContractInfo != null) {
long count = this.count(Wrappers.<FddContractAttachInfo>query().lambda().eq(FddContractAttachInfo::getContractId, employeeContractInfo.getId())); long count = this.count(Wrappers.<FddContractAttachInfo>query().lambda().eq(FddContractAttachInfo::getContractId, employeeContractInfo.getId()));
if (count > CommonConstants.ZERO_INT && attachInfo.getContractStart().isBefore(employeeContractInfo.getContractEnd())) { if (count > CommonConstants.ZERO_INT && attachInfo.getContractStart().before(employeeContractInfo.getContractEnd())) {
errorList.add(new ErrorMessage(i, "已导入合同相关基础数据", CommonConstants.RED)); errorList.add(new ErrorMessage(i, "已导入合同相关基础数据", CommonConstants.RED));
continue; continue;
} }
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FddContractInfoServiceImpl.java
View file @ 4264478e
...@@ -71,9 +71,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -71,9 +71,6 @@ import javax.servlet.http.HttpServletResponse;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -660,28 +657,28 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe ...@@ -660,28 +657,28 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
if (Common.isNotNull(companyFieldMap.get("contractType"))){ if (Common.isNotNull(companyFieldMap.get("contractType"))){
//固定期限 //固定期限
paramter.put("contractType", "一"); paramter.put("contractType", "一");
paramter.put("fcontractStartY", DateUtil.format(localDate2Date(attachInfo.getContractStart()), "yyyy")); paramter.put("fcontractStartY", DateUtil.format(attachInfo.getContractStart(), "yyyy"));
paramter.put("fcontractStartM", DateUtil.format(localDate2Date(attachInfo.getContractStart()), "MM")); paramter.put("fcontractStartM", DateUtil.format(attachInfo.getContractStart(), "MM"));
paramter.put("fcontractStartD", DateUtil.format(localDate2Date(attachInfo.getContractStart()), "dd")); paramter.put("fcontractStartD", DateUtil.format(attachInfo.getContractStart(), "dd"));
paramter.put("fcontractEndY", DateUtil.format(localDate2Date(attachInfo.getContractEnd()), "yyyy")); paramter.put("fcontractEndY", DateUtil.format(attachInfo.getContractEnd(), "yyyy"));
paramter.put("fcontractEndM", DateUtil.format(localDate2Date(attachInfo.getContractEnd()), "MM")); paramter.put("fcontractEndM", DateUtil.format(attachInfo.getContractEnd(), "MM"));
paramter.put("fcontractEndD", DateUtil.format(localDate2Date(attachInfo.getContractEnd()), "dd")); paramter.put("fcontractEndD", DateUtil.format(attachInfo.getContractEnd(), "dd"));
if (Common.isNotNull(companyFieldMap.get("fPeriodStartY"))){ if (Common.isNotNull(companyFieldMap.get("fPeriodStartY"))){
//合同起止时间填充,新签需要判断是否有试用期，试用期工资 //合同起止时间填充,新签需要判断是否有试用期，试用期工资
if (attachInfo.getPeriodStart() == null) { if (attachInfo.getPeriodStart() == null) {
return R.failed("新签试用期开始时间为空"); return R.failed("新签试用期开始时间为空");
} }
paramter.put("fPeriodStartY", DateUtil.format(localDate2Date(attachInfo.getPeriodStart()), "yyyy")); paramter.put("fPeriodStartY", DateUtil.format(attachInfo.getPeriodStart(), "yyyy"));
paramter.put("fPeriodStartM", DateUtil.format(localDate2Date(attachInfo.getPeriodStart()), "MM")); paramter.put("fPeriodStartM", DateUtil.format(attachInfo.getPeriodStart(), "MM"));
paramter.put("fPeriodStartD", DateUtil.format(localDate2Date(attachInfo.getPeriodStart()), "dd")); paramter.put("fPeriodStartD", DateUtil.format(attachInfo.getPeriodStart(), "dd"));
} }
if (Common.isNotNull(companyFieldMap.get("fPeriodEndY"))){ if (Common.isNotNull(companyFieldMap.get("fPeriodEndY"))){
if (attachInfo.getPeriodEnd() == null) { if (attachInfo.getPeriodEnd() == null) {
return R.failed("新签试用期结束时间为空"); return R.failed("新签试用期结束时间为空");
} }
paramter.put("fPeriodEndY", DateUtil.format(localDate2Date(attachInfo.getPeriodEnd()), "yyyy")); paramter.put("fPeriodEndY", DateUtil.format(attachInfo.getPeriodEnd(), "yyyy"));
paramter.put("fPeriodEndM", DateUtil.format(localDate2Date(attachInfo.getPeriodEnd()), "MM")); paramter.put("fPeriodEndM", DateUtil.format(attachInfo.getPeriodEnd(), "MM"));
paramter.put("fPeriodEndD", DateUtil.format(localDate2Date(attachInfo.getPeriodEnd()), "dd")); paramter.put("fPeriodEndD", DateUtil.format(attachInfo.getPeriodEnd(), "dd"));
} }
if (Common.isNotNull(companyFieldMap.get("periodSalaryPerMonth"))){ if (Common.isNotNull(companyFieldMap.get("periodSalaryPerMonth"))){
if (attachInfo.getPeriodSalaryPerMonth() == null) { if (attachInfo.getPeriodSalaryPerMonth() == null) {
...@@ -799,26 +796,26 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe ...@@ -799,26 +796,26 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
//固定期限 //固定期限
paramter.put("contractType", "一"); paramter.put("contractType", "一");
paramter.put("fcontractStartY", DateUtil.format(localDate2Date(attachInfo.getContractStart()), "yyyy")); paramter.put("fcontractStartY", DateUtil.format(attachInfo.getContractStart(), "yyyy"));
paramter.put("fcontractStartM", DateUtil.format(localDate2Date(attachInfo.getContractStart()), "MM")); paramter.put("fcontractStartM", DateUtil.format(attachInfo.getContractStart(), "MM"));
paramter.put("fcontractStartD", DateUtil.format(localDate2Date(attachInfo.getContractStart()), "dd")); paramter.put("fcontractStartD", DateUtil.format(attachInfo.getContractStart(), "dd"));
paramter.put("fcontractEndY", DateUtil.format(localDate2Date(attachInfo.getContractEnd()), "yyyy")); paramter.put("fcontractEndY", DateUtil.format(attachInfo.getContractEnd(), "yyyy"));
paramter.put("fcontractEndM", DateUtil.format(localDate2Date(attachInfo.getContractEnd()), "MM")); paramter.put("fcontractEndM", DateUtil.format(attachInfo.getContractEnd(), "MM"));
paramter.put("fcontractEndD", DateUtil.format(localDate2Date(attachInfo.getContractEnd()), "dd")); paramter.put("fcontractEndD", DateUtil.format(attachInfo.getContractEnd(), "dd"));
//合同起止时间填充,新签需要判断是否有试用期，试用期工资 //合同起止时间填充,新签需要判断是否有试用期，试用期工资
if (!signFlag) { if (!signFlag) {
if (attachInfo.getPeriodStart() == null) { if (attachInfo.getPeriodStart() == null) {
return R.failed("新签试用期开始时间为空"); return R.failed("新签试用期开始时间为空");
} }
paramter.put("fPeriodStartY", DateUtil.format(localDate2Date(attachInfo.getPeriodStart()), "yyyy")); paramter.put("fPeriodStartY", DateUtil.format(attachInfo.getPeriodStart(), "yyyy"));
paramter.put("fPeriodStartM", DateUtil.format(localDate2Date(attachInfo.getPeriodStart()), "MM")); paramter.put("fPeriodStartM", DateUtil.format(attachInfo.getPeriodStart(), "MM"));
paramter.put("fPeriodStartD", DateUtil.format(localDate2Date(attachInfo.getPeriodStart()), "dd")); paramter.put("fPeriodStartD", DateUtil.format(attachInfo.getPeriodStart(), "dd"));
if (attachInfo.getPeriodEnd() == null) { if (attachInfo.getPeriodEnd() == null) {
return R.failed("新签试用期结束时间为空"); return R.failed("新签试用期结束时间为空");
} }
paramter.put("fPeriodEndY", DateUtil.format(localDate2Date(attachInfo.getPeriodEnd()), "yyyy")); paramter.put("fPeriodEndY", DateUtil.format(attachInfo.getPeriodEnd(), "yyyy"));
paramter.put("fPeriodEndM", DateUtil.format(localDate2Date(attachInfo.getPeriodEnd()), "MM")); paramter.put("fPeriodEndM", DateUtil.format(attachInfo.getPeriodEnd(), "MM"));
paramter.put("fPeriodEndD", DateUtil.format(localDate2Date(attachInfo.getPeriodEnd()), "dd")); paramter.put("fPeriodEndD", DateUtil.format(attachInfo.getPeriodEnd(), "dd"));
if (attachInfo.getPeriodSalaryPerMonth() == null) { if (attachInfo.getPeriodSalaryPerMonth() == null) {
return R.failed("新签试用期工资为空"); return R.failed("新签试用期工资为空");
} }
...@@ -862,14 +859,6 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe ...@@ -862,14 +859,6 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
return new R<>(paramter.toJSONString()); return new R<>(paramter.toJSONString());
} }
public static Date localDate2Date(LocalDate localDate) {
if (null == localDate) {
return null;
}
ZonedDateTime zonedDateTime = localDate.atStartOfDay(ZoneId.systemDefault());
return Date.from(zonedDateTime.toInstant());
}
/** /**
* @param entity * @param entity
* @Author: huyc * @Author: huyc
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @ 4264478e
...@@ -28,15 +28,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -28,15 +28,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants; 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.TEmpBadRecord;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContractAlert; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContractAlert;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpFamily;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmpContractAlertMapper; 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.TEmployeeContractInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpContractAlertService; 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.archives.vo.ContractAlertSearchVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.FamilySearchVO;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; 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.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -45,7 +46,6 @@ import javax.servlet.ServletOutputStream; ...@@ -45,7 +46,6 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
...@@ -218,10 +218,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -218,10 +218,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)); .eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING));
Map<String,TEmpContractAlert> alertMap = new HashMap<>(); Map<String,TEmpContractAlert> alertMap = new HashMap<>();
if (Common.isNotNull(alertList)){ if (Common.isNotNull(alertList)){
LocalDate now = LocalDate.now();
Date nowDate = new Date(); Date nowDate = new Date();
for (TEmployeeContractInfo contract:alertList){ for (TEmployeeContractInfo contract:alertList){
extracted(now, nowDate, contract,alertMap); extracted(nowDate, contract,alertMap);
} }
} }
if (Common.isNotNull(notAccessList) && Common.isNotNull(alertMap)){ if (Common.isNotNull(notAccessList) && Common.isNotNull(alertMap)){
...@@ -241,13 +240,13 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -241,13 +240,13 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
return R.ok(); return R.ok();
} }
private void extracted(LocalDate now, Date nowDate, private void extracted(Date nowDate,
TEmployeeContractInfo contract, TEmployeeContractInfo contract,
Map<String,TEmpContractAlert> alertMap) { Map<String,TEmpContractAlert> alertMap) {
TEmpContractAlert alert = alertMap.get(contract.getEmpIdcard()); TEmpContractAlert alert = alertMap.get(contract.getEmpIdcard());
// 存在多个审核通过的数据 用最新的审核通过的合同覆盖已有的 // 存在多个审核通过的数据 用最新的审核通过的合同覆盖已有的
if (Common.isNotNull(alert) && if (Common.isNotNull(alert) &&
alert.getContractEnd().after(LocalDateTimeUtils.convertLDToDate(contract.getContractEnd()))){ alert.getContractEnd().after(contract.getContractEnd())){
return; return;
} }
alert = new TEmpContractAlert(); alert = new TEmpContractAlert();
...@@ -257,8 +256,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -257,8 +256,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
alert.setProject(contract.getSubjectDepart()); alert.setProject(contract.getSubjectDepart());
alert.setProjectNo(contract.getDeptNo()); alert.setProjectNo(contract.getDeptNo());
alert.setEmpIdcard(contract.getEmpIdcard()); alert.setEmpIdcard(contract.getEmpIdcard());
alert.setContractStart(LocalDateTimeUtils.convertLDToDate(contract.getContractStart())); alert.setContractStart(contract.getContractStart());
alert.setContractEnd(LocalDateTimeUtils.convertLDToDate(contract.getContractEnd())); alert.setContractEnd(contract.getContractEnd());
if (Common.isNotNull(contract.getFileProvince())){ if (Common.isNotNull(contract.getFileProvince())){
alert.setFileProvince(Integer.toString(contract.getFileProvince())); alert.setFileProvince(Integer.toString(contract.getFileProvince()));
} }
...@@ -272,7 +271,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -272,7 +271,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
alert.setContractTerm(contract.getContractType()); alert.setContractTerm(contract.getContractType());
alert.setContractTerm(contract.getContractTerm()); alert.setContractTerm(contract.getContractTerm());
if (Common.isNotNull(alert.getContractEnd())){ if (Common.isNotNull(alert.getContractEnd())){
if (Common.isNotNull(contract.getContractEnd()) && contract.getContractEnd().isBefore(now)){ if (Common.isNotNull(contract.getContractEnd()) && contract.getContractEnd().before(nowDate)){
alert.setDueFlag(CommonConstants.ONE_STRING); alert.setDueFlag(CommonConstants.ONE_STRING);
alert.setDaysOver(DateUtil.daysBetween(nowDate,alert.getContractEnd())); alert.setDaysOver(DateUtil.daysBetween(nowDate,alert.getContractEnd()));
}else { }else {
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @ 4264478e
...@@ -167,6 +167,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -167,6 +167,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return R.failed("未在人员档案中查到身份信息"); return R.failed("未在人员档案中查到身份信息");
} }
@Override
public R updateProject(TEmployeeProject tEmployeeProject) {
TEmployeeProject compareProject = this.getById(tEmployeeProject.getId());
boolean flag = this.updateById(tEmployeeProject);
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1],"",tEmployeeProject.getId(),compareProject,tEmployeeProject);
return R.ok(flag);
}
@Override @Override
public R reEmpInfo(JSONObject jsonObject) { public R reEmpInfo(JSONObject jsonObject) {
if (Common.isNotNull(jsonObject)) { if (Common.isNotNull(jsonObject)) {
......
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