Commit 4e2f6000 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 9e4c0f9c
......@@ -59,12 +59,12 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Schema(description = "是否自动触发申请:0自动生成合同申请 1手动发起合同申请")
private String autoFlag;
/**
* 新签合同发起时间类型 0 入职日期 1入职3天后 2入职1周后 3入职2周后 4入职3周后
* 新签合同发起时间类型 0 入职日期 3入职3天后 7入职1周后 14入职2周后 21入职3周后
*/
@ExcelAttribute(name = "新签合同发起时间类型 ", maxLength = 1)
@Length(max = 1, message = "新签合同发起时间类型 不能超过1个字符")
@ExcelProperty("新签合同发起时间类型 ")
@Schema(description = "新签合同发起时间类型 0 入职日期 1入职3天后 2入职1周后 3入职2周后 4入职3周后")
@Schema(description = "新签合同发起时间类型 0 入职日期 3入职3天后 7入职1周后 14入职2周后 21入职3周后")
private String newSignType;
/**
* 新签合同发起时间
......
......@@ -62,9 +62,8 @@ public class TAutoContractScheme extends BaseEntity {
/**
* 是否允许修改 0是 1否
*/
@ExcelAttribute(name = "是否允许修改", isNotEmpty = true, errorInfo = "是否允许修改不能为空", maxLength = 2)
@ExcelAttribute(name = "是否允许修改", isNotEmpty = true, errorInfo = "是否允许修改不能为空")
@NotBlank(message = "是否允许修改不能为空")
@Length(max = 1, message = "是否允许修改不能超过2个字符")
@ExcelProperty("是否允许修改")
@Schema(description = "是否允许修改 0是 1否")
private String updateFlag;
......@@ -89,7 +88,6 @@ public class TAutoContractScheme extends BaseEntity {
* 签署甲方
*/
@ExcelAttribute(name = "签署甲方", isNotEmpty = true, errorInfo = "签署甲方不能为空", maxLength = 50)
@Length(max = 50, message = "签署甲方不能超过50个字符")
@ExcelProperty("签署甲方")
@Schema(description = "签署甲方")
private String signatory;
......@@ -97,7 +95,6 @@ public class TAutoContractScheme extends BaseEntity {
* 发大大电子签模板
*/
@ExcelAttribute(name = "发大大电子签模板", maxLength = 50)
@Length(max = 50, message = "发大大电子签模板不能超过50个字符")
@ExcelProperty("发大大电子签模板")
@Schema(description = "发大大电子签模板")
private String fadadaTemplate;
......@@ -110,8 +107,7 @@ public class TAutoContractScheme extends BaseEntity {
* { label: '以完成一定工作任务为期限', value: '0'},
* ]
*/
@ExcelAttribute(name = "签订期限", maxLength = 2)
@Length(max = 1, message = "签订期限不能超过2个字符")
@ExcelAttribute(name = "签订期限")
@ExcelProperty("签订期限")
@Schema(description = "签订期限 0 固定期限 1 无固定期限 3.以完成一定工作任务为期限")
private String contractTerm;
......@@ -187,8 +183,7 @@ public class TAutoContractScheme extends BaseEntity {
/**
* 是否有试用期 0是1否
*/
@ExcelAttribute(name = "是否有试用期", maxLength = 2)
@Length(max = 1, message = "是否有试用期不能超过2个字符")
@ExcelAttribute(name = "是否有试用期")
@ExcelProperty("是否有试用期")
@Schema(description = "是否有试用期 0是1否")
private String tryPeriodType;
......@@ -210,8 +205,7 @@ public class TAutoContractScheme extends BaseEntity {
* { label: '12个月', value: '12'}
* ];
*/
@ExcelAttribute(name = "试用周期", maxLength = 2)
@Length(max = 1, message = "试用周期不能超过2个字符")
@ExcelAttribute(name = "试用周期")
@ExcelProperty("试用周期")
@Schema(description = "试用周期")
private String tryPeriod;
......@@ -246,8 +240,7 @@ public class TAutoContractScheme extends BaseEntity {
/**
* 任务类型: 0 不同员工不同任务自定义 1 所有员工任务相同
*/
@ExcelAttribute(name = "任务类型", maxLength = 2)
@Length(max = 1, message = "任务类型不能超过2个字符")
@ExcelAttribute(name = "任务类型")
@ExcelProperty("任务类型")
@Schema(description = "任务类型: 0 不同员工不同任务自定义 1 所有员工任务相同")
private String taskType;
......@@ -290,8 +283,7 @@ public class TAutoContractScheme extends BaseEntity {
/**
* 合同岗位 0 固定岗位 1 等于档案处维护 2 自定义
*/
@ExcelAttribute(name = "合同岗位", isNotEmpty = true, errorInfo = "合同岗位不能为空", maxLength = 2)
@Length(max = 1, message = "合同岗位不能超过2个字符")
@ExcelAttribute(name = "合同岗位", isNotEmpty = true, errorInfo = "合同岗位不能为空")
@ExcelProperty("合同岗位")
@Schema(description = "合同岗位 0 固定岗位 1 等于档案处维护 2 自定义")
private String postType;
......@@ -319,16 +311,14 @@ public class TAutoContractScheme extends BaseEntity {
* { label: '不定时工时制', value: '3'},
* ];
*/
@ExcelAttribute(name = "工时制", maxLength = 2)
@Length(max = 1, message = "工时制不能超过2个字符")
@ExcelAttribute(name = "工时制")
@ExcelProperty("工时制")
@Schema(description = "工时制 0 标准工时 1综合工时 2 不定时工时制")
private String workingHours;
/**
* 试用期工资(元/月)
*/
@ExcelAttribute(name = "试用期工资(元/月)", maxLength = 20)
@Length(max = 20, message = "试用期工资(元/月)不能超过20个字符")
@ExcelAttribute(name = "试用期工资(元/月)", maxLength = 50)
@ExcelProperty("试用期工资(元/月)")
@Schema(description = "试用期工资(元/月)")
private String workingReward;
......@@ -351,8 +341,7 @@ public class TAutoContractScheme extends BaseEntity {
/**
* 工资形式 1.计时工资 2.计件工资 3.其他
*/
@ExcelAttribute(name = "工资形式", maxLength = 2)
@Length(max = 1, message = "工资形式不能超过2个字符")
@ExcelAttribute(name = "工资形式")
@ExcelProperty("工资形式")
@Schema(description = "工资形式 1.计时工资 2.计件工资 3.其他")
private String salaryType;
......@@ -367,16 +356,14 @@ public class TAutoContractScheme extends BaseEntity {
/**
* 计时工资标准(元/月)
*/
@ExcelAttribute(name = "计时工资标准(元/月)", maxLength = 20)
@Length(max = 20, message = "计时工资标准(元/月)不能超过20个字符")
@ExcelAttribute(name = "计时工资标准(元/月)", maxLength = 50)
@ExcelProperty("计时工资标准(元/月)")
@Schema(description = "计时工资标准(元/月)")
private String hourlyWage;
/**
* 计件工资单价(元)
*/
@ExcelAttribute(name = "计件工资单价(元)", maxLength = 20)
@Length(max = 20, message = "计件工资单价(元)不能超过20个字符")
@ExcelAttribute(name = "计件工资单价(元)", maxLength = 50)
@ExcelProperty("计件工资单价(元)")
@Schema(description = "计件工资单价(元)")
private String pieceworkWage;
......@@ -394,24 +381,21 @@ public class TAutoContractScheme extends BaseEntity {
/**
* 劳务费(元/月)
*/
@ExcelAttribute(name = "劳务费(元/月)", maxLength = 20)
@Length(max = 20, message = "劳务费(元/月)不能超过20个字符")
@ExcelAttribute(name = "劳务费(元/月)", maxLength = 50)
@ExcelProperty("劳务费(元/月)")
@Schema(description = "劳务费(元/月)")
private String laborCost;
/**
* 违约责任(金额)
*/
@ExcelAttribute(name = "违约责任(金额)", maxLength = 20)
@Length(max = 20, message = "违约责任(金额)不能超过20个字符")
@ExcelAttribute(name = "违约责任(金额)", maxLength = 50)
@ExcelProperty("违约责任(金额)")
@Schema(description = "违约责任(金额)")
private String defaultAmount;
/**
* 工资结算周期
*/
@ExcelAttribute(name = "工资结算周期", maxLength = 20)
@Length(max = 20, message = "工资结算周期不能超过20个字符")
@ExcelAttribute(name = "工资结算周期", maxLength = 50)
@ExcelProperty("工资结算周期")
@Schema(description = "工资结算周期")
private String settlementCycle;
......@@ -419,7 +403,6 @@ public class TAutoContractScheme extends BaseEntity {
* 工资发放时间
*/
@ExcelAttribute(name = "工资发放时间", maxLength = 50)
@Length(max = 50, message = "工资发放时间不能超过50个字符")
@ExcelProperty("工资发放时间")
@Schema(description = "工资发放时间")
private String paymentTime;
......@@ -430,8 +413,7 @@ public class TAutoContractScheme extends BaseEntity {
* { label: '委托银行代发', value: '1'},
* ];
*/
@ExcelAttribute(name = "工资发放方式", maxLength = 2)
@Length(max = 1, message = "工资发放方式不能超过2个字符")
@ExcelAttribute(name = "工资发放方式")
@ExcelProperty("工资发放方式")
@Schema(description = "工资发放方式 0 直接发放/委托银行代发")
private String paymentType;
......@@ -453,8 +435,7 @@ public class TAutoContractScheme extends BaseEntity {
* { label: '12个月', value: '12'}
* ];
*/
@ExcelAttribute(name = "实习期限", maxLength = 2)
@Length(max = 1, message = "实习期限不能超过2个字符")
@ExcelAttribute(name = "实习期限")
@ExcelProperty("实习期限")
@Schema(description = "实习期限 无/一个月/两个月.../十二个月")
private String internshipPeriod;
......@@ -493,8 +474,7 @@ public class TAutoContractScheme extends BaseEntity {
* { label: '10年', value: '10'},
* ];
*/
@ExcelAttribute(name = "派遣期限-年", maxLength = 2)
@Length(max = 1, message = "派遣期限-年不能超过2个字符")
@ExcelAttribute(name = "派遣期限-年")
@ExcelProperty("派遣期限-年")
@Schema(description = "派遣期限-年")
private String dispatchPeriodYear;
......@@ -516,8 +496,7 @@ public class TAutoContractScheme extends BaseEntity {
*
* ];
*/
@ExcelAttribute(name = "派遣期限-月", maxLength = 2)
@Length(max = 1, message = "派遣期限-月不能超过2个字符")
@ExcelAttribute(name = "派遣期限-月")
@ExcelProperty("派遣期限-月")
@Schema(description = "派遣期限-月")
private String dispatchPeriodMonth;
......@@ -552,8 +531,7 @@ public class TAutoContractScheme extends BaseEntity {
/**
* 每周工作天数
*/
@ExcelAttribute(name = "每周工作天数", maxLength = 20)
@Length(max = 10, message = "每周工作天数不能超过10个字符")
@ExcelAttribute(name = "每周工作天数", maxLength = 50)
@ExcelProperty("每周工作天数")
@Schema(description = "每周工作天数")
private String workDayCount;
......@@ -568,8 +546,7 @@ public class TAutoContractScheme extends BaseEntity {
/**
* 每日工作时长
*/
@ExcelAttribute(name = "每日工作时长", maxLength = 20)
@Length(max = 10, message = "每日工作时长不能超过10个字符")
@ExcelAttribute(name = "每日工作时长", maxLength = 50)
@ExcelProperty("每日工作时长")
@Schema(description = "每日工作时长")
private String workHours;
......
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