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;
}
......@@ -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.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
......@@ -112,7 +114,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "签订期限不能超过2个字符")
@ExcelProperty("签订期限")
@Schema(description = "签订期限 0 固定期限 1 无固定期限 3.以完成一定工作任务为期限")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String contractTerm;
/**
* 合同年限-年
......@@ -134,7 +135,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "合同年限-年不能超过50个字符")
@ExcelProperty("合同年限-年")
@Schema(description = "合同年限-年")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String contractDurationYear;
/**
* 合同年限-月
......@@ -159,7 +159,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "合同年限-月不能超过50个字符")
@ExcelProperty("合同年限-月")
@Schema(description = "合同年限-月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String contractDurationMonth;
/**
* 合同开始日期
......@@ -171,7 +170,6 @@ public class TAutoContractScheme extends BaseEntity {
@ExcelAttribute(name = "合同开始日期")
@ExcelProperty("合同开始日期")
@Schema(description = "合同开始日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String contractStart;
/**
* 合同截止日期
......@@ -185,7 +183,6 @@ public class TAutoContractScheme extends BaseEntity {
@ExcelAttribute(name = "合同截止日期")
@ExcelProperty("合同截止日期")
@Schema(description = "合同截止日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String contractEnd;
/**
* 是否有试用期 0是1否
......@@ -194,7 +191,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "是否有试用期不能超过2个字符")
@ExcelProperty("是否有试用期")
@Schema(description = "是否有试用期 0是1否")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String tryPeriodType;
/**
* 试用周期
......@@ -218,7 +214,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "试用周期不能超过2个字符")
@ExcelProperty("试用周期")
@Schema(description = "试用周期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String tryPeriod;
/**
* 试用开始日期
......@@ -229,7 +224,6 @@ public class TAutoContractScheme extends BaseEntity {
@ExcelAttribute(name = "试用开始日期")
@ExcelProperty("试用开始日期")
@Schema(description = "试用开始日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String tryPeriodStart;
/**
* 试用截止日期
......@@ -240,7 +234,6 @@ public class TAutoContractScheme extends BaseEntity {
@ExcelAttribute(name = "试用截止日期")
@ExcelProperty("试用截止日期")
@Schema(description = "试用截止日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String tryPeriodEnd;
/**
* 工作任务
......@@ -249,7 +242,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 200, message = "工作任务不能超过200个字符")
@ExcelProperty("工作任务")
@Schema(description = "工作任务")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String task;
/**
* 任务类型: 0 不同员工不同任务自定义 1 所有员工任务相同
......@@ -258,7 +250,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "任务类型不能超过2个字符")
@ExcelProperty("任务类型")
@Schema(description = "任务类型: 0 不同员工不同任务自定义 1 所有员工任务相同")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String taskType;
/**
* 结束任务标准
......@@ -267,7 +258,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 200, message = "结束任务标准不能超过200个字符")
@ExcelProperty("结束任务标准")
@Schema(description = "结束任务标准")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String taskEndStandard;
/**
* 项目配置主表ID
......@@ -277,7 +267,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 32, message = "项目配置主表ID不能超过32个字符")
@ExcelProperty("项目配置主表ID")
@Schema(description = "项目配置主表ID")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String mainId;
/**
......@@ -288,7 +277,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "项目编码不能超过50个字符")
@ExcelProperty("项目编码")
@Schema(description = "项目编码")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String deptNo;
/**
* 项目ID
......@@ -306,7 +294,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "合同岗位不能超过2个字符")
@ExcelProperty("合同岗位")
@Schema(description = "合同岗位 0 固定岗位 1 等于档案处维护 2 自定义")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String postType;
/**
* 合同岗位名称
......@@ -315,7 +302,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "合同岗位名称不能超过50个字符")
@ExcelProperty("合同岗位名称")
@Schema(description = "合同岗位名称")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String post;
/**
* 工作地点
......@@ -324,7 +310,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 200, message = "工作地点不能超过200个字符")
@ExcelProperty("工作地点")
@Schema(description = "工作地点")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workAddress;
/**
* 工时制
......@@ -338,7 +323,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "工时制不能超过2个字符")
@ExcelProperty("工时制")
@Schema(description = "工时制 0 标准工时 1综合工时 2 不定时工时制")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workingHours;
/**
* 试用期工资(元/月)
......@@ -347,7 +331,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 20, message = "试用期工资(元/月)不能超过20个字符")
@ExcelProperty("试用期工资(元/月)")
@Schema(description = "试用期工资(元/月)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workingReward;
/**
* 工作部门
......@@ -356,7 +339,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "工作部门不能超过50个字符")
@ExcelProperty("工作部门")
@Schema(description = "工作部门")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workingDept;
/**
* 用工单位名称
......@@ -365,7 +347,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "用工单位名称不能超过50个字符")
@ExcelProperty("用工单位名称")
@Schema(description = "用工单位名称")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workingCompany;
/**
* 工资形式 1.计时工资 2.计件工资 3.其他
......@@ -374,7 +355,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "工资形式不能超过2个字符")
@ExcelProperty("工资形式")
@Schema(description = "工资形式 1.计时工资 2.计件工资 3.其他")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String salaryType;
/**
* 购买补充保险说明
......@@ -383,7 +363,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "购买补充保险说明不能超过50个字符")
@ExcelProperty("购买补充保险说明")
@Schema(description = "购买补充保险说明")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String riskBuyDesc;
/**
* 计时工资标准(元/月)
......@@ -392,7 +371,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 20, message = "计时工资标准(元/月)不能超过20个字符")
@ExcelProperty("计时工资标准(元/月)")
@Schema(description = "计时工资标准(元/月)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String hourlyWage;
/**
* 计件工资单价(元)
......@@ -401,7 +379,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 20, message = "计件工资单价(元)不能超过20个字符")
@ExcelProperty("计件工资单价(元)")
@Schema(description = "计件工资单价(元)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String pieceworkWage;
/**
* 其他 (工资形式其他时的工资)
......@@ -413,7 +390,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "其他不能超过50个字符")
@ExcelProperty("其他")
@Schema(description = "其他 (工资形式其他时的工资)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String otherWage;
/**
* 劳务费(元/月)
......@@ -422,7 +398,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 20, message = "劳务费(元/月)不能超过20个字符")
@ExcelProperty("劳务费(元/月)")
@Schema(description = "劳务费(元/月)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String laborCost;
/**
* 违约责任(金额)
......@@ -431,7 +406,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 20, message = "违约责任(金额)不能超过20个字符")
@ExcelProperty("违约责任(金额)")
@Schema(description = "违约责任(金额)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String defaultAmount;
/**
* 工资结算周期
......@@ -440,7 +414,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 20, message = "工资结算周期不能超过20个字符")
@ExcelProperty("工资结算周期")
@Schema(description = "工资结算周期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String settlementCycle;
/**
* 工资发放时间
......@@ -449,7 +422,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "工资发放时间不能超过50个字符")
@ExcelProperty("工资发放时间")
@Schema(description = "工资发放时间")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String paymentTime;
/**
* 工资发放方式 0
......@@ -462,7 +434,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "工资发放方式不能超过2个字符")
@ExcelProperty("工资发放方式")
@Schema(description = "工资发放方式 0 直接发放/委托银行代发")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String paymentType;
/**
* 实习期限 无/一个月/两个月.../十二个月
......@@ -486,7 +457,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "实习期限不能超过2个字符")
@ExcelProperty("实习期限")
@Schema(description = "实习期限 无/一个月/两个月.../十二个月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String internshipPeriod;
/**
* 实习开始日期
......@@ -497,7 +467,6 @@ public class TAutoContractScheme extends BaseEntity {
@ExcelAttribute(name = "实习开始日期")
@ExcelProperty("实习开始日期")
@Schema(description = "实习开始日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String internshipPeriodStart;
/**
* 实习结束日期
......@@ -508,7 +477,6 @@ public class TAutoContractScheme extends BaseEntity {
@ExcelAttribute(name = "实习结束日期")
@ExcelProperty("实习结束日期")
@Schema(description = "实习结束日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String internshipPeriodEnd;
/**
* 派遣期限年
......@@ -529,7 +497,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "派遣期限-年不能超过2个字符")
@ExcelProperty("派遣期限-年")
@Schema(description = "派遣期限-年")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String dispatchPeriodYear;
/**
* 派遣期限-月
......@@ -553,7 +520,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 1, message = "派遣期限-月不能超过2个字符")
@ExcelProperty("派遣期限-月")
@Schema(description = "派遣期限-月")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String dispatchPeriodMonth;
/**
* 派遣开始日期
......@@ -564,7 +530,6 @@ public class TAutoContractScheme extends BaseEntity {
@ExcelAttribute(name = "派遣开始日期")
@ExcelProperty("派遣开始日期")
@Schema(description = "派遣开始日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String dispatchPeriodStart;
/**
* 派遣结束日期
......@@ -575,7 +540,6 @@ public class TAutoContractScheme extends BaseEntity {
@ExcelAttribute(name = "派遣结束日期")
@ExcelProperty("派遣结束日期")
@Schema(description = "派遣结束日期")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String dispatchPeriodEnd;
/**
* 工作方式 0 第一种方式 1 第二种方式
......@@ -584,7 +548,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "工作方式不能超过50个字符")
@ExcelProperty("工作方式")
@Schema(description = "工作方式 0 第一种方式 1 第二种方式")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workType;
/**
* 每周工作天数
......@@ -593,7 +556,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 10, message = "每周工作天数不能超过10个字符")
@ExcelProperty("每周工作天数")
@Schema(description = "每周工作天数")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workDayCount;
/**
* 每周工作日
......@@ -602,7 +564,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "每周工作日不能超过50个字符")
@ExcelProperty("每周工作日")
@Schema(description = "每周工作日")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workDay;
/**
* 每日工作时长
......@@ -611,7 +572,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 10, message = "每日工作时长不能超过10个字符")
@ExcelProperty("每日工作时长")
@Schema(description = "每日工作时长")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workHours;
/**
* 其他工作时间 (工作方式为第二种方式)
......@@ -623,7 +583,6 @@ public class TAutoContractScheme extends BaseEntity {
@Length(max = 50, message = "其他工作时间 不能超过50个字符")
@ExcelProperty("其他工作时间 ")
@Schema(description = "其他工作时间 (工作方式为第二种方式)")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String otherWorkDay;
}
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