Commit 81d19eaa authored by fangxinjiang's avatar fangxinjiang

社保自动化配置添加新字段-fxj

parent 6db2f1d6
...@@ -196,4 +196,112 @@ public class TAutoSocialRuleRel extends BaseEntity { ...@@ -196,4 +196,112 @@ public class TAutoSocialRuleRel extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数下限(社保或公积金)") @ExcelProperty("基数下限(社保或公积金)")
private BigDecimal lowerLimit; private BigDecimal lowerLimit;
/**
* 养老基数上限
*/
@ExcelAttribute(name = "养老基数上限")
@Schema(description = "养老基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数上限")
private BigDecimal upPersion;
/**
* 医疗基数上限
*/
@ExcelAttribute(name = "医疗基数上限")
@Schema(description = "医疗基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数上限")
private BigDecimal upMedical;
/**
* 失业基数上限
*/
@ExcelAttribute(name = "失业基数上限")
@Schema(description = "失业基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数上限")
private BigDecimal upUnemployment;
/**
* 工伤基数上限
*/
@ExcelAttribute(name = "工伤基数上限")
@Schema(description = "工伤基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数上限")
private BigDecimal upInjury;
/**
* 生育基数上限
*/
@ExcelAttribute(name = "生育基数上限")
@Schema(description = "生育基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数上限")
private BigDecimal upBirth;
/**
* 大病基数上限
*/
@ExcelAttribute(name = "大病基数上限")
@Schema(description = "大病基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数上限")
private BigDecimal upBig;
/**
* 养老基数下限
*/
@ExcelAttribute(name = "养老基数下限")
@Schema(description = "养老基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数下限")
private BigDecimal lowerPersion;
/**
* 医疗基数下限
*/
@ExcelAttribute(name = "医疗基数下限")
@Schema(description = "医疗基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数下限")
private BigDecimal lowerMedical;
/**
* 失业基数下限
*/
@ExcelAttribute(name = "失业基数下限")
@Schema(description = "失业基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数下限")
private BigDecimal lowerUnemployment;
/**
* 工伤基数下限
*/
@ExcelAttribute(name = "工伤基数下限")
@Schema(description = "工伤基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数下限")
private BigDecimal lowerInjury;
/**
* 生育基数下限
*/
@ExcelAttribute(name = "生育基数下限")
@Schema(description = "生育基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数下限")
private BigDecimal lowerBirth;
/**
* 大病基数下限
*/
@ExcelAttribute(name = "大病基数下限")
@Schema(description = "大病基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数下限")
private BigDecimal lowerBig;
} }
...@@ -902,6 +902,19 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu ...@@ -902,6 +902,19 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
ignoreFields.add("upperLimit"); ignoreFields.add("upperLimit");
ignoreFields.add("lowerLimit"); ignoreFields.add("lowerLimit");
ignoreFields.add("upPersion");
ignoreFields.add("upMedical");
ignoreFields.add("upUnemployment");
ignoreFields.add("upInjury");
ignoreFields.add("upBirth");
ignoreFields.add("upBig");
ignoreFields.add("lowerPersion");
ignoreFields.add("lowerMedical");
ignoreFields.add("lowerUnemployment");
ignoreFields.add("lowerInjury");
ignoreFields.add("lowerBirth");
ignoreFields.add("lowerBig");
// 更新档案管理规则 // 更新档案管理规则
if (Common.isNotNull(autoEmpRuleNew)){ if (Common.isNotNull(autoEmpRuleNew)){
String differenceKey = HrEquator.comparisonValueIgnoreField(autoEmpRuleOld, autoEmpRuleNew,ignoreFields); String differenceKey = HrEquator.comparisonValueIgnoreField(autoEmpRuleOld, autoEmpRuleNew,ignoreFields);
......
...@@ -47,6 +47,18 @@ ...@@ -47,6 +47,18 @@
<result property="province" column="PROVINCE"/> <result property="province" column="PROVINCE"/>
<result property="city" column="CITY"/> <result property="city" column="CITY"/>
<result property="town" column="TOWN"/> <result property="town" column="TOWN"/>
<result property="upPersion" column="UP_PERSION"/>
<result property="upMedical" column="UP_MEDICAL"/>
<result property="upUnemployment" column="UP_UNEMPLOYMENT"/>
<result property="upInjury" column="UP_INJURY"/>
<result property="upBirth" column="UP_BIRTH"/>
<result property="upBig" column="UP_BIG"/>
<result property="lowerPersion" column="LOWER_PERSION"/>
<result property="lowerMedical" column="LOWER_MEDICAL"/>
<result property="lowerUnemployment" column="LOWER_UNEMPLOYMENT"/>
<result property="lowerInjury" column="LOWER_INJURY"/>
<result property="lowerBirth" column="LOWER_BIRTH"/>
<result property="lowerBig" column="LOWER_BIG"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -72,7 +84,19 @@ ...@@ -72,7 +84,19 @@
a.CITY, a.CITY,
a.TOWN, a.TOWN,
a.UPPER_LIMIT, a.UPPER_LIMIT,
a.LOWER_LIMIT a.LOWER_LIMIT,
a.UP_PERSION,
a.UP_MEDICAL,
a.UP_UNEMPLOYMENT,
a.UP_INJURY,
a.UP_BIRTH,
a.UP_BIG,
a.LOWER_PERSION,
a.LOWER_MEDICAL,
a.LOWER_UNEMPLOYMENT,
a.LOWER_INJURY,
a.LOWER_BIRTH,
a.LOWER_BIG
</sql> </sql>
<sql id="tAutoSocialRuleRel_where"> <sql id="tAutoSocialRuleRel_where">
<if test="tAutoSocialRuleRel != null"> <if test="tAutoSocialRuleRel != null">
......
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