push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalaryServiceImpl.java

@@ -471,6 +471,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
         // 按 brokerBizId 分组，收集月份（去重）
         // 按 brokerBizId 分组，收集月份（去重）
         Map<String, Set<String>> brokerMonthMap = new LinkedHashMap<>();
         Map<String, Set<String>> brokerMonthMap = new LinkedHashMap<>();
         Map<String, String> brokerNameMap = new HashMap<>();
         Map<String, String> brokerNameMap = new HashMap<>();
+        Set<String> bizIdSet = new HashSet<>();
         DateTimeFormatter monthFormatter = DateTimeFormatter.ofPattern("yyyyMM");
         DateTimeFormatter monthFormatter = DateTimeFormatter.ofPattern("yyyyMM");
 
 
         for (FortuneAccount account : accountList) {
         for (FortuneAccount account : accountList) {
@@ -488,11 +489,22 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
 
 
             // 存储转介人名称（首次出现）
             // 存储转介人名称（首次出现）
             brokerNameMap.putIfAbsent(bizId, brokerName);
             brokerNameMap.putIfAbsent(bizId, brokerName);
+            bizIdSet.add(bizId);
 
 
             // 收集月份（自动去重）
             // 收集月份（自动去重）
             brokerMonthMap.computeIfAbsent(bizId, k -> new LinkedHashSet<>()).add(month);
             brokerMonthMap.computeIfAbsent(bizId, k -> new LinkedHashSet<>()).add(month);
         }
         }
 
 
+        //获取转介人详细详细列表
+        List<String> bizIdList = bizIdSet.stream().collect(Collectors.toList());
+        ApiUserSaleExpandListRequest request = new ApiUserSaleExpandListRequest();
+        request.setClientUserBizIdList(bizIdList);
+        Result<List<ApiUserSaleExpandDetailResponse>> result = apiUserSaleExpandFeignClient.list(request);
+        Map<String, ApiUserSaleExpandDetailResponse> policyFollowMap = null;
+        if (CollectionUtils.isNotEmpty(result.getData())) {
+            policyFollowMap = result.getData().stream()
+                    .collect(Collectors.toMap(ApiUserSaleExpandDetailResponse::getClientUserBizId, Function.identity()));
+        }
         // 组装响应对象
         // 组装响应对象
         List<ApiSalaryBrokerListResponse> resultList = new ArrayList<>();
         List<ApiSalaryBrokerListResponse> resultList = new ArrayList<>();
         for (Map.Entry<String, Set<String>> entry : brokerMonthMap.entrySet()) {
         for (Map.Entry<String, Set<String>> entry : brokerMonthMap.entrySet()) {
@@ -500,6 +512,13 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
             Set<String> monthSet = entry.getValue();
             Set<String> monthSet = entry.getValue();
 
 
             ApiSalaryBrokerListResponse response = new ApiSalaryBrokerListResponse();
             ApiSalaryBrokerListResponse response = new ApiSalaryBrokerListResponse();
+            if (policyFollowMap != null) {
+                ApiUserSaleExpandDetailResponse detailResponse = policyFollowMap.get(bizId);
+                if (detailResponse != null) {
+                    //内部编号
+                    response.setInternalNumber(detailResponse.getInternalNumber());
+                }
+            }
             response.setBrokerBizId(bizId);
             response.setBrokerBizId(bizId);
             response.setBroker(brokerNameMap.getOrDefault(bizId, ""));
             response.setBroker(brokerNameMap.getOrDefault(bizId, ""));
             // 月份列表按时间升序排序
             // 月份列表按时间升序排序

yd-csf-feign/src/main/java/com/yd/csf/feign/request/salary/ApiSalaryPageRequest.java

@@ -15,4 +15,9 @@ public class ApiSalaryPageRequest extends PageDto {
      * 薪资月份（同出账月，如：202605）
      * 薪资月份（同出账月，如：202605）
      */
      */
     private String month;
     private String month;
+
+    /**
+     * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
+     */
+    private String status;
 }
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryBrokerListResponse.java

@@ -17,6 +17,11 @@ public class ApiSalaryBrokerListResponse {
     private String brokerBizId;
     private String brokerBizId;
 
 
     /**
     /**
+     * 内部编号
+     */
+    private String internalNumber;
+
+    /**
      * 月份列表（格式： 202606）
      * 月份列表（格式： 202606）
      */
      */
     private List<String> monthList;
     private List<String> monthList;

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryPageResponse.java

 package com.yd.csf.feign.response.salary;
 package com.yd.csf.feign.response.salary;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -65,5 +66,6 @@ public class ApiSalaryPageResponse {
     /**
     /**
      * 制作时间（创建时间）
      * 制作时间（创建时间）
      */
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
     private LocalDateTime createTime;
 }
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryPushPageResponse.java

@@ -9,6 +9,11 @@ import java.time.LocalDateTime;
 public class ApiSalaryPushPageResponse {
 public class ApiSalaryPushPageResponse {
 
 
     /**
     /**
+     * 薪资单表唯一业务ID
+     */
+    private String salaryBizId;
+
+    /**
      * 转介人名称
      * 转介人名称
      */
      */
     private String brokerName;
     private String brokerName;

yd-csf-service/src/main/java/com/yd/csf/service/model/Salary.java

 package com.yd.csf.service.model;
 package com.yd.csf.service.model;
 
 
-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.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -148,7 +146,7 @@ public class Salary implements Serializable {
     /**
     /**
      * 创建人名称
      * 创建人名称
      */
      */
-    @TableField("creator_name")
+    @TableField(value = "creator_name", fill = FieldFill.INSERT)
     private String creatorName;
     private String creatorName;
 
 
     /**
     /**

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

@@ -25,6 +25,9 @@
             <if test="request.month != null and request.month != ''">
             <if test="request.month != null and request.month != ''">
                 AND s.month = #{request.month}
                 AND s.month = #{request.month}
             </if>
             </if>
+            <if test="request.status != null and request.status != ''">
+                AND s.status = #{request.status}
+            </if>
             AND s.is_deleted = 0
             AND s.is_deleted = 0
         </where>
         </where>
         GROUP BY s.salary_biz_id
         GROUP BY s.salary_biz_id
@@ -33,6 +36,7 @@
 
 
     <select id="pushPage" resultType="com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse">
     <select id="pushPage" resultType="com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse">
         select
         select
+        s.salary_biz_id,
         s.broker_name,
         s.broker_name,
         s.month,
         s.month,
         s.paid_amount,
         s.paid_amount,