优化修改

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java

@@ -19,9 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.social.entity;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
@@ -654,6 +652,15 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("支出信息付款状态")
 	private String payCollectFlag;
 
+	/**
+	 * 二级指标归属
+	 */
+	@ExcelAttribute(name = "二级指标归属", maxLength = 50)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("二级指标归属")
+	@Schema(description = "二级指标归属")
+	private String secondIndicatorBelong ;
+
 	/**
 	 * EKP的 是否BPO：  是  否
 	 */

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

@@ -88,6 +88,15 @@ public class TPaymentInfoNewExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("项目编码" )
 	private String settleDomainCode;
 
+	/**
+	 * 二级指标归属
+	 */
+	@ExcelAttribute(name = "二级指标归属", maxLength = 50)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("二级指标归属")
+	@Schema(description = "二级指标归属")
+	private String secondIndicatorBelong ;
+
 	/**
 	 * 社保户
 	 */

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

@@ -402,4 +402,13 @@ public class TPaymentInfoNewVo extends RowIndex implements Serializable {
 	@Schema(description = "分组键")
 	private String keyGroup;
 
+	/**
+	 * 二级指标归属
+	 */
+	@ExcelAttribute(name = "二级指标归属", maxLength = 50)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("二级指标归属")
+	@Schema(description = "二级指标归属")
+	private String secondIndicatorBelong ;
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -1351,6 +1351,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						continue;
 					}
 					paymentInfo.setBpoFlag(domain.getBpoFlag());
+					paymentInfo.setSecondIndicatorBelong(domain.getSecondIndicatorBelong());
 					paymentInfo.setSettleDomainId(socialInfo.getSettleDomain());
 					paymentInfo.setSettleDomainName(socialInfo.getSettleDomainName());
 					paymentInfo.setSettleDomainCode(socialInfo.getSettleDomainCode());
@@ -1377,6 +1378,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						continue;
 					}
 					paymentInfo.setSettleDomainName(domain.getDepartName());
+					paymentInfo.setSecondIndicatorBelong(domain.getSecondIndicatorBelong());
 					paymentInfo.setUnitId(domain.getCustomerId());
 					paymentInfo.setUnitName(domain.getCustomerName());
 					paymentInfo.setBpoFlag(domain.getBpoFlag());
@@ -1863,6 +1865,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							}
 							paymentInfo.setBpoFlag(domain.getBpoFlag());
 							paymentInfo.setSettleDomainId(fund.getSettleDomainFund());
+							paymentInfo.setSecondIndicatorBelong(domain.getSecondIndicatorBelong());
 							paymentInfo.setSettleDomainName(fund.getSettleDomainNameFund());
 							paymentInfo.setSettleDomainCode(fund.getSettleDomainCodeFund());
 							paymentInfo.setUnitId(fund.getUnitIdFund());
@@ -1888,6 +1891,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 								continue;
 							}
 							paymentInfo.setSettleDomainName(domain.getDepartName());
+							paymentInfo.setSecondIndicatorBelong(domain.getSecondIndicatorBelong());
 							paymentInfo.setUnitId(domain.getCustomerId());
 							paymentInfo.setUnitName(domain.getCustomerName());
 							paymentInfo.setBpoFlag(domain.getBpoFlag());
@@ -2545,6 +2549,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						continue;
 					}
 					payExists.setBpoFlag(domain.getBpoFlag());
+					payExists.setSecondIndicatorBelong(domain.getSecondIndicatorBelong());
 					payExists.setSettleDomainId(socialInfo.getSettleDomain());
 					payExists.setSettleDomainCode(Common.isNotNull(socialInfo.getSettleDomainCode()) ? socialInfo.getSettleDomainCode(): "");
 					payExists.setUnitId(Common.isNotNull(socialInfo.getUnitId()) ? socialInfo.getUnitId(): "");
@@ -2571,6 +2576,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					}
 					payExists.setSettleDomainId(tSocialInfo.getSettleDomain());
 					payExists.setSettleDomainCode(tSocialInfo.getSettleDomainCode());
+					payExists.setSecondIndicatorBelong(domain.getSecondIndicatorBelong());
 					payExists.setSettleDomainName(domain.getDepartName());
 					payExists.setUnitId(domain.getCustomerId());
 					payExists.setUnitName(domain.getCustomerName());

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

@@ -105,6 +105,7 @@
 		<result property="paySettleFlag" column="PAY_SETTLE_FLAG"/>
 		<result property="payCollectFlag" column="PAY_COLLECT_FLAG"/>
 		<result property="bpoFlag" column="BPO_FLAG"/>
+		<result property="secondIndicatorBelong" column="SECOND_INDICATOR_BELONG"/>
 	</resultMap>
 	<resultMap id="tPaymentInfoSumMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoExportVo">
 		<result property="empName" column="EMP_NAME"/>
@@ -300,6 +301,7 @@
 		<result property="unitSocialFundSum" column="UNIT_SOCIAL_FUND_SUM"/>
 		<result property="socialFundPersonalSum" column="SOCIAL_FUND_PERSONAL_SUM"/>
 		<result property="keyGroup" column="keyGroup"/>
+		<result property="secondIndicatorBelong" column="SECOND_INDICATOR_BELONG"/>
 	</resultMap>
 
 	<resultMap id="tPaymentInfoNewExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoNewExportVo">
@@ -348,6 +350,7 @@
 		<result property="personalProidentSet" column="PERSONAL_PROIDENT_SET"/>
 		<result property="personalProvidentSum" column="PERSONAL_PROVIDENT_SUM"/>
 		<result property="keyGroup" column="keyGroup"/>
+		<result property="secondIndicatorBelong" column="SECOND_INDICATOR_BELONG"/>
 	</resultMap>
 	<sql id="Base_Column_List">
 		a.ID,
@@ -850,6 +853,9 @@
 				<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
 					AND c.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
 				</if>
+				<if test="tPaymentInfo.secondIndicatorBelong != null and tPaymentInfo.secondIndicatorBelong.trim() != ''">
+					AND c.SECOND_INDICATOR_BELONG = #{tPaymentInfo.secondIndicatorBelong}
+				</if>
 			</if>
 		</if>
 	</sql>
@@ -869,6 +875,9 @@
 				<if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''">
 					AND k.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
 				</if>
+				<if test="tPaymentInfo.secondIndicatorBelong != null and tPaymentInfo.secondIndicatorBelong.trim() != ''">
+					AND k.SECOND_INDICATOR_BELONG = #{tPaymentInfo.secondIndicatorBelong}
+				</if>
 			</if>
 		</if>
 	</sql>
@@ -1159,6 +1168,7 @@
 		c.EMP_NAME,
 		c.UNIT_NAME,
 		c.SETTLE_DOMAIN_NAME,
+		c.SECOND_INDICATOR_BELONG,
 		c.SOCIAL_HOUSEHOLD,
 		c.SOCIAL_PAY_ADDR,
 		c.SOCIAL_PAY_MONTH,
@@ -1175,6 +1185,7 @@
 		w.EMP_NAME,
 		w.UNIT_NAME,
 		w.SETTLE_DOMAIN_NAME,
+		w.SECOND_INDICATOR_BELONG,
 		w.SOCIAL_HOUSEHOLD,
 		w.SOCIAL_PAY_ADDR,
 		w.SOCIAL_PAY_MONTH,
@@ -1191,6 +1202,7 @@
 		a.EMP_IDCARD,
 		a.UNIT_NAME,
 		a.SETTLE_DOMAIN_NAME,
+		a.SECOND_INDICATOR_BELONG,
 		a.SOCIAL_HOUSEHOLD,
 		a.SOCIAL_PAY_ADDR,
 		a.SOCIAL_PAY_MONTH,
@@ -1214,6 +1226,7 @@
 		a.EMP_IDCARD,
 		a.UNIT_NAME,
 		a.SETTLE_DOMAIN_NAME,
+		a.SECOND_INDICATOR_BELONG,
 		a.SOCIAL_HOUSEHOLD,
 		a.SOCIAL_PAY_ADDR,
 		a.PROVIDENT_PAY_MONTH as SOCIAL_PAY_MONTH,
@@ -1245,6 +1258,7 @@
 		k.EMP_NAME,
 		k.UNIT_NAME,
 		k.SETTLE_DOMAIN_NAME,
+		k.SECOND_INDICATOR_BELONG,
 		k.SOCIAL_HOUSEHOLD,
 		k.SOCIAL_SECURITY_NO,
 		k.SOCIAL_PAY_ADDR,
@@ -1294,6 +1308,7 @@
 		w.EMP_NAME,
 		w.UNIT_NAME,
 		w.SETTLE_DOMAIN_NAME,
+		w.SECOND_INDICATOR_BELONG,
 		w.SOCIAL_HOUSEHOLD,
 		MAX( w.SOCIAL_SECURITY_NO ) AS SOCIAL_SECURITY_NO,
 		w.SOCIAL_PAY_ADDR,
@@ -1343,6 +1358,7 @@
 		a.EMP_IDCARD,
 		a.UNIT_NAME,
 		a.SETTLE_DOMAIN_NAME,
+		a.SECOND_INDICATOR_BELONG,
 		a.SOCIAL_HOUSEHOLD,
 		MAX( a.SOCIAL_SECURITY_NO ) AS SOCIAL_SECURITY_NO,
 		a.SOCIAL_PAY_ADDR,
@@ -1397,6 +1413,7 @@
 		a.EMP_IDCARD,
 		a.UNIT_NAME,
 		a.SETTLE_DOMAIN_NAME,
+		a.SECOND_INDICATOR_BELONG,
 		a.SOCIAL_HOUSEHOLD,
 		a.SOCIAL_SECURITY_NO,
 		a.SOCIAL_PAY_ADDR,
@@ -1498,6 +1515,7 @@
 		c.EMP_NAME,
 		c.UNIT_NAME,
 		c.SETTLE_DOMAIN_CODE,
+		c.SECOND_INDICATOR_BELONG,
 		c.SETTLE_DOMAIN_NAME,
 		c.SOCIAL_HOUSEHOLD,
 		c.SOCIAL_SECURITY_NO,
@@ -1545,6 +1563,7 @@
 		w.EMP_NAME,
 		w.UNIT_NAME,
 		w.SETTLE_DOMAIN_CODE,
+		w.SECOND_INDICATOR_BELONG,
 		w.SETTLE_DOMAIN_NAME,
 		w.SOCIAL_HOUSEHOLD,
 		MAX( w.SOCIAL_SECURITY_NO ) AS SOCIAL_SECURITY_NO,
@@ -1592,6 +1611,7 @@
 		a.EMP_IDCARD,
 		a.UNIT_NAME,
 		a.SETTLE_DOMAIN_CODE,
+		a.SECOND_INDICATOR_BELONG,
 		a.SETTLE_DOMAIN_NAME,
 		a.SOCIAL_HOUSEHOLD,
 		MAX( a.SOCIAL_SECURITY_NO ) AS SOCIAL_SECURITY_NO,
@@ -1646,6 +1666,7 @@
 		a.EMP_IDCARD,
 		a.UNIT_NAME,
 		a.SETTLE_DOMAIN_CODE,
+		a.SECOND_INDICATOR_BELONG,
 		a.SETTLE_DOMAIN_NAME,
 		a.SOCIAL_HOUSEHOLD,
 		a.SOCIAL_SECURITY_NO,