实缴合并推送修改

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

@@ -103,8 +103,8 @@
 		<result property="isIncomeStatus" column="IS_INCOME_STATUS"/>
 		<result property="incomeSettleFlag" column="INCOME_SETTLE_FLAG"/>
 		<result property="incomeCollectFlag" column="INCOME_COLLECT_FLAG"/>
-		<result property="paySettleFlag" column="PAY_COLLECT_FLAG"/>
-		<result property="payCollectFlag" column="PAY_SETTLE_FLAG"/>
+		<result property="paySettleFlag" column="PAY_SETTLE_FLAG"/>
+		<result property="payCollectFlag" column="PAY_COLLECT_FLAG"/>
 	</resultMap>
 	<resultMap id="tPaymentInfoSumMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoExportVo">
 		<result property="empName" column="EMP_NAME"/>
@@ -1297,7 +1297,11 @@
 	<!--tPaymentInfo 按ID查收缴费库包含社保和公积金明细的数据查询-->
 	<select id="getAllPushInfoById" resultMap="tPaymentInfoMap">
 		SELECT
-		*
+		ID,
+		INCOME_SETTLE_FLAG,
+		INCOME_COLLECT_FLAG,
+		PAY_COLLECT_FLAG,
+		PAY_SETTLE_FLAG
 		FROM t_payment_info a
 		where a.ID in (${idStr})
 	</select>