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

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -247,7 +247,7 @@
 		a.DEPART_NO,
 		a.SECOND_INDICATOR_BELONG
 		FROM t_settle_domain a
-		WHERE a.DELETE_FLAG = '0' and a.STOP_FLAG = '0'
+		WHERE a.DELETE_FLAG = '0' and a.SECOND_INDICATOR_BELONG is not null
 		<if test="tSettleDomain != null">
 			<if test="tSettleDomain.departNo != null and tSettleDomain.departNo.trim() != ''">
 				and a.DEPART_NO = #{tSettleDomain.departNo}

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

@@ -168,7 +168,7 @@ public class SysHouseHoldInfo extends BaseEntity {
     private String handleUserName;
 
 	/**
-	 * 类型 0 独立户
+	 * 类型 0 独立户 1 自由户
 	 */
 	@ExcelAttribute(name = "类型" )
 	@Schema(description ="类型")

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

@@ -1474,11 +1474,12 @@
 		SELECT
 		count(1)
 		FROM (
-		select w.SOCIAL_HOUSEHOLD,w.PROVIDENT_HOUSEHOLD from (
+		select w.SOCIAL_HOUSEHOLD,w.PROVIDENT_HOUSEHOLD,w.SECOND_INDICATOR_BELONG from (
 		(SELECT
 		CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
 		a.SOCIAL_HOUSEHOLD,
-		a.PROVIDENT_HOUSEHOLD
+		a.PROVIDENT_HOUSEHOLD,
+		a.SECOND_INDICATOR_BELONG
 		FROM t_payment_info a
 		<where>
 			IFNULL(a.SOCIAL_ID,'1') != '1'
@@ -1490,7 +1491,8 @@
 		(SELECT
 		CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH, '_', a.SETTLE_DOMAIN_CODE ) AS keyGroup,
 		a.SOCIAL_HOUSEHOLD,
-		a.PROVIDENT_HOUSEHOLD
+		a.PROVIDENT_HOUSEHOLD,
+		a.SECOND_INDICATOR_BELONG
 		FROM t_payment_info a
 		<where>
 			IFNULL(a.FUND_ID,'1') != '1'
@@ -2337,6 +2339,7 @@
 		,p.SETTLE_DOMAIN_CODE = #{dept.departNo}
 		,p.UNIT_ID = #{dept.customerId}
 		,p.UNIT_NAME = #{dept.customerName}
+		,p.SECOND_INDICATOR_BELONG = #{dept.secondIndicatorBelong}
 		where (p.SALARY_SOCIAL_FLAG = '0' and p.SALARY_FUND_FLAG = '0') and p.id in
 		<foreach item="item" index="index" collection="idSet" open="(" separator="," close=")">
 			#{item}