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

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoNewExportVo.java

@@ -333,6 +333,106 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("个人大病金额")
 	private BigDecimal personalBigmailmentMoney;
+
+	/**
+	 * 养老保险合计
+	 */
+	@ExcelAttribute(name = "养老保险合计")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("养老保险合计")
+	private BigDecimal pensionMoneySum;
+	/**
+	 * 医疗保险合计
+	 */
+	@ExcelAttribute(name = "医疗保险合计")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医疗保险合计")
+	private BigDecimal medicalMoneySum;
+	/**
+	 * 失业保险合计
+	 */
+	@ExcelAttribute(name = "失业保险合计")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("失业保险合计")
+	private BigDecimal unemploymentMoneySum;
+	/**
+	 * 工伤保险合计
+	 */
+	@ExcelAttribute(name = "工伤保险合计")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("工伤保险合计")
+	private BigDecimal injuryMoneySum;
+	/**
+	 * 生育保险合计
+	 */
+	@ExcelAttribute(name = "生育保险合计")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生育保险合计")
+	private BigDecimal birthMoneySum;
+	/**
+	 * 大病保险合计
+	 */
+	@ExcelAttribute(name = "大病保险合计")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("大病保险合计")
+	private BigDecimal bigmailmentMoneySum;
+	/**
+	 * 养老单位比例
+	 */
+	@ExcelAttribute(name = "养老单位比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("养老单位比例")
+	private BigDecimal unitPensionPer;
+	/**
+	 * 医疗单位比例
+	 */
+	@ExcelAttribute(name = "医疗单位比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医疗单位比例")
+	private BigDecimal unitMedicalPer;
+	/**
+	 * 失业单位比例
+	 */
+	@ExcelAttribute(name = "失业单位比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("失业单位比例")
+	private BigDecimal unitUnemploymentPer;
+	/**
+	 * 工伤单位比例
+	 */
+	@ExcelAttribute(name = "工伤单位比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("工伤单位比例")
+	private BigDecimal unitInjuryPer;
+	/**
+	 * 生育单位比例
+	 */
+	@ExcelAttribute(name = "生育单位比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生育单位比例")
+	private BigDecimal unitBirthPer;
+	/**
+	 * 养老个人比例
+	 */
+	@ExcelAttribute(name = "养老个人比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("养老个人比例")
+	private BigDecimal personalPensionPer;
+	/**
+	 * 个人医疗比例
+	 */
+	@ExcelAttribute(name = "医疗个人比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医疗个人比例")
+	private BigDecimal personalMedicalPer;
+	/**
+	 * 失业个人比例
+	 */
+	@ExcelAttribute(name = "失业个人比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("失业个人比例")
+	private BigDecimal personalUnemploymentPer;
+
 	/**
 	 * 公积金编号
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoNewVo.java

@@ -411,4 +411,62 @@ public class TPaymentInfoNewVo extends RowIndex implements Serializable {
 	@Schema(description = "二级指标归属")
 	private String secondIndicatorBelong ;
 
+	/**
+	 * 养老单位比例
+	 */
+	@ExcelAttribute(name = "养老单位比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("养老单位比例")
+	private BigDecimal unitPensionPer;
+	/**
+	 * 医疗单位比例
+	 */
+	@ExcelAttribute(name = "医疗单位比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医疗单位比例")
+	private BigDecimal unitMedicalPer;
+	/**
+	 * 失业单位比例
+	 */
+	@ExcelAttribute(name = "失业单位比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("失业单位比例")
+	private BigDecimal unitUnemploymentPer;
+	/**
+	 * 工伤单位比例
+	 */
+	@ExcelAttribute(name = "工伤单位比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("工伤单位比例")
+	private BigDecimal unitInjuryPer;
+	/**
+	 * 生育单位比例
+	 */
+	@ExcelAttribute(name = "生育单位比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生育单位比例")
+	private BigDecimal unitBirthPer;
+	/**
+	 * 养老个人比例
+	 */
+	@ExcelAttribute(name = "养老个人比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("养老个人比例")
+	private BigDecimal personalPensionPer;
+	/**
+	 * 个人医疗比例
+	 */
+	@ExcelAttribute(name = "医疗个人比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("医疗个人比例")
+	private BigDecimal personalMedicalPer;
+	/**
+	 * 失业个人比例
+	 */
+	@ExcelAttribute(name = "失业个人比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("失业个人比例")
+	private BigDecimal personalUnemploymentPer;
+
+
 }

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -302,6 +302,14 @@
 		<result property="socialFundPersonalSum" column="SOCIAL_FUND_PERSONAL_SUM"/>
 		<result property="keyGroup" column="keyGroup"/>
 		<result property="secondIndicatorBelong" column="SECOND_INDICATOR_BELONG"/>
+		<result property="unitPensionPer" column="UNIT_PENSION_PER"/>
+		<result property="unitMedicalPer" column="UNIT_MEDICAL_PER"/>
+		<result property="unitUnemploymentPer" column="UNIT_UNEMPLOYMENT_PER"/>
+		<result property="unitInjuryPer" column="UNIT_INJURY_PER"/>
+		<result property="unitBirthPer" column="UNIT_BIRTH_PER"/>
+		<result property="personalPensionPer" column="PERSONAL_PENSION_PER"/>
+		<result property="personalMedicalPer" column="PERSONAL_MEDICAL_PER"/>
+		<result property="personalUnemploymentPer" column="PERSONAL_UNEMPLOYMENT_PER"/>
 	</resultMap>
 
 	<resultMap id="tPaymentInfoNewExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoNewExportVo">
@@ -351,6 +359,20 @@
 		<result property="personalProvidentSum" column="PERSONAL_PROVIDENT_SUM"/>
 		<result property="keyGroup" column="keyGroup"/>
 		<result property="secondIndicatorBelong" column="SECOND_INDICATOR_BELONG"/>
+		<result property="unitPensionPer" column="UNIT_PENSION_PER"/>
+		<result property="unitMedicalPer" column="UNIT_MEDICAL_PER"/>
+		<result property="unitUnemploymentPer" column="UNIT_UNEMPLOYMENT_PER"/>
+		<result property="unitInjuryPer" column="UNIT_INJURY_PER"/>
+		<result property="unitBirthPer" column="UNIT_BIRTH_PER"/>
+		<result property="personalPensionPer" column="PERSONAL_PENSION_PER"/>
+		<result property="personalMedicalPer" column="PERSONAL_MEDICAL_PER"/>
+		<result property="personalUnemploymentPer" column="PERSONAL_UNEMPLOYMENT_PER"/>
+		<result property="pensionMoneySum" column="PENSION_MONEY_SUM"/>
+		<result property="medicalMoneySum" column="MEDICAL_MONEY_SUM"/>
+		<result property="unemploymentMoneySum" column="UNEMPLOYMENT_MONEY_SUM"/>
+		<result property="injuryMoneySum" column="INJURY_MONEY_SUM"/>
+		<result property="birthMoneySum" column="BIRTH_MONEY_SUM"/>
+		<result property="bigmailmentMoneySum" column="BIGMAILMENT_MONEY_SUM"/>
 	</resultMap>
 	<sql id="Base_Column_List">
 		a.ID,
@@ -1302,7 +1324,15 @@
 		k.PROVIDENT_PERCENT,
 		k.SOCIAL_FUND_PERSONAL_SUM,
 		k.UNIT_SOCIAL_FUND_SUM,
-		k.UNIT_PROVIDENT_SUM
+		k.UNIT_PROVIDENT_SUM,
+		k.UNIT_PENSION_PER,
+		k.UNIT_MEDICAL_PER,
+		k.UNIT_UNEMPLOYMENT_PER,
+		k.UNIT_INJURY_PER,
+		k.UNIT_BIRTH_PER,
+		k.PERSONAL_PENSION_PER,
+		k.PERSONAL_MEDICAL_PER,
+		k.PERSONAL_UNEMPLOYMENT_PER
 		from (
 		select
 		w.keyGroup,
@@ -1352,7 +1382,15 @@
 		SUM( w.PROVIDENT_PERCENT ) AS PROVIDENT_PERCENT,
 		ifnull(SUM( w.SOCIAL_SECURITY_PERSONAL_SUM ),0) + ifnull(SUM( w.PERSONAL_PROVIDENT_SUM ),0) AS SOCIAL_FUND_PERSONAL_SUM,
 		ifnull(SUM( w.UNIT_SOCIAL_SUM ),0) + ifnull(SUM( w.UNIT_PROVIDENT_SUM ),0) AS UNIT_SOCIAL_FUND_SUM,
-		SUM( w.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM
+		SUM( w.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM,
+		w.UNIT_PENSION_PER,
+		w.UNIT_MEDICAL_PER,
+		w.UNIT_UNEMPLOYMENT_PER,
+		w.UNIT_INJURY_PER,
+		w.UNIT_BIRTH_PER,
+		w.PERSONAL_PENSION_PER,
+		w.PERSONAL_MEDICAL_PER,
+		w.PERSONAL_UNEMPLOYMENT_PER
 		FROM (
 		(SELECT
 		CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
@@ -1400,7 +1438,15 @@
 		a.UNIT_PROVIDENT_SET,
 		a.PROVIDENT_PERCENT,
 		a.PERSONAL_PROIDENT_SET,
-		a.UNIT_PROVIDENT_SUM
+		a.UNIT_PROVIDENT_SUM,
+		if(null = a.UNIT_PENSION_MONEY,'',round(a.UNIT_PENSION_MONEY/UNIT_PENSION_SET,4)) as UNIT_PENSION_PER,
+		if(null = a.UNIT_MEDICAL_MONEY,'',round(a.UNIT_MEDICAL_MONEY/UNIT_MEDICAL_SET,4)) as UNIT_MEDICAL_PER,
+		if(null = a.UNIT_UNEMPLOYMENT_MONEY,'',round(a.UNIT_UNEMPLOYMENT_MONEY/UNIT_UNEMPLOYMENT_SET,4)) as UNIT_UNEMPLOYMENT_PER,
+		if(null = a.UNIT_INJURY_MONEY,'',round(a.UNIT_INJURY_MONEY/UNIT_INJURY_SET,4)) as UNIT_INJURY_PER,
+		if(null = a.UNIT_BIRTH_MONEY,'',round(a.UNIT_BIRTH_MONEY/UNIT_BIRTH_SET,4)) as UNIT_BIRTH_PER,
+		if(null = a.PERSONAL_PENSION_MONEY,'',round(a.PERSONAL_PENSION_MONEY/UNIT_PENSION_SET,4)) as PERSONAL_PENSION_PER,
+		if(null = a.PERSONAL_MEDICAL_MONEY,'',round(a.PERSONAL_MEDICAL_MONEY/UNIT_MEDICAL_SET,4)) as PERSONAL_MEDICAL_PER,
+		if(null = a.PERSONAL_UNEMPLOYMENT_MONEY,'',round(a.PERSONAL_UNEMPLOYMENT_MONEY/UNIT_UNEMPLOYMENT_SET,4)) as PERSONAL_UNEMPLOYMENT_PER
 		FROM t_payment_info a
 		<where>
 			IFNULL(a.SOCIAL_ID,'1') != '1'
@@ -1455,7 +1501,15 @@
 		a.UNIT_PROVIDENT_SET,
 		a.PROVIDENT_PERCENT,
 		a.PERSONAL_PROIDENT_SET,
-		SUM( a.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM
+		SUM( a.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM,
+	    '' as UNIT_PENSION_PER,
+		'' as UNIT_MEDICAL_PER,
+		'' as UNIT_UNEMPLOYMENT_PER,
+		'' as UNIT_INJURY_PER,
+		'' as UNIT_BIRTH_PER,
+		'' as PERSONAL_PENSION_PER,
+		'' as PERSONAL_MEDICAL_PER,
+		'' as PERSONAL_UNEMPLOYMENT_PER
 		FROM t_payment_info a
 		<where>
 			IFNULL(a.FUND_ID,'1') != '1'
@@ -1554,6 +1608,20 @@
 		c.PERSONAL_MEDICAL_MONEY,
 		c.PERSONAL_UNEMPLOYMENT_MONEY,
 		c.PERSONAL_BIGMAILMENT_MONEY,
+		c.PENSION_MONEY_SUM,
+		c.MEDICAL_MONEY_SUM,
+		c.UNEMPLOYMENT_MONEY_SUM,
+		c.INJURY_MONEY_SUM,
+		c.BIRTH_MONEY_SUM,
+		c.BIGMAILMENT_MONEY_SUM,
+		c.UNIT_PENSION_PER,
+		c.UNIT_MEDICAL_PER,
+		c.UNIT_UNEMPLOYMENT_PER,
+		c.UNIT_INJURY_PER,
+		c.UNIT_BIRTH_PER,
+		c.PERSONAL_PENSION_PER,
+		c.PERSONAL_MEDICAL_PER,
+		c.PERSONAL_UNEMPLOYMENT_PER,
 		c.PROVIDENT_NO AS PROVIDENT_NO,
 		c.PERSONAL_PROIDENT_SET,
 		c.UNIT_PROVIDENT_SET,
@@ -1602,6 +1670,20 @@
 		w.PERSONAL_MEDICAL_MONEY,
 		w.PERSONAL_UNEMPLOYMENT_MONEY,
 		w.PERSONAL_BIGMAILMENT_MONEY,
+		w.PENSION_MONEY_SUM,
+		w.MEDICAL_MONEY_SUM,
+		w.UNEMPLOYMENT_MONEY_SUM,
+		w.INJURY_MONEY_SUM,
+		w.BIRTH_MONEY_SUM,
+		w.BIGMAILMENT_MONEY_SUM,
+		w.UNIT_PENSION_PER,
+		w.UNIT_MEDICAL_PER,
+		w.UNIT_UNEMPLOYMENT_PER,
+		w.UNIT_INJURY_PER,
+		w.UNIT_BIRTH_PER,
+		w.PERSONAL_PENSION_PER,
+		w.PERSONAL_MEDICAL_PER,
+		w.PERSONAL_UNEMPLOYMENT_PER,
 		MAX( w.PROVIDENT_NO ) AS PROVIDENT_NO,
 		MAX( w.PERSONAL_PROIDENT_SET ) AS PERSONAL_PROIDENT_SET,
 		SUM( w.UNIT_PROVIDENT_SET ) AS UNIT_PROVIDENT_SET,
@@ -1650,6 +1732,20 @@
 		SUM( a.PERSONAL_MEDICAL_MONEY ) AS PERSONAL_MEDICAL_MONEY,
 		SUM( a.PERSONAL_UNEMPLOYMENT_MONEY ) AS PERSONAL_UNEMPLOYMENT_MONEY,
 		SUM( a.PERSONAL_BIGMAILMENT_MONEY ) AS PERSONAL_BIGMAILMENT_MONEY,
+		SUM( a.UNIT_PENSION_MONEY + a.PERSONAL_PENSION_MONEY) as PENSION_MONEY_SUM,
+		SUM( a.UNIT_MEDICAL_MONEY + a.PERSONAL_MEDICAL_MONEY) as MEDICAL_MONEY_SUM,
+		SUM( a.UNIT_UNEMPLOYMENT_MONEY + a.PERSONAL_UNEMPLOYMENT_MONEY) as UNEMPLOYMENT_MONEY_SUM,
+		SUM( a.UNIT_INJURY_MONEY) as INJURY_MONEY_SUM,
+		SUM( a.UNIT_BIRTH_MONEY) as BIRTH_MONEY_SUM,
+		SUM( a.UNIT_BIGMAILMENT_MONEY + a.PERSONAL_BIGMAILMENT_MONEY) as BIGMAILMENT_MONEY_SUM,
+		if(null = a.UNIT_PENSION_MONEY,'',round(a.UNIT_PENSION_MONEY/UNIT_PENSION_SET,4)) as UNIT_PENSION_PER,
+		if(null = a.UNIT_MEDICAL_MONEY,'',round(a.UNIT_MEDICAL_MONEY/UNIT_MEDICAL_SET,4)) as UNIT_MEDICAL_PER,
+		if(null = a.UNIT_UNEMPLOYMENT_MONEY,'',round(a.UNIT_UNEMPLOYMENT_MONEY/UNIT_UNEMPLOYMENT_SET,4)) as UNIT_UNEMPLOYMENT_PER,
+		if(null = a.UNIT_INJURY_MONEY,'',round(a.UNIT_INJURY_MONEY/UNIT_INJURY_SET,4)) as UNIT_INJURY_PER,
+		if(null = a.UNIT_BIRTH_MONEY,'',round(a.UNIT_BIRTH_MONEY/UNIT_BIRTH_SET,4)) as UNIT_BIRTH_PER,
+		if(null = a.PERSONAL_PENSION_MONEY,'',round(a.PERSONAL_PENSION_MONEY/UNIT_PENSION_SET,4)) as PERSONAL_PENSION_PER,
+		if(null = a.PERSONAL_MEDICAL_MONEY,'',round(a.PERSONAL_MEDICAL_MONEY/UNIT_MEDICAL_SET,4)) as PERSONAL_MEDICAL_PER,
+		if(null = a.PERSONAL_UNEMPLOYMENT_MONEY,'',round(a.PERSONAL_UNEMPLOYMENT_MONEY/UNIT_UNEMPLOYMENT_SET,4)) as PERSONAL_UNEMPLOYMENT_PER,
 		a.PROVIDENT_NO,
 		a.UNIT_PROVIDENT_SET,
 		a.PROVIDENT_PERCENT,
@@ -1705,6 +1801,20 @@
 		a.PERSONAL_MEDICAL_MONEY,
 		a.PERSONAL_UNEMPLOYMENT_MONEY,
 		a.PERSONAL_BIGMAILMENT_MONEY,
+		'' as PENSION_MONEY_SUM,
+		'' as MEDICAL_MONEY_SUM,
+		'' as UNEMPLOYMENT_MONEY_SUM,
+		'' as INJURY_MONEY_SUM,
+		'' as BIRTH_MONEY_SUM,
+		'' as BIGMAILMENT_MONEY_SUM,
+		'' as UNIT_PENSION_PER,
+		'' as UNIT_MEDICAL_PER,
+		'' as UNIT_UNEMPLOYMENT_PER,
+		'' as UNIT_INJURY_PER,
+		'' as UNIT_BIRTH_PER,
+		'' as PERSONAL_PENSION_PER,
+		'' as PERSONAL_MEDICAL_PER,
+		'' as PERSONAL_UNEMPLOYMENT_PER,
 		a.PROVIDENT_NO,
 		a.UNIT_PROVIDENT_SET,
 		a.PROVIDENT_PERCENT,