Commit bcaf7cd3 authored by hongguangwu's avatar hongguangwu

优化

parent 1bac909d
...@@ -110,28 +110,28 @@ public class TSalaryAccount { ...@@ -110,28 +110,28 @@ public class TSalaryAccount {
@ExcelProperty("开户行总行") @ExcelProperty("开户行总行")
private String bankName; private String bankName;
/** /**
* 结算部门id * 项目id
*/ */
@ExcelAttribute(name = "结算部门id", isNotEmpty = true, errorInfo = "结算部门id不能为空", maxLength = 32) @ExcelAttribute(name = "项目id", isNotEmpty = true, errorInfo = "项目id不能为空", maxLength = 32)
@NotBlank(message = "结算部门id不能为空") @NotBlank(message = "项目id不能为空")
@Length(max = 32, message = "结算部门id不能超过32个字符") @Length(max = 32, message = "项目id不能超过32个字符")
@ExcelProperty("结算部门id") @ExcelProperty("项目id")
private String deptId; private String deptId;
/** /**
* 结算部门no * 项目no
*/ */
@ExcelAttribute(name = "结算部门no", isNotEmpty = true, errorInfo = "结算部门no不能为空", maxLength = 50) @ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目no不能为空", maxLength = 50)
@NotBlank(message = "结算部门no不能为空") @NotBlank(message = "项目编码不能为空")
@Length(max = 50, message = "结算部门no不能超过50个字符") @Length(max = 50, message = "项目编码不能超过50个字符")
@ExcelProperty("结算部门no") @ExcelProperty("项目编码")
private String deptNo; private String deptNo;
/** /**
* 结算部门name * 项目name
*/ */
@ExcelAttribute(name = "结算部门name", isNotEmpty = true, errorInfo = "结算部门name不能为空", maxLength = 50) @ExcelAttribute(name = "项目名称", isNotEmpty = true, errorInfo = "项目name不能为空", maxLength = 50)
@NotBlank(message = "结算部门name不能为空") @NotBlank(message = "项目名称不能为空")
@Length(max = 50, message = "结算部门name不能超过50个字符") @Length(max = 50, message = "项目名称不能超过50个字符")
@ExcelProperty("结算部门name") @ExcelProperty("项目名称")
private String deptName; private String deptName;
/** /**
* 工资发放方式(0现金/1银行)/2线下 * 工资发放方式(0现金/1银行)/2线下
......
...@@ -1043,4 +1043,9 @@ public class TSocialFundInfo extends BaseEntity { ...@@ -1043,4 +1043,9 @@ public class TSocialFundInfo extends BaseEntity {
// 执行月份,整体调基使用的 // 执行月份,整体调基使用的
@TableField(exist = false) @TableField(exist = false)
private String doMonth; private String doMonth;
// 基数配置,户调基使用的
@TableField(exist = false)
private SysBaseSetInfo socialSetInfo;
@TableField(exist = false)
private SysBaseSetInfo fundSetInfo;
} }
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