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/TSalaryAccount2022.java

@@ -270,11 +270,11 @@ public class TSalaryAccount2022 {
 	@ExcelProperty("单位name")
 	private String unitName;
 	/**
-	 * 累计婴幼儿照护费用
+	 * 累计3岁以下婴幼儿照护
 	 */
-	@ExcelAttribute(name = "累计婴幼儿照护费用")
+	@ExcelAttribute(name = "累计3岁以下婴幼儿照护")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("累计婴幼儿照护费用")
+	@ExcelProperty("累计3岁以下婴幼儿照护")
 	private BigDecimal sumBabyMoney;
 	/**
 	 * 是否当月新增人员

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

@@ -180,12 +180,12 @@ public class TSpecialDeducationSum extends BaseEntity {
      private BigDecimal sumContinuingEducationMoney;
 
      /**
-      * 累计婴幼儿照护费用 (累计3岁以下婴幼儿照护)
+      * 累计3岁以下婴幼儿照护 (累计3岁以下婴幼儿照护)
       * hgw 2022-4-2 11:05:44 樊青青提的需求
       */
-     @ExcelAttribute(name = "累计婴幼儿照护费用", isFloat = true,max = "999999999.99")
+     @ExcelAttribute(name = "累计3岁以下婴幼儿照护", isFloat = true,max = "999999999.99")
      @HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty(value = "累计婴幼儿照护费用")
+	@ExcelProperty(value = "累计3岁以下婴幼儿照护")
      private BigDecimal sumBabyMoney;
 
 	 /**

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

@@ -380,11 +380,11 @@ public class TStatisticsCurrentReportMarket {
 	@ExcelProperty("单位name")
 	private String unitName;
 	/**
-	 * 累计婴幼儿照护费用
+	 * 累计3岁以下婴幼儿照护
 	 */
-	@ExcelAttribute(name = "累计婴幼儿照护费用")
+	@ExcelAttribute(name = "累计3岁以下婴幼儿照护")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("累计婴幼儿照护费用")
+	@ExcelProperty("累计3岁以下婴幼儿照护")
 	private BigDecimal sumBabyMoney;
 
 	@ExcelAttribute(name = "累计个人养老金", isFloat = true,max = "999999999.99")

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

@@ -267,11 +267,11 @@ public class TStatisticsTaxSalary {
 	@ExcelProperty("专项汇总")
 	private BigDecimal specialDeduMoney;
 	/**
-	 * 累计婴幼儿照护费用
+	 * 累计3岁以下婴幼儿照护
 	 */
-	@ExcelAttribute(name = "累计婴幼儿照护费用")
+	@ExcelAttribute(name = "累计3岁以下婴幼儿照护")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("累计婴幼儿照护费用")
+	@ExcelProperty("累计3岁以下婴幼儿照护")
 	private BigDecimal sumBabyMoney;
 	/**
 	 * 是否当月新增人员

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSpecialDeducationSumVo.java

@@ -213,12 +213,12 @@ public class TSpecialDeducationSumVo extends RowIndex implements Serializable {
 	@ExcelProperty("累计继续教育")
 	private BigDecimal sumContinuingEducationMoney;
 	/**
-	 * 累计婴幼儿照护费用
+	 * 累计3岁以下婴幼儿照护
 	 */
-	@ExcelAttribute(name = "累计婴幼儿照护费用")
-	@Schema(description = "累计婴幼儿照护费用")
+	@ExcelAttribute(name = "累计3岁以下婴幼儿照护")
+	@Schema(description = "累计3岁以下婴幼儿照护")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("累计婴幼儿照护费用")
+	@ExcelProperty("累计3岁以下婴幼儿照护")
 	private BigDecimal sumBabyMoney;
 	/**
 	 * 企业(职业)年金

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsCurrentReportVo.java

@@ -298,12 +298,12 @@ public class TStatisticsCurrentReportVo extends RowIndex implements Serializable
 	@ExcelProperty("专项汇总")
 	private BigDecimal specialDeduMoney;
 	/**
-	 * 累计婴幼儿照护费用
+	 * 累计3岁以下婴幼儿照护
 	 */
-	@ExcelAttribute(name = "累计婴幼儿照护费用")
-	@Schema(description = "累计婴幼儿照护费用")
+	@ExcelAttribute(name = "累计3岁以下婴幼儿照护")
+	@Schema(description = "累计3岁以下婴幼儿照护")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("累计婴幼儿照护费用")
+	@ExcelProperty("累计3岁以下婴幼儿照护")
 	private BigDecimal sumBabyMoney;
 
 }

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsTaxSalaryVo.java

@@ -298,12 +298,12 @@ public class TStatisticsTaxSalaryVo extends RowIndex implements Serializable {
 	@ExcelProperty("专项汇总")
 	private BigDecimal specialDeduMoney;
 	/**
-	 * 累计婴幼儿照护费用
+	 * 累计3岁以下婴幼儿照护
 	 */
-	@ExcelAttribute(name = "累计婴幼儿照护费用")
-	@Schema(description = "累计婴幼儿照护费用")
+	@ExcelAttribute(name = "累计3岁以下婴幼儿照护")
+	@Schema(description = "累计3岁以下婴幼儿照护")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("累计婴幼儿照护费用")
+	@ExcelProperty("累计3岁以下婴幼儿照护")
 	private BigDecimal sumBabyMoney;
 
 }

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

@@ -683,7 +683,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 					sdSum = sdSum.add(this.saveNewItems(saiList, SalaryConstants.SUM_CONTINUING_EDUCATION_MONEY,
 							SalaryConstants.SUM_CONTINUING_EDUCATION_MONEY_JAVA, sds.getSumContinuingEducationMoney(), CommonConstants.ZERO_INT));
 					a.setSumContinuingEducationMoney(sds.getSumContinuingEducationMoney());
-					//累计婴幼儿照护费用
+					//累计3岁以下婴幼儿照护
 					sdSum = sdSum.add(this.saveNewItems(saiList, SalaryConstants.SUM_BABY_MONEY,
 							SalaryConstants.SUM_BABY_MONEY_JAVA, sds.getSumBabyMoney(), CommonConstants.ZERO_INT));
 					a.setSumBabyMoney(sds.getSumBabyMoney());

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

@@ -128,8 +128,8 @@ public class SalaryConstants {
      //累计继续教育
      public static final String SUM_CONTINUING_EDUCATION_MONEY_JAVA = "sumContinuingEducationMoney";
 
-     //累计婴幼儿照护费用
-     public static final String SUM_BABY_MONEY = "累计婴幼儿照护费用";
+     //累计3岁以下婴幼儿照护
+     public static final String SUM_BABY_MONEY = "累计3岁以下婴幼儿照护";
      public static final String SUM_BABY_MONEY_JAVA = "sumBabyMoney";
 	 //累计个人养老金
 	 public static final String SUM_PRIVATE_PENSION = "累计个人养老金";