Commit f6766532 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents c1efb8c1 0dd648bd
......@@ -18,7 +18,9 @@
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
......@@ -63,7 +65,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 1, message = "新签合同发起时间类型 不能超过1个字符")
@ExcelProperty("新签合同发起时间类型 ")
@Schema(description = "新签合同发起时间类型 0 入职日期 1入职3天后 2入职1周后 3入职2周后 4入职3周后")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String newSignType;
/**
* 新签合同发起时间
......@@ -72,7 +73,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 10, message = "新签合同发起时间不能超过10个字符")
@ExcelProperty("新签合同发起时间")
@Schema(description = "新签合同发起时间")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String newSignDate;
/**
* 确认签署时间类型 0 签订发起日
......@@ -81,7 +81,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 1, message = "确认签署时间类型 不能超过1个字符")
@ExcelProperty("确认签署时间类型 ")
@Schema(description = "确认签署时间类型 0 签订发起日")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String confirmSignType;
/**
* 确认签署时间
......@@ -90,7 +89,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 10, message = "确认签署时间不能超过10个字符")
@ExcelProperty("确认签署时间")
@Schema(description = "确认签署时间")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String confirmSignDate;
/**
* 续签合同发起时间类型 0 上一份合同到期前一个月
......@@ -99,7 +97,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 1, message = "续签合同发起时间类型 不能超过1个字符")
@ExcelProperty("续签合同发起时间类型 ")
@Schema(description = "续签合同发起时间类型 0 上一份合同到期前一个月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String renewalDateType;
/**
* 续签合同发起时间
......@@ -108,7 +105,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 10, message = "续签合同发起时间不能超过10个字符")
@ExcelProperty("续签合同发起时间")
@Schema(description = "续签合同发起时间")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String renewalDate;
/**
* 入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义
......@@ -117,7 +113,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 1, message = "入职确认选择不能超过1个字符")
@ExcelProperty("入职确认选择")
@Schema(description = "入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String confirmEmpSelect;
/**
* 超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发
......@@ -126,7 +121,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 1, message = "超时未确认是否触发签署任务(电子签)不能超过1个字符")
@ExcelProperty("超时未确认是否触发签署任务(电子签)")
@Schema(description = "超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String timeoutElecSign;
/**
* 签署方式 0 电子签 1 线下签
......@@ -136,7 +130,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 1, message = "签署方式不能超过1个字符")
@ExcelProperty("签署方式")
@Schema(description = "签署方式 0 电子签 1 线下签")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String signType;
/**
* 项目配置主表ID
......@@ -146,7 +139,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 32, message = "项目配置主表ID不能超过32个字符")
@ExcelProperty("项目配置主表ID")
@Schema(description = "项目配置主表ID")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String mainId;
/**
* 项目编码
......@@ -156,7 +148,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 50, message = "项目编码不能超过50个字符")
@ExcelProperty("项目编码")
@Schema(description = "项目编码")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String deptNo;
/**
* 项目ID
......@@ -166,7 +157,6 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length(max = 32, message = "项目ID不能超过32个字符")
@ExcelProperty("项目ID")
@Schema(description = "项目ID")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String deptId;
}
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