Commit 460ebd75 authored by fangxinjiang's avatar fangxinjiang

社保自动化配置-fxj

parent b1236e7c
...@@ -61,34 +61,34 @@ public class TAutoSocialRuleInfo extends BaseEntity { ...@@ -61,34 +61,34 @@ public class TAutoSocialRuleInfo extends BaseEntity {
/** /**
* 是否自动触发派增(字典:0自动触发派增,1:手动派增) * 是否自动触发派增(字典:0自动触发派增,1:手动派增)
*/ */
@ExcelAttribute(name = "是否自动触发派增(字典:0自动触发派增,1:手动派增)", isNotEmpty = true, errorInfo = "是否自动触发派增(字典:0自动触发派增,1:手动派增)不能为空", maxLength = 1) @ExcelAttribute(name = "是否自动触发派增", isNotEmpty = true, errorInfo = "是否自动触发派增不能为空", maxLength = 1)
@NotBlank(message = "是否自动触发派增(字典:0自动触发派增,1:手动派增)不能为空") @NotBlank(message = "是否自动触发派增不能为空")
@Length(max = 1, message = "是否自动触发派增(字典:0自动触发派增,1:手动派增)不能超过1个字符") @Length(max = 1, message = "是否自动触发派增不能超过1个字符")
@ExcelProperty("是否自动触发派增(字典:0自动触发派增,1:手动派增)") @ExcelProperty("是否自动触发派增")
@Schema(description = "是否自动触发派增(字典:0自动触发派增,1:手动派增)") @Schema(description = "是否自动触发派增(字典:0自动触发派增,1:手动派增)")
private String autoFlag; private String autoFlag;
/** /**
* 派单发起时间(字典::0:入职满1个月...入职满6个月) * 派单发起时间(字典::0:入职满1个月...入职满6个月)
*/ */
@ExcelAttribute(name = "派单发起时间(字典::0:入职满1个月...入职满6个月)", maxLength = 2) @ExcelAttribute(name = "派单发起时间", maxLength = 2,isNotEmpty = true, errorInfo = "派单发起时间不能为空")
@Length(max = 2, message = "派单发起时间(字典::0:入职满1个月...入职满6个月)不能超过2个字符") @Length(max = 2, message = "派单发起时间不能超过2个字符")
@ExcelProperty("派单发起时间(字典::0:入职满1个月...入职满6个月)") @ExcelProperty("派单发起时间")
@Schema(description = "派单发起时间(字典::0:入职满1个月...入职满6个月)") @Schema(description = "派单发起时间(字典::0:入职满1个月...入职满6个月)")
private String startPeriod; private String startPeriod;
/** /**
* 派单发起具体时间字典:0:15:20 * 派单发起具体时间字典:0:15:20
*/ */
@ExcelAttribute(name = "派单发起具体时间字典:0:15:20", maxLength = 10) @ExcelAttribute(name = "派单发起具体时间", maxLength = 10)
@Length(max = 10, message = "派单发起具体时间字典:0:15:20不能超过10个字符") @Length(max = 10, message = "派单发起具体时间不能超过10个字符")
@ExcelProperty("派单发起具体时间字典:0:15:20") @ExcelProperty("派单发起具体时间字典")
@Schema(description = "派单发起具体时间字典:0:15:20") @Schema(description = "派单发起具体时间字典:0:15:20")
private String startTime; private String startTime;
/** /**
* 派单确认时间,字典:0:派单发起当日 * 派单确认时间,字典:0:派单发起当日
*/ */
@ExcelAttribute(name = "派单确认时间,字典:0:派单发起当日", maxLength = 50) @ExcelAttribute(name = "派单确认时间", maxLength = 50,isNotEmpty = true, errorInfo = "派单发起时间不能为空")
@Length(max = 50, message = "派单确认时间,字典:0:派单发起当日不能超过50个字符") @Length(max = 50, message = "派单确认时间不能超过50个字符")
@ExcelProperty("派单确认时间,字典:0:派单发起当日") @ExcelProperty("派单确认时间")
@Schema(description = "派单确认时间,字典:0:派单发起当日") @Schema(description = "派单确认时间,字典:0:派单发起当日")
private String confirmPeriod; private String confirmPeriod;
/** /**
......
...@@ -52,8 +52,7 @@ public class TAutoSocialRuleRel extends BaseEntity { ...@@ -52,8 +52,7 @@ public class TAutoSocialRuleRel extends BaseEntity {
/** /**
* 社保配置ID * 社保配置ID
*/ */
@ExcelAttribute(name = "社保配置ID", isNotEmpty = true, errorInfo = "社保配置ID不能为空", maxLength = 32) @ExcelAttribute(name = "社保配置ID", isNotEmpty = false, errorInfo = "社保配置ID不能为空", maxLength = 32)
@NotBlank(message = "社保配置ID不能为空")
@Length(max = 32, message = "社保配置ID不能超过32个字符") @Length(max = 32, message = "社保配置ID不能超过32个字符")
@ExcelProperty("社保配置ID") @ExcelProperty("社保配置ID")
@Schema(description = "社保配置ID") @Schema(description = "社保配置ID")
...@@ -70,7 +69,7 @@ public class TAutoSocialRuleRel extends BaseEntity { ...@@ -70,7 +69,7 @@ public class TAutoSocialRuleRel extends BaseEntity {
/** /**
* 社保户ID * 社保户ID
*/ */
@ExcelAttribute(name = "社保户ID", maxLength = 50) @ExcelAttribute(name = "社保户ID", maxLength = 50, isNotEmpty = true, errorInfo = "社保户不能为空")
@Length(max = 50, message = "社保户ID不能超过50个字符") @Length(max = 50, message = "社保户ID不能超过50个字符")
@ExcelProperty("社保户ID") @ExcelProperty("社保户ID")
@Schema(description = "社保户ID") @Schema(description = "社保户ID")
...@@ -78,33 +77,33 @@ public class TAutoSocialRuleRel extends BaseEntity { ...@@ -78,33 +77,33 @@ public class TAutoSocialRuleRel extends BaseEntity {
/** /**
* 社保起缴日期是否一致(0-是,1-否) * 社保起缴日期是否一致(0-是,1-否)
*/ */
@ExcelAttribute(name = "社保起缴日期是否一致(0-是,1-否)", maxLength = 1) @ExcelAttribute(name = "社保起缴日期是否一致", maxLength = 1, isNotEmpty = true, errorInfo = "社保起缴日期是否一致不能为空")
@Length(max = 1, message = "社保起缴日期是否一致(0-是,1-否)不能超过1个字符") @Length(max = 1, message = "社保起缴日期是否一致不能超过1个字符")
@ExcelProperty("社保起缴日期是否一致(0-是,1-否)") @ExcelProperty("社保起缴日期是否一致")
@Schema(description = "社保起缴日期是否一致(0-是,1-否)") @Schema(description = "社保起缴日期是否一致(0-是,1-否)")
private String socialDateFlag; private String socialDateFlag;
/** /**
* 起缴日期:0 入职日期 * 起缴日期:0 入职日期
*/ */
@ExcelAttribute(name = "起缴日期:0 入职日期", maxLength = 2) @ExcelAttribute(name = "起缴日期", maxLength = 2)
@Length(max = 2, message = "起缴日期:0 入职日期不能超过2个字符") @Length(max = 2, message = "起缴日期不能超过2个字符")
@ExcelProperty("起缴日期:0 入职日期") @ExcelProperty("起缴日期")
@Schema(description = "起缴日期:0 入职日期") @Schema(description = "起缴日期:0 入职日期")
private String socialDateType; private String socialDateType;
/** /**
* 缴纳类型:0最低、1自定义、2最高 * 缴纳类型:0最低、1自定义、2最高
*/ */
@ExcelAttribute(name = "缴纳类型:0最低、1自定义、2最高", maxLength = 2) @ExcelAttribute(name = "缴纳类型", maxLength = 2, isNotEmpty = true, errorInfo = "缴纳类型不能为空")
@Length(max = 2, message = "缴纳类型:0最低、1自定义、2最高不能超过2个字符") @Length(max = 2, message = "缴纳类型不能超过2个字符")
@ExcelProperty("缴纳类型:0最低、1自定义、2最高") @ExcelProperty("缴纳类型")
@Schema(description = "缴纳类型:0最低、1自定义、2最高") @Schema(description = "缴纳类型:0最低、1自定义、2最高")
private String paymentType; private String paymentType;
/** /**
* 备案基数类型:0固定值1自定义 * 备案基数类型:0固定值1自定义
*/ */
@ExcelAttribute(name = "备案基数类型:0固定值1自定义", maxLength = 2) @ExcelAttribute(name = "备案基数类型", maxLength = 2 ,isNotEmpty = true, errorInfo = "备案基数类型不能为空")
@Length(max = 2, message = "备案基数类型:0固定值1自定义不能超过2个字符") @Length(max = 2, message = "备案基数类型不能超过2个字符")
@ExcelProperty("备案基数类型:0固定值1自定义") @ExcelProperty("备案基数类型")
@Schema(description = "备案基数类型:0固定值1自定义") @Schema(description = "备案基数类型:0固定值1自定义")
private String recordBaseType; private String recordBaseType;
/** /**
...@@ -118,15 +117,15 @@ public class TAutoSocialRuleRel extends BaseEntity { ...@@ -118,15 +117,15 @@ public class TAutoSocialRuleRel extends BaseEntity {
/** /**
* 委托备注(字典值) * 委托备注(字典值)
*/ */
@ExcelAttribute(name = "委托备注(字典值)", maxLength = 100) @ExcelAttribute(name = "委托备注", maxLength = 100)
@Length(max = 100, message = "委托备注(字典值)不能超过100个字符") @Length(max = 100, message = "委托备注不能超过100个字符")
@ExcelProperty("委托备注(字典值)") @ExcelProperty("委托备注")
@Schema(description = "委托备注(字典值)") @Schema(description = "委托备注(字典值)")
private String remarkDict; private String remarkDict;
/** /**
* 项目编码 * 项目编码
*/ */
@ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码不能为空", maxLength = 50) @ExcelAttribute(name = "项目编码",maxLength = 50)
@NotBlank(message = "项目编码不能为空") @NotBlank(message = "项目编码不能为空")
@Length(max = 50, message = "项目编码不能超过50个字符") @Length(max = 50, message = "项目编码不能超过50个字符")
@ExcelProperty("项目编码") @ExcelProperty("项目编码")
...@@ -135,7 +134,7 @@ public class TAutoSocialRuleRel extends BaseEntity { ...@@ -135,7 +134,7 @@ public class TAutoSocialRuleRel extends BaseEntity {
/** /**
* 项目ID * 项目ID
*/ */
@ExcelAttribute(name = "项目ID", isNotEmpty = true, errorInfo = "项目ID不能为空", maxLength = 50) @ExcelAttribute(name = "项目ID",maxLength = 50)
@NotBlank(message = "项目ID不能为空") @NotBlank(message = "项目ID不能为空")
@Length(max = 50, message = "项目ID不能超过50个字符") @Length(max = 50, message = "项目ID不能超过50个字符")
@ExcelProperty("项目ID") @ExcelProperty("项目ID")
......
...@@ -46,4 +46,10 @@ public class TAutoMainRelAddVo implements Serializable { ...@@ -46,4 +46,10 @@ public class TAutoMainRelAddVo implements Serializable {
//员工合同签订规则配置方案子表表 //员工合同签订规则配置方案子表表
private List<TAutoContractScheme> contractSchemes; private List<TAutoContractScheme> contractSchemes;
//社保规则主表
private TAutoSocialRuleInfo autoSocialRuleInfo;
//社保规则明细表
private List<TAutoSocialRuleRel> socialRuleRels;
} }
...@@ -60,4 +60,10 @@ public class TAutoMainRelDetailVo implements Serializable { ...@@ -60,4 +60,10 @@ public class TAutoMainRelDetailVo implements Serializable {
//员工合同签订规则配置方案子表表 //员工合同签订规则配置方案子表表
private List<TAutoContractScheme> contractSchemes; private List<TAutoContractScheme> contractSchemes;
//社保规则表
private TAutoSocialRuleInfo socialRuleInfo;
//社保规则明细表
private List<TAutoSocialRuleRel> socialRuleRels;
} }
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