项目基本信息推送

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

@@ -208,6 +208,42 @@ public class TSalaryStandard extends BaseEntity {
 	@ExcelAttribute(name = "自有员工应发总额")
 	@ExcelProperty("自有员工应发总额")
 	private BigDecimal ownMoney;
+	/**
+	 * 发薪特殊值人数，默认0
+	 */
+	@ExcelAttribute(name = "发薪特殊值人数，默认0")
+	@ExcelProperty("发薪特殊值人数，默认0")
+	private Integer specialNums;
+	/**
+	 * 发薪特殊值应发总额
+	 */
+	@ExcelAttribute(name = "发薪特殊值应发总额")
+	@ExcelProperty("发薪特殊值应发总额")
+	private BigDecimal specialMoney;
+	/**
+	 * 薪资员工发放稿酬/劳务费人数，默认0
+	 */
+	@ExcelAttribute(name = "薪资员工发放稿酬/劳务费人数，默认0")
+	@ExcelProperty("薪资员工发放稿酬/劳务费人数，默认0")
+	private Integer salaryNums;
+	/**
+	 * 薪资员工发放稿酬/劳务费总额
+	 */
+	@ExcelAttribute(name = "薪资员工发放稿酬/劳务费总额")
+	@ExcelProperty("薪资员工发放稿酬/劳务费总额")
+	private BigDecimal salaryMoney;
+	/**
+	 * 本月是否重复金额人数，默认0
+	 */
+	@ExcelAttribute(name = "本月是否重复金额人数，默认0")
+	@ExcelProperty("本月是否重复金额人数，默认0")
+	private Integer repeatNums;
+	/**
+	 * 本月是否重复金额总额
+	 */
+	@ExcelAttribute(name = "本月是否重复金额总额")
+	@ExcelProperty("本月是否重复金额总额")
+	private BigDecimal repeatMoney;
 	/**
 	 * 自有员工强行提交的备注
 	 */

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

@@ -1543,6 +1543,19 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		int ownNum = 0;
 		// 自有员工应发金额
 		BigDecimal ownMoney = BigDecimal.ZERO;
+		// 发薪特殊值人数
+		int specialNums = 0;
+		// 发薪特殊值应发总额
+		BigDecimal specialMoney = BigDecimal.ZERO;
+		// 薪资员工发放稿酬/劳务费人数
+		int salaryNums = 0;
+		// 薪资员工发放稿酬/劳务费总额
+		BigDecimal salaryMoney = BigDecimal.ZERO;
+		// 本月是否重复金额人数
+		int repeatNums = 0;
+		// 本月是否重复金额总额
+		BigDecimal repeatMoney = BigDecimal.ZERO;
+
 		BigDecimal relaySalary;  //工资应发
 		// 劳务费、稿酬是否含有发薪false：否；true：是
 		boolean haveSalaryFlag = false;
@@ -1599,6 +1612,24 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 					ownMoney = ownMoney.add(relaySalary);
 				}
 
+				// 发薪特殊值人数以及应发金额
+				if (Common.isNotNull(a.getHaveSpecialFlag()) && a.getHaveSpecialFlag() == 1) {
+					specialNums++;
+					specialMoney = specialMoney.add(relaySalary);
+				}
+
+				// 薪资员工发放稿酬/劳务费人数以及应发金额
+				if (Common.isNotNull(a.getHaveSalaryFlag()) && a.getHaveSalaryFlag() == 1) {
+					salaryNums++;
+					salaryMoney = salaryMoney.add(relaySalary);
+				}
+
+				// 本月是否重复金额人数以及应发金额
+				if (Common.isNotNull(a.getIsRepeat()) && a.getIsRepeat() == 1) {
+					repeatNums++;
+					repeatMoney = repeatMoney.add(relaySalary);
+				}
+
 				//累计扣税list
 				asList = this.getLaborAsList(itemMap.get(a.getEmpIdcard()), a.getSettlementMonth());
 

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

@@ -63,7 +63,13 @@
     <result property="unitName" column="UNIT_NAME"/>
     <result property="sendTime" column="SEND_TIME"/>
     <result property="sendMonth" column="SEND_MONTH"/>
-	  <result property="invoiceTitle" column="INVOICE_TITLE"/>
+    <result property="invoiceTitle" column="INVOICE_TITLE"/>
+    <result property="specialNums" column="SPECIAL_NUMS"/>
+    <result property="specialMoney" column="SPECIAL_MONEY"/>
+    <result property="salaryNums" column="SALARY_NUMS"/>
+    <result property="salaryMoney" column="SALARY_MONEY"/>
+    <result property="repeatMoney" column="REPEAT_MONEY"/>
+    <result property="repeatNums" column="REPEAT_NUMS"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -106,6 +112,12 @@
                 a.UNIT_NO,
                 a.SEND_TIME,
                 a.SEND_MONTH,
+                a.SPECIAL_NUMS,
+                a.SPECIAL_MONEY,
+                a.SALARY_NUMS,
+                a.SALARY_MONEY,
+                a.REPEAT_MONEY,
+                a.REPEAT_NUMS,
 				a.INVOICE_TITLE
     </sql>
     <sql id="tSalaryStandard_where">
@@ -182,6 +194,24 @@
                     <if test="tSalaryStandard.ownMoney != null">
                         AND a.OWN_MONEY = #{tSalaryStandard.ownMoney}
                     </if>
+			<if test="tSalaryStandard.specialNums != null">
+				AND a.SPECIAL_NUMS = #{tSalaryStandard.specialNums}
+			</if>
+			<if test="tSalaryStandard.specialMoney != null">
+				AND a.SPECIAL_MONEY = #{tSalaryStandard.specialMoney}
+			</if>
+			<if test="tSalaryStandard.salaryNums != null">
+				AND a.SALARY_NUMS = #{tSalaryStandard.salaryNums}
+			</if>
+			<if test="tSalaryStandard.salaryMoney != null">
+				AND a.SALARY_MONEY = #{tSalaryStandard.salaryMoney}
+			</if>
+			<if test="tSalaryStandard.repeatMoney != null">
+				AND a.REPEAT_MONEY = #{tSalaryStandard.repeatMoney}
+			</if>
+			<if test="tSalaryStandard.repeatNums != null">
+				AND a.REPEAT_NUMS = #{tSalaryStandard.repeatNums}
+			</if>
                     <if test="tSalaryStandard.ownRemark != null and tSalaryStandard.ownRemark.trim() != ''">
                         AND a.OWN_REMARK = #{tSalaryStandard.ownRemark}
                     </if>