push

yd-csf-feign/src/main/java/com/yd/csf/feign/request/salarysplit/ApiSalarySplitSummaryPageRequest.java

@@ -3,28 +3,40 @@ package com.yd.csf.feign.request.salarysplit;
 import com.yd.common.dto.PageDto;
 import com.yd.common.dto.PageDto;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.List;
+
 @Data
 @Data
 public class ApiSalarySplitSummaryPageRequest extends PageDto {
 public class ApiSalarySplitSummaryPageRequest extends PageDto {
 
 
-    /**
-     * 转介人名称
-     */
-    private String brokerName;
+//    /**
+//     * 转介人名称
+//     */
+//    private String brokerName;
+//
+//    /**
+//     * 出账状态 可出账、待出账、已出账
+//     */
+//    private String status;
 
 
     /**
     /**
-     * 出账状态 可出账、待出账、已出账
+     * 转介人业务id列表
      */
      */
-    private String status;
+    private List<String> brokerBizIdList;
+
+//    /**
+//     * 出账状态列表 可出账、待出账、已出账
+//     */
+//    private List<String> statusList;
 
 
     /**
     /**
-     * 出账月-开始月份
+     * 出账开始年月（2026-07）
      */
      */
-    private Integer startMonth;
+    private String startMonth;
 
 
     /**
     /**
-     * 出账月-结束月份
+     * 出账结束年月（2027-09）
      */
      */
-    private Integer endMonth;
+    private String endMonth;
 
 
     /**
     /**
      * 出账机构
      * 出账机构

yd-csf-service/src/main/resources/mappers/SalarySplitMapper.xml

@@ -34,20 +34,20 @@
         on ss.fortune_account_biz_id = fa.fortune_account_biz_id
         on ss.fortune_account_biz_id = fa.fortune_account_biz_id
         and fa.is_deleted = 0
         and fa.is_deleted = 0
         <where>
         <where>
-            <if test="request.brokerName != null and request.brokerName != ''">
-                and ss.broker_name like concat('%', #{request.brokerName}, '%')
-            </if>
-            <if test="request.status != null and request.status != ''">
-                and fa.status = #{request.status}
+            <if test="request.brokerBizIdList != null and request.brokerBizIdList.size > 0">
+                and ss.broker_biz_id in
+                <foreach collection="request.brokerBizIdList" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             </if>
 
 
-            <!-- 开始月份：大于等于该月第一天 -->
-            <if test="request.startMonth != null">
-                and fa.fortune_account_date >= STR_TO_DATE(CONCAT(#{request.startMonth}, '01'), '%Y%m%d')
+            <!-- 开始月份：大于等于该月第一天（包含整个月开始） -->
+            <if test="request.startMonth != null and request.startMonth != ''">
+                and fa.fortune_account_date >= DATE(CONCAT(#{request.startMonth}, '-01'))
             </if>
             </if>
-            <!-- 结束月份：小于下月第一天（包含该月全部日期） -->
-            <if test="request.endMonth != null">
-                and fa.fortune_account_date &lt; DATE_ADD(STR_TO_DATE(CONCAT(#{request.endMonth}, '01'), '%Y%m%d'), INTERVAL 1 MONTH)
+            <!-- 结束月份：小于下月第一天（包含整个月结束） -->
+            <if test="request.endMonth != null and request.endMonth != ''">
+                and fa.fortune_account_date &lt; DATE_ADD(DATE(CONCAT(#{request.endMonth}, '-01')), INTERVAL 1 MONTH)
             </if>
             </if>
             <if test="request.billOrg != null and request.billOrg != ''">
             <if test="request.billOrg != null and request.billOrg != ''">
                 and ss.bill_org like concat('%', #{request.billOrg}, '%')
                 and ss.bill_org like concat('%', #{request.billOrg}, '%')