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

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

@@ -106,4 +106,15 @@ public class TSalaryAccountExportVo {
 	private BigDecimal costReduction;
 	@ExcelProperty("表单上传人")
 	private String createName;
+
+	@ExcelProperty("个人代扣明细")
+	private String pdeductionDetail;
+	@ExcelProperty("个人代扣金额")
+	private String pdeductionMoney;
+	/**
+	 * 支出信息结算状态 0 已结算 1 结算中 2 未结算
+	 */
+	@Schema(description = "支出信息结算状态")
+	private String paySettleFlag;
+
 }

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

@@ -802,16 +802,20 @@
 			a.SUM_PRIVATE_PENSION as sumPrivatePension,
 			a.SUM_SUPPORT_ELDERLY_MONEY as sumSupportElderlyMoney,
 			a.COST_REDUCTION as costReduction,
-			a.CREATE_NAME as createName
+			a.CREATE_NAME as createName,
+			GROUP_CONCAT(pdeduction.CN_NAME,':',pdeduction.SALARY_MONEY,';') pdeductionDetail,
+			sum(ifnull(pdeduction.SALARY_MONEY,0)) pdeductionMoney,
+			if(a.PAY_SETTLE_FLAG = '0','已结算',if(a.PAY_SETTLE_FLAG = '1','结算中',if(a.PAY_SETTLE_FLAG = '2','未结算','-'))) paySettleFlag
 		from
 		t_salary_account a
 		left join t_salary_account_item annualBonus on annualBonus.SALARY_ACCOUNT_ID = a.id and annualBonus.JAVA_FIED_NAME = 'annualBonus'
 		left join t_salary_account_item exemptionPersionTax on exemptionPersionTax.SALARY_ACCOUNT_ID = a.id and exemptionPersionTax.JAVA_FIED_NAME='exemptionPersionTax'
 		left join t_salary_account_item enterpriseAnnuity on enterpriseAnnuity.SALARY_ACCOUNT_ID = a.id and enterpriseAnnuity.JAVA_FIED_NAME='enterpriseAnnuity'
+		left join t_salary_account_item pdeduction on pdeduction.SALARY_ACCOUNT_ID = a.id and pdeduction.JAVA_FIED_NAME='pdeduction'
 		<where>
 			a.DELETE_FLAG = 0
 			<include refid="where_export"/>
-			ORDER BY a.CREATE_TIME desc
+			GROUP BY a.EMP_IDCARD ORDER BY a.CREATE_TIME desc
 			<if test="searchVo != null">
 				<if test="searchVo.limitStart != null">
 					limit #{searchVo.limitStart},#{searchVo.limitEnd}