Merge remote-tracking branch 'origin/MVP1.2' into MVP1.2

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java

@@ -505,6 +505,11 @@ public class TSalaryAccount extends BaseEntity {
 	@ExcelProperty(value = "累计3岁以下婴幼儿照护")
 	private BigDecimal sumBabyMoney;
 
+	@ExcelAttribute(name = "累计个人养老金", isFloat = true,max = "999999999.99")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "累计个人养老金")
+	private BigDecimal sumPrivatePension;
+
 	@ExcelAttribute(name = "年终奖单独扣税税费", isFloat = true,max = "999999999.99")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value = "年终奖单独扣税税费")

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSpecialDeducationSum.java

@@ -188,6 +188,15 @@ public class TSpecialDeducationSum extends BaseEntity {
 	@ExcelProperty(value = "累计婴幼儿照护费用")
      private BigDecimal sumBabyMoney;
 
+	 /**
+      * 累计个人养老金
+      * hgw 2022-12-13 17:15:48 樊青青提的需求
+      */
+     @ExcelAttribute(name = "累计个人养老金", isFloat = true,max = "999999999.99")
+     @HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "累计个人养老金")
+     private BigDecimal sumPrivatePension;
+
      /**
       * 企业(职业)年金
       */

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -687,6 +687,10 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 					sdSum = sdSum.add(this.saveNewItems(saiList, SalaryConstants.SUM_BABY_MONEY,
 							SalaryConstants.SUM_BABY_MONEY_JAVA, sds.getSumBabyMoney(), CommonConstants.ZERO_INT));
 					a.setSumBabyMoney(sds.getSumBabyMoney());
+					//累计个人养老
+					sdSum = sdSum.add(this.saveNewItems(saiList, SalaryConstants.SUM_PRIVATE_PENSION,
+							SalaryConstants.SUM_PRIVATE_PENSION_JAVA, sds.getSumPrivatePension(), CommonConstants.ZERO_INT));
+					a.setSumBabyMoney(sds.getSumBabyMoney());
 					//累计专项扣除总额
 					this.saveNewItems(saiList, SalaryConstants.SPECIAL_DEDU_MONEY_SUM,
 							SalaryConstants.SPECIAL_DEDU_MONEY_SUM_JAVA, sdSum, CommonConstants.ZERO_INT);

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java

@@ -131,6 +131,9 @@ public class SalaryConstants {
      //累计婴幼儿照护费用
      public static final String SUM_BABY_MONEY = "累计婴幼儿照护费用";
      public static final String SUM_BABY_MONEY_JAVA = "sumBabyMoney";
+	 //累计个人养老金
+	 public static final String SUM_PRIVATE_PENSION = "累计个人养老金";
+     public static final String SUM_PRIVATE_PENSION_JAVA = "sumPrivatePension";
 
      public static final String ANNUAL_BONUS_TAX = "年终奖单独扣税";
      //年终奖扣税

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -91,6 +91,7 @@
 	<result property="sumSupportElderlyMoney" column="SUM_SUPPORT_ELDERLY_MONEY"/>
 	<result property="sumContinuingEducationMoney" column="SUM_CONTINUING_EDUCATION_MONEY"/>
 	<result property="sumBabyMoney" column="SUM_BABY_MONEY"/>
+	<result property="sumPrivatePension" column="SUM_PRIVATE_PENSION"/>
 
   </resultMap>
 
@@ -235,7 +236,8 @@
 				a.SUM_HOUSING_RENT_MONEY,
 				a.SUM_SUPPORT_ELDERLY_MONEY,
 				a.SUM_CONTINUING_EDUCATION_MONEY,
-				a.SUM_BABY_MONEY
+				a.SUM_BABY_MONEY,
+				a.SUM_PRIVATE_PENSION
 	</sql>
     <sql id="tSalaryAccount_where">
         <if test="tSalaryAccount != null">

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSpecialDeducationSumMapper.xml

@@ -28,6 +28,7 @@
         <result property="sumSupportElderlyMoney" column="SUM_SUPPORT_ELDERLY_MONEY"/>
         <result property="sumContinuingEducationMoney" column="SUM_CONTINUING_EDUCATION_MONEY"/>
         <result property="sumBabyMoney" column="SUM_BABY_MONEY"/>
+        <result property="sumPrivatePension" column="SUM_PRIVATE_PENSION"/>
         <result property="enterpriseAnnuity" column="ENTERPRISE_ANNUITY"/>
         <result property="takingRisks" column="TAKING_RISKS"/>
         <result property="taxDeferredInsurance" column="TAX_DEFERRED_INSURANCE"/>
@@ -64,6 +65,7 @@
         SUM_SUPPORT_ELDERLY_MONEY,
         SUM_CONTINUING_EDUCATION_MONEY,
         SUM_BABY_MONEY,
+        SUM_PRIVATE_PENSION,
         ENTERPRISE_ANNUITY,
         TAKING_RISKS,
         TAX_DEFERRED_INSURANCE,