Merge remote-tracking branch 'origin/develop' into develop

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

@@ -43,6 +43,15 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("员工姓名")
 	private String empName;
 
+	/**
+	 * 员工编码
+	 */
+	@ExcelAttribute(name = "员工编码" )
+	@Schema(description ="员工编码")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("员工编码")
+	private String empNo;
+
 	/**
 	 * 身份证号
 	 */
@@ -71,22 +80,13 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
 	private String settleDomainName;
 
 	/**
-	 * 生成月份
-	 */
-	@ExcelAttribute(name = "生成月份")
-	@Schema(description ="生成月份")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("生成月份")
-	private String socialCreateMonth;
-
-	/**
-	 * 缴纳月份
+	 * 项目编码
 	 */
-	@ExcelAttribute(name = "缴纳月份")
-	@Schema(description ="缴纳月份")
+	@ExcelAttribute(name = "项目编码", maxLength = 50)
+	@Schema(description = "项目编码" )
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("缴纳月份")
-	private String socialPayMonth;
+	@ExcelProperty("项目编码" )
+	private String settleDomainCode;
 
 	/**
 	 * 社保户
@@ -97,6 +97,15 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("社保户")
 	private String socialHousehold;
 
+	/**
+	 * 社保编号
+	 */
+	@ExcelAttribute(name = "社保编号" )
+	@Schema(description ="社保编号")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("社保编号")
+	private String socialSecurityNo;
+
 	/**
 	 * 社保缴纳地
 	 */
@@ -107,55 +116,58 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
 	private String socialPayAddr;
 
 	/**
-	 * 养老金额
-	 */
-	@ExcelAttribute(name = "养老金额")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("养老金额")
-	private BigDecimal pensionMoneySum;
-	/**
-	 * 医疗金额
+	 * 社保缴纳月份
 	 */
-	@ExcelAttribute(name = "医疗金额")
+	@ExcelAttribute(name = "社保缴纳月份")
+	@Schema(description ="社保缴纳月份")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("医疗金额")
-	private BigDecimal medicalMoneySum;
+	@ExcelProperty("社保缴纳月份")
+	private String socialPayMonth;
+
 	/**
-	 * 失业金额
+	 * 社保生成月份
 	 */
-	@ExcelAttribute(name = "失业金额")
+	@ExcelAttribute(name = "社保生成月份")
+	@Schema(description ="社保生成月份")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("失业金额")
-	private BigDecimal unemploymentMoneySum;
+	@ExcelProperty("社保生成月份")
+	private String socialCreateMonth;
+
 	/**
-	 * 工伤金额
+	 * 公积金缴纳月份
 	 */
-	@ExcelAttribute(name = "工伤金额")
+	@ExcelAttribute(name = "公积金缴纳月份")
+	@Schema(description ="公积金缴纳月份")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("工伤金额")
-	private BigDecimal unitInjuryMoney;
+	@ExcelProperty("公积金缴纳月份")
+	private String providentPayMonth;
+
 	/**
-	 * 单位生育金额
+	 * 公积金生成月份
 	 */
-	@ExcelAttribute(name = "生育金额")
+	@ExcelAttribute(name = "公积金生成月份")
+	@Schema(description ="公积金生成月份")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("生育金额")
-	private BigDecimal unitBirthMoney;
+	@ExcelProperty("公积金生成月份")
+	private String providentCreateMonth;
+
 	/**
-	 * 大病金额
+	 * 公积金户
 	 */
-	@ExcelAttribute(name = "大病金额")
+	@ExcelAttribute(name = "公积金户" )
+	@Schema(description ="公积金户")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("大病金额")
-	private BigDecimal bigmailmentMoneySum;
+	@ExcelProperty("公积金户")
+	private String providentHousehold;
+
 	/**
-	 * 补缴利息
+	 * 公积金缴纳地
 	 */
-	@ExcelAttribute(name = "补缴利息"  )
+	@ExcelAttribute(name = "公积金缴纳地" )
+	@Schema(description ="公积金缴纳地")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("补缴利息")
-	private BigDecimal accrualSum;
-
+	@ExcelProperty("公积金缴纳地")
+	private String providentPayAddr;
 
 	/**
 	 * 社保合计
@@ -167,30 +179,202 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
 	private BigDecimal socialSum;
 
 	/**
-	 * 公积金户
+	 * 单位社保合计
 	 */
-	@ExcelAttribute(name = "公积金户" )
-	@Schema(description ="公积金户")
+	@ExcelAttribute(name = "单位社保合计" )
+	@Schema(description ="单位社保合计")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("公积金户")
-	private String providentHousehold;
+	@ExcelProperty("单位社保合计")
+	private BigDecimal unitSocialSum;
 
 	/**
-	 * 公积金缴纳地
+	 * 个人社保合计
 	 */
-	@ExcelAttribute(name = "公积金缴纳地" )
-	@Schema(description ="公积金缴纳地")
+	@ExcelAttribute(name = "个人社保合计" )
+	@Schema(description ="个人社保合计")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("公积金缴纳地")
-	private String providentPayAddr;
+	@ExcelProperty("个人社保合计")
+	private BigDecimal socialSecurityPersonalSum;
+
+	/**
+	 * 就职班组
+	 */
+	@ExcelAttribute(name = "就职班组" )
+	@Schema(description ="就职班组")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("就职班组")
+	private String inauguralTeam;
+
+	/**
+	 * 单位社保补缴利息
+	 */
+	@ExcelAttribute(name = "单位社保补缴利息"  )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位社保补缴利息")
+	private BigDecimal companyAccrual;
+	/**
+	 * 个人社保补缴利息
+	 */
+	@ExcelAttribute(name = "个人社保补缴利息"  )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("个人社保补缴利息")
+	private BigDecimal personalAccrual;
+	/**
+	 * 单位养老基数
+	 */
+	@ExcelAttribute(name = "单位养老基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位养老基数")
+	private BigDecimal unitPensionSet;
+	/**
+	 * 单位医疗基数
+	 */
+	@ExcelAttribute(name = "单位医疗基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位医疗基数")
+	private BigDecimal unitMedicalSet;
+	/**
+	 * 单位失业基数
+	 */
+	@ExcelAttribute(name = "单位失业基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位失业基数")
+	private BigDecimal unitUnemploymentSet;
+	/**
+	 * 单位工伤基数
+	 */
+	@ExcelAttribute(name = "单位工伤基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位工伤基数")
+	private BigDecimal unitInjurySet;
+	/**
+	 * 单位生育基数
+	 */
+	@ExcelAttribute(name = "单位生育基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位生育基数")
+	private BigDecimal unitBirthSet;
+	/**
+	 * 单位养老金额
+	 */
+	@ExcelAttribute(name = "单位养老金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位养老金额")
+	private BigDecimal unitPensionMoney;
+	/**
+	 * 单位医疗金额
+	 */
+	@ExcelAttribute(name = "单位医疗金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位医疗金额")
+	private BigDecimal unitMedicalMoney;
+	/**
+	 * 单位失业金额
+	 */
+	@ExcelAttribute(name = "单位失业金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位失业金额")
+	private BigDecimal unitUnemploymentMoney;
+	/**
+	 * 单位工伤金额
+	 */
+	@ExcelAttribute(name = "单位工伤金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位工伤金额")
+	private BigDecimal unitInjuryMoney;
+	/**
+	 * 单位生育金额
+	 */
+	@ExcelAttribute(name = "单位生育金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位生育金额")
+	private BigDecimal unitBirthMoney;
+	/**
+	 * 单位大病金额
+	 */
+	@ExcelAttribute(name = "单位大病金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位大病金额")
+	private BigDecimal unitBigmailmentMoney;
+	/**
+	 * 个人养老金额
+	 */
+	@ExcelAttribute(name = "个人养老金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("个人养老金额")
+	private BigDecimal personalPensionMoney;
+	/**
+	 * 个人医疗金额
+	 */
+	@ExcelAttribute(name = "个人医疗金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("个人医疗金额")
+	private BigDecimal personalMedicalMoney;
+	/**
+	 * 个人失业金额
+	 */
+	@ExcelAttribute(name = "个人失业金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("个人失业金额")
+	private BigDecimal personalUnemploymentMoney;
+	/**
+	 * 个人大病金额
+	 */
+	@ExcelAttribute(name = "个人大病金额")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("个人大病金额")
+	private BigDecimal personalBigmailmentMoney;
+	/**
+	 * 公积金编号
+	 */
+	@ExcelAttribute(name = "公积金编号")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("公积金编号")
+	private String providentNo;
+	/**
+	 * 单位公积金基数
+	 */
+	@ExcelAttribute(name = "单位公积金基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位公积金基数")
+	private BigDecimal unitProvidentSet;
+	/**
+	 * 单位公积金比例
+	 */
+	@ExcelAttribute(name = "单位公积金比例")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位公积金比例")
+	private BigDecimal providentPercent;
+	/**
+	 * 单位公积金费用
+	 */
+	@ExcelAttribute(name = "单位公积金费用")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("单位公积金费用")
+	private BigDecimal unitProvidentSum;
+	/**
+	 * 个人公积金基数
+	 */
+	@ExcelAttribute(name = "个人公积金基数")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("个人公积金基数")
+	private BigDecimal personalProidentSet;
+	/**
+	 * 个人公积金费用
+	 */
+	@ExcelAttribute(name = "个人公积金费用")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("个人公积金费用")
+	private BigDecimal personalProvidentSum;
+
 
 	/**
-	 * 公积金合计
+	 * 公积金总合计
 	 */
-	@ExcelAttribute(name = "公积金合计" )
-	@Schema(description ="公积金合计")
+	@ExcelAttribute(name = "公积金总合计" )
+	@Schema(description ="公积金总合计")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("公积金合计")
+	@ExcelProperty("公积金总合计")
 	private BigDecimal providentSum;
 
 	/**

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

@@ -304,25 +304,49 @@
 
 	<resultMap id="tPaymentInfoNewExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoNewExportVo">
 		<result property="empName" column="EMP_NAME"/>
+		<result property="empNo" column="EMP_NO"/>
 		<result property="empIdcard" column="EMP_IDCARD"/>
 		<result property="unitName" column="UNIT_NAME"/>
 		<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
+		<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
 		<result property="socialHousehold" column="SOCIAL_HOUSEHOLD"/>
+		<result property="socialSecurityNo" column="SOCIAL_SECURITY_NO"/>
 		<result property="socialPayAddr" column="SOCIAL_PAY_ADDR"/>
 		<result property="socialPayMonth" column="SOCIAL_PAY_MONTH"/>
 		<result property="socialCreateMonth" column="SOCIAL_CREATE_MONTH"/>
 		<result property="sumAll" column="SUM_ALL"/>
+		<result property="providentPayMonth" column="PROVIDENT_PAY_MONTH"/>
+		<result property="providentCreateMonth" column="PROVIDENT_CREATE_MONTH"/>
 		<result property="providentHousehold" column="PROVIDENT_HOUSEHOLD"/>
 		<result property="providentPayAddr" column="PROVIDENT_PAY_ADDR"/>
 		<result property="socialSum" column="SOCIAL_SUM"/>
+		<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
+		<result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/>
 		<result property="providentSum" column="PROVIDENT_SUM"/>
-		<result property="pensionMoneySum" column="PENSION_MONEY_SUM"/>
-		<result property="medicalMoneySum" column="MEDICAL_MONEY_SUM"/>
-		<result property="unemploymentMoneySum" column="UNEMPLOYMENT_MONEY_SUM"/>
+		<result property="inauguralTeam" column="INAUGURAL_TEAM"/>
+		<result property="companyAccrual" column="COMPANY_ACCRUAL"/>
+		<result property="personalAccrual" column="PERSONAL_ACCRUAL"/>
+		<result property="unitPensionSet" column="UNIT_PENSION_SET"/>
+		<result property="unitMedicalSet" column="UNIT_MEDICAL_SET"/>
+		<result property="unitUnemploymentSet" column="UNIT_UNEMPLOYMENT_SET"/>
+		<result property="unitInjurySet" column="UNIT_INJURY_SET"/>
+		<result property="unitBirthSet" column="UNIT_BIRTH_SET"/>
+		<result property="unitPensionMoney" column="UNIT_PENSION_MONEY"/>
+		<result property="unitMedicalMoney" column="UNIT_MEDICAL_MONEY"/>
+		<result property="unitUnemploymentMoney" column="UNIT_UNEMPLOYMENT_MONEY"/>
 		<result property="unitInjuryMoney" column="UNIT_INJURY_MONEY"/>
 		<result property="unitBirthMoney" column="UNIT_BIRTH_MONEY"/>
-		<result property="bigmailmentMoneySum" column="BIGMAILMENT_MONEY_SUM"/>
-		<result property="accrualSum" column="ACCRUAL_SUM"/>
+		<result property="unitBigmailmentMoney" column="UNIT_BIGMAILMENT_MONEY"/>
+		<result property="personalPensionMoney" column="PERSONAL_PENSION_MONEY"/>
+		<result property="personalMedicalMoney" column="PERSONAL_MEDICAL_MONEY"/>
+		<result property="personalUnemploymentMoney" column="PERSONAL_UNEMPLOYMENT_MONEY"/>
+		<result property="personalBigmailmentMoney" column="PERSONAL_BIGMAILMENT_MONEY"/>
+		<result property="providentNo" column="PROVIDENT_NO"/>
+		<result property="unitProvidentSet" column="UNIT_PROVIDENT_SET"/>
+		<result property="providentPercent" column="PROVIDENT_PERCENT"/>
+		<result property="unitProvidentSum" column="UNIT_PROVIDENT_SUM"/>
+		<result property="personalProidentSet" column="PERSONAL_PROIDENT_SET"/>
+		<result property="personalProvidentSum" column="PERSONAL_PROVIDENT_SUM"/>
 		<result property="keyGroup" column="keyGroup"/>
 	</resultMap>
 	<sql id="Base_Column_List">
@@ -817,14 +841,14 @@
 		</if>
 	</sql>
 
-	<sql id="tPaymentInfo_export_socialFund_where">
+	<sql id="tPaymentInfo_export_socialFund_where2">
 		<if test="tPaymentInfo != null">
 			<if test="tPaymentInfo.idList == null">
 				<if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
-					AND w.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
+					AND c.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
 				</if>
 				<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
-					AND w.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
+					AND c.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
 				</if>
 			</if>
 		</if>
@@ -1130,6 +1154,22 @@
 	<!--tPaymentInfo简单分页查询-->
 	<select id="getTPaymentInfoNewPage" resultMap="tPaymentInfoNewMap">
 		SELECT
+		c.keyGroup,
+		c.EMP_IDCARD,
+		c.EMP_NAME,
+		c.UNIT_NAME,
+		c.SETTLE_DOMAIN_NAME,
+		c.SOCIAL_HOUSEHOLD,
+		c.SOCIAL_PAY_ADDR,
+		c.SOCIAL_PAY_MONTH,
+		c.SOCIAL_CREATE_MONTH,
+		c.SUM_ALL AS SUM_ALL,
+		c.PROVIDENT_HOUSEHOLD AS PROVIDENT_HOUSEHOLD,
+		c.PROVIDENT_PAY_ADDR  AS PROVIDENT_PAY_ADDR,
+		c.SOCIAL_SUM,
+		c.PROVIDENT_SUM  AS PROVIDENT_SUM
+		from (
+		select
 		w.keyGroup,
 		w.EMP_IDCARD,
 		w.EMP_NAME,
@@ -1191,11 +1231,11 @@
 		GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
 		)
 		) w
+		GROUP BY w.keyGroup ) c
 		<where>
 			1 = 1
-			<include refid="tPaymentInfo_export_socialFund_where"/>
+			<include refid="tPaymentInfo_export_socialFund_where2"/>
 		</where>
-		GROUP BY w.keyGroup
 	</select>
 
 	<!--tPaymentInfo简单分页查询-->
@@ -1417,81 +1457,180 @@
 		SELECT
 		count(1)
 		FROM (
-		select * from (
+		select w.SOCIAL_HOUSEHOLD,w.PROVIDENT_HOUSEHOLD from (
 		(SELECT
-		CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup
+		CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
+		a.SOCIAL_HOUSEHOLD,
+		a.PROVIDENT_HOUSEHOLD
 		FROM t_payment_info a
 		<where>
 			IFNULL(a.SOCIAL_ID,'1') != '1'
 			<include refid="tPaymentInfo_export_social_where"/>
 		</where>
-		GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH
+		GROUP BY  a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
 		)
 		union all
 		(SELECT
-		CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup
+		CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
+		a.SOCIAL_HOUSEHOLD,
+		a.PROVIDENT_HOUSEHOLD
 		FROM t_payment_info a
 		<where>
 			IFNULL(a.FUND_ID,'1') != '1'
 			<include refid="tPaymentInfo_export_fund_where"/>
 		</where>
-		GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH
+		GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
 		)
 		) w
+		GROUP BY w.keyGroup) c
 		<where>
 			1 = 1
-			<include refid="tPaymentInfo_export_socialFund_where"/>
+			<include refid="tPaymentInfo_export_socialFund_where2"/>
 		</where>
-		GROUP BY w.keyGroup) c
 	</select>
 
 	<!--tPaymentInfo简单分页查询-->
 	<select id="getTPaymentInfoNewExportInfo" resultMap="tPaymentInfoNewExportMap">
 		SELECT
+		c.keyGroup,
+		c.EMP_IDCARD,
+		c.EMP_NO,
+		c.EMP_NAME,
+		c.UNIT_NAME,
+		c.SETTLE_DOMAIN_CODE,
+		c.SETTLE_DOMAIN_NAME,
+		c.SOCIAL_HOUSEHOLD,
+		c.SOCIAL_SECURITY_NO,
+		c.SOCIAL_PAY_ADDR,
+		c.SOCIAL_PAY_MONTH,
+		c.SOCIAL_CREATE_MONTH,
+		c.PERSONAL_PROVIDENT_SUM,
+		c.SUM_ALL,
+		c.PROVIDENT_PAY_MONTH,
+		c.PROVIDENT_CREATE_MONTH,
+		c.PROVIDENT_HOUSEHOLD,
+		c.PROVIDENT_PAY_ADDR,
+		c.SOCIAL_SUM,
+		c.UNIT_SOCIAL_SUM,
+		c.SOCIAL_SECURITY_PERSONAL_SUM,
+		c.PROVIDENT_SUM,
+		c.INAUGURAL_TEAM,
+		c.COMPANY_ACCRUAL,
+		c.PERSONAL_ACCRUAL,
+		c.UNIT_PENSION_SET,
+		c.UNIT_MEDICAL_SET,
+		c.UNIT_UNEMPLOYMENT_SET,
+		c.UNIT_INJURY_SET,
+		c.UNIT_BIRTH_SET,
+		c.UNIT_PENSION_MONEY,
+		c.UNIT_MEDICAL_MONEY,
+		c.UNIT_UNEMPLOYMENT_MONEY,
+		c.UNIT_INJURY_MONEY,
+		c.UNIT_BIRTH_MONEY,
+		c.UNIT_BIGMAILMENT_MONEY,
+		c.PERSONAL_PENSION_MONEY,
+		c.PERSONAL_MEDICAL_MONEY,
+		c.PERSONAL_UNEMPLOYMENT_MONEY,
+		c.PERSONAL_BIGMAILMENT_MONEY,
+		c.PROVIDENT_NO AS PROVIDENT_NO,
+		c.PERSONAL_PROIDENT_SET,
+		c.UNIT_PROVIDENT_SET,
+		c.PROVIDENT_PERCENT,
+		c.UNIT_PROVIDENT_SUM
+		from (
+		select
 		w.keyGroup,
 		w.EMP_IDCARD,
+		w.EMP_NO,
 		w.EMP_NAME,
 		w.UNIT_NAME,
+		w.SETTLE_DOMAIN_CODE,
 		w.SETTLE_DOMAIN_NAME,
 		w.SOCIAL_HOUSEHOLD,
+		MAX( w.SOCIAL_SECURITY_NO ) AS SOCIAL_SECURITY_NO,
 		w.SOCIAL_PAY_ADDR,
 		w.SOCIAL_PAY_MONTH,
 		w.SOCIAL_CREATE_MONTH,
+		SUM( w.PERSONAL_PROVIDENT_SUM) AS PERSONAL_PROVIDENT_SUM,
 		SUM( w.SUM_ALL ) AS SUM_ALL,
+		MAX( w.PROVIDENT_PAY_MONTH ) AS PROVIDENT_PAY_MONTH,
+		MAX( w.PROVIDENT_CREATE_MONTH ) AS PROVIDENT_CREATE_MONTH,
 		MAX( w.PROVIDENT_HOUSEHOLD ) AS PROVIDENT_HOUSEHOLD,
 		MAX( w.PROVIDENT_PAY_ADDR ) AS PROVIDENT_PAY_ADDR,
 		w.SOCIAL_SUM,
+		w.UNIT_SOCIAL_SUM,
+		w.SOCIAL_SECURITY_PERSONAL_SUM,
 		SUM( w.PROVIDENT_SUM ) AS PROVIDENT_SUM,
+		w.INAUGURAL_TEAM,
+		w.COMPANY_ACCRUAL,
+		w.PERSONAL_ACCRUAL,
+		w.UNIT_PENSION_SET,
+		w.UNIT_MEDICAL_SET,
+		w.UNIT_UNEMPLOYMENT_SET,
+		w.UNIT_INJURY_SET,
+		w.UNIT_BIRTH_SET,
+		w.UNIT_PENSION_MONEY,
+		w.UNIT_MEDICAL_MONEY,
+		w.UNIT_UNEMPLOYMENT_MONEY,
 		w.UNIT_INJURY_MONEY,
 		w.UNIT_BIRTH_MONEY,
-		MAX(w.PENSION_MONEY_SUM ) as PENSION_MONEY_SUM,
-		MAX(w.MEDICAL_MONEY_SUM ) as MEDICAL_MONEY_SUM,
-		MAX(w.UNEMPLOYMENT_MONEY_SUM ) as UNEMPLOYMENT_MONEY_SUM,
-		MAX(w.BIGMAILMENT_MONEY_SUM ) as BIGMAILMENT_MONEY_SUM,
-		MAX(w.ACCRUAL_SUM )  as ACCRUAL_SUM
+		w.UNIT_BIGMAILMENT_MONEY,
+		w.PERSONAL_PENSION_MONEY,
+		w.PERSONAL_MEDICAL_MONEY,
+		w.PERSONAL_UNEMPLOYMENT_MONEY,
+		w.PERSONAL_BIGMAILMENT_MONEY,
+		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,
+		SUM( w.PROVIDENT_PERCENT ) AS PROVIDENT_PERCENT,
+		SUM( w.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM
 		FROM (
 		(SELECT
 		CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
 		a.EMP_NAME,
+		a.EMP_NO,
 		a.EMP_IDCARD,
 		a.UNIT_NAME,
+		a.SETTLE_DOMAIN_CODE,
 		a.SETTLE_DOMAIN_NAME,
 		a.SOCIAL_HOUSEHOLD,
+		MAX( a.SOCIAL_SECURITY_NO ) AS SOCIAL_SECURITY_NO,
 		a.SOCIAL_PAY_ADDR,
 		a.SOCIAL_PAY_MONTH,
 		a.SOCIAL_CREATE_MONTH,
+		a.PERSONAL_PROVIDENT_SUM,
 		SUM( a.SUM_ALL ) AS SUM_ALL,
+		a.PROVIDENT_PAY_MONTH,
+		a.PROVIDENT_CREATE_MONTH,
 		a.PROVIDENT_HOUSEHOLD,
 		a.PROVIDENT_PAY_ADDR,
 		SUM( a.SOCIAL_SUM ) AS SOCIAL_SUM,
+		SUM( a.UNIT_SOCIAL_SUM ) AS UNIT_SOCIAL_SUM,
+		SUM( a.SOCIAL_SECURITY_PERSONAL_SUM ) AS SOCIAL_SECURITY_PERSONAL_SUM,
 		a.PROVIDENT_SUM,
+		a.INAUGURAL_TEAM,
+		SUM( a.COMPANY_ACCRUAL ) AS COMPANY_ACCRUAL,
+		SUM( a.PERSONAL_ACCRUAL ) AS PERSONAL_ACCRUAL,
+		MAX(a.UNIT_PENSION_SET ) AS UNIT_PENSION_SET,
+		MAX(a.UNIT_MEDICAL_SET ) AS UNIT_MEDICAL_SET,
+		MAX(a.UNIT_UNEMPLOYMENT_SET ) AS UNIT_UNEMPLOYMENT_SET,
+		MAX(a.UNIT_INJURY_SET ) AS UNIT_INJURY_SET,
+		MAX(a.UNIT_BIRTH_SET ) AS UNIT_BIRTH_SET,
+		SUM( a.UNIT_PENSION_MONEY ) AS UNIT_PENSION_MONEY,
+		SUM( a.UNIT_MEDICAL_MONEY ) AS UNIT_MEDICAL_MONEY,
+		SUM( a.UNIT_UNEMPLOYMENT_MONEY ) AS UNIT_UNEMPLOYMENT_MONEY,
 		SUM( a.UNIT_INJURY_MONEY ) AS UNIT_INJURY_MONEY,
 		SUM( a.UNIT_BIRTH_MONEY ) AS UNIT_BIRTH_MONEY,
-		ifnull(SUM(a.UNIT_PENSION_MONEY),0)+ifnull(SUM(a.PERSONAL_PENSION_MONEY),0) as PENSION_MONEY_SUM,
-		ifnull(SUM(a.UNIT_MEDICAL_MONEY),0)+ifnull(SUM(a.PERSONAL_MEDICAL_MONEY),0) as MEDICAL_MONEY_SUM,
-		ifnull(SUM(a.UNIT_UNEMPLOYMENT_MONEY),0)+ifnull(SUM(a.PERSONAL_UNEMPLOYMENT_MONEY),0) as UNEMPLOYMENT_MONEY_SUM,
-		ifnull(SUM(a.UNIT_BIGMAILMENT_MONEY),0)+ifnull(SUM(a.PERSONAL_BIGMAILMENT_MONEY),0) as BIGMAILMENT_MONEY_SUM,
-		ifnull(SUM(a.COMPANY_ACCRUAL),0)+ifnull(SUM(a.PERSONAL_ACCRUAL),0) as ACCRUAL_SUM
+		SUM( a.UNIT_BIGMAILMENT_MONEY ) AS UNIT_BIGMAILMENT_MONEY,
+		SUM( a.PERSONAL_PENSION_MONEY ) AS PERSONAL_PENSION_MONEY,
+		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,
+		a.PROVIDENT_NO,
+		a.UNIT_PROVIDENT_SET,
+		a.PROVIDENT_PERCENT,
+		a.PERSONAL_PROIDENT_SET,
+		a.UNIT_PROVIDENT_SUM
 		FROM t_payment_info a
 		<where>
 			IFNULL(a.SOCIAL_ID,'1') != '1'
@@ -1503,25 +1642,49 @@
 		(SELECT
 		CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
 		a.EMP_NAME,
+		a.EMP_NO,
 		a.EMP_IDCARD,
 		a.UNIT_NAME,
+		a.SETTLE_DOMAIN_CODE,
 		a.SETTLE_DOMAIN_NAME,
 		a.SOCIAL_HOUSEHOLD,
+		a.SOCIAL_SECURITY_NO,
 		a.SOCIAL_PAY_ADDR,
-		a.PROVIDENT_PAY_MONTH as SOCIAL_PAY_MONTH,
-		a.PROVIDENT_CREATE_MONTH as SOCIAL_CREATE_MONTH,
+		a.SOCIAL_PAY_MONTH,
+		a.SOCIAL_CREATE_MONTH,
+		SUM(a.PERSONAL_PROVIDENT_SUM) AS PERSONAL_PROVIDENT_SUM,
 		SUM( a.SUM_ALL ) AS SUM_ALL,
+		a.PROVIDENT_PAY_MONTH,
+		a.PROVIDENT_CREATE_MONTH,
 		a.PROVIDENT_HOUSEHOLD,
 		a.PROVIDENT_PAY_ADDR,
 		a.SOCIAL_SUM,
+		a.UNIT_SOCIAL_SUM,
+		a.SOCIAL_SECURITY_PERSONAL_SUM,
 		SUM( a.PROVIDENT_SUM ) AS PROVIDENT_SUM,
+		a.INAUGURAL_TEAM,
+		a.COMPANY_ACCRUAL,
+		a.PERSONAL_ACCRUAL,
+		a.UNIT_PENSION_SET,
+		a.UNIT_MEDICAL_SET,
+		a.UNIT_UNEMPLOYMENT_SET,
+		a.UNIT_INJURY_SET,
+		a.UNIT_BIRTH_SET,
+		a.UNIT_PENSION_MONEY,
+		a.UNIT_MEDICAL_MONEY,
+		a.UNIT_UNEMPLOYMENT_MONEY,
 		a.UNIT_INJURY_MONEY,
 		a.UNIT_BIRTH_MONEY,
-		null PENSION_MONEY_SUM,
-		null MEDICAL_MONEY_SUM,
-		null UNEMPLOYMENT_MONEY_SUM,
-		null BIGMAILMENT_MONEY_SUM,
-		null ACCRUAL_SUM
+		a.UNIT_BIGMAILMENT_MONEY,
+		a.PERSONAL_PENSION_MONEY,
+		a.PERSONAL_MEDICAL_MONEY,
+		a.PERSONAL_UNEMPLOYMENT_MONEY,
+		a.PERSONAL_BIGMAILMENT_MONEY,
+		a.PROVIDENT_NO,
+		a.UNIT_PROVIDENT_SET,
+		a.PROVIDENT_PERCENT,
+		a.PERSONAL_PROIDENT_SET,
+		SUM( a.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM
 		FROM t_payment_info a
 		<where>
 			IFNULL(a.FUND_ID,'1') != '1'
@@ -1530,11 +1693,11 @@
 		GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
 		)
 		) w
+		GROUP BY w.keyGroup) c
 		<where>
 			1 = 1
-			<include refid="tPaymentInfo_export_socialFund_where"/>
+			<include refid="tPaymentInfo_export_socialFund_where2"/>
 		</where>
-		GROUP BY w.keyGroup
 		limit #{tPaymentInfo.limitStart},#{tPaymentInfo.limitEnd}
 	</select>