push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiSalaryController.java

@@ -5,10 +5,7 @@ import com.yd.common.result.Result;
 import com.yd.csf.api.service.ApiSalaryService;
 import com.yd.csf.feign.client.salary.ApiSalaryFeignClient;
 import com.yd.csf.feign.request.salary.*;
-import com.yd.csf.feign.response.salary.ApiSalaryBrokerListResponse;
-import com.yd.csf.feign.response.salary.ApiSalaryDetailResponse;
-import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
-import com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse;
+import com.yd.csf.feign.response.salary.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -191,4 +188,14 @@ public class ApiSalaryController implements ApiSalaryFeignClient {
         return apiSalaryService.brokerList(name);
     }
 
+    /**
+     * 电子薪资单-导出
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<ApiSalaryExportResponse> export(ApiSalaryExportRequest request) {
+        return null;
+    }
+
 }

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiSalaryService.java

@@ -3,10 +3,7 @@ package com.yd.csf.api.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.csf.feign.request.salary.*;
-import com.yd.csf.feign.response.salary.ApiSalaryBrokerListResponse;
-import com.yd.csf.feign.response.salary.ApiSalaryDetailResponse;
-import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
-import com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse;
+import com.yd.csf.feign.response.salary.*;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -42,5 +39,7 @@ public interface ApiSalaryService {
 
     Result<BigDecimal> calculateTotalAmount(ApiSalaryCalculateTotalAmountRequest request);
 
+    Result<ApiSalaryExportResponse> export(ApiSalaryExportRequest request);
+
     Result<List<ApiSalaryBrokerListResponse>> brokerList(String name);
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/client/salary/ApiSalaryFeignClient.java

@@ -5,6 +5,7 @@ import com.yd.csf.feign.fallback.salary.ApiSalaryFeignFallbackFactory;
 import com.yd.csf.feign.request.salary.*;
 import com.yd.csf.feign.response.salary.ApiSalaryBrokerListResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryDetailResponse;
+import com.yd.csf.feign.response.salary.ApiSalaryExportResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -146,4 +147,11 @@ public interface ApiSalaryFeignClient {
     @GetMapping("/broker/list")
     Result<List<ApiSalaryBrokerListResponse>> brokerList(@RequestParam(value = "name",required = false) String name);
 
+    /**
+     * 电子薪资单-导出
+     * @param request
+     * @return
+     */
+    @PostMapping("/salary/export")
+    Result<ApiSalaryExportResponse> export(@Validated @RequestBody ApiSalaryExportRequest request);
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/salary/ApiSalaryFeignFallbackFactory.java

@@ -5,6 +5,7 @@ import com.yd.csf.feign.client.salary.ApiSalaryFeignClient;
 import com.yd.csf.feign.request.salary.*;
 import com.yd.csf.feign.response.salary.ApiSalaryBrokerListResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryDetailResponse;
+import com.yd.csf.feign.response.salary.ApiSalaryExportResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
@@ -101,6 +102,11 @@ public class ApiSalaryFeignFallbackFactory implements FallbackFactory<ApiSalaryF
             public Result<List<ApiSalaryBrokerListResponse>> brokerList(String name) {
                 return null;
             }
+
+            @Override
+            public Result<ApiSalaryExportResponse> export(ApiSalaryExportRequest request) {
+                return null;
+            }
         };
     }
 }

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

+package com.yd.csf.feign.request.salary;
+
+import lombok.Data;
+
+@Data
+public class ApiSalaryExportRequest {
+
+    /**
+     * 转介人名称
+     */
+    private String brokerName;
+
+    /**
+     * 薪资月份（同出账月，如：202605）
+     */
+    private String month;
+
+    /**
+     * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
+     */
+    private String status;
+
+}

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

+package com.yd.csf.feign.response.salary;
+
+import lombok.Data;
+
+@Data
+public class ApiSalaryExportResponse {
+
+    private String url;
+}

yd-csf-service/src/main/java/com/yd/csf/service/service/ISalaryRemittanceService.java

@@ -4,6 +4,7 @@ import com.yd.csf.service.model.SalaryRemittance;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +21,11 @@ public interface ISalaryRemittanceService extends IService<SalaryRemittance> {
     List<SalaryRemittance> queryList(String salaryBizId);
 
     SalaryRemittance queryOne(String salaryRemittanceBizId);
+
+    /**
+     * 批量根据薪资单业务ID列表查询汇款明细，并按 salaryBizId 分组返回 Map
+     * @param salaryBizIds 薪资单业务ID列表
+     * @return Map<salaryBizId, List<SalaryRemittance>>
+     */
+    Map<String, List<SalaryRemittance>> queryListBySalaryBizIds(List<String> salaryBizIds);
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/SalaryRemittanceServiceImpl.java

@@ -5,9 +5,12 @@ import com.yd.csf.service.model.SalaryRemittance;
 import com.yd.csf.service.dao.SalaryRemittanceMapper;
 import com.yd.csf.service.service.ISalaryRemittanceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -38,4 +41,20 @@ public class SalaryRemittanceServiceImpl extends ServiceImpl<SalaryRemittanceMap
                 .eq(SalaryRemittance::getSalaryRemittanceBizId,salaryRemittanceBizId)
                 .last(" limit 1 "));
     }
+
+    @Override
+    public Map<String, List<SalaryRemittance>> queryListBySalaryBizIds(List<String> salaryBizIds) {
+        if (CollectionUtils.isEmpty(salaryBizIds)) {
+            return java.util.Collections.emptyMap();
+        }
+        // 批量查询
+        List<SalaryRemittance> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<SalaryRemittance>()
+                        .in(SalaryRemittance::getSalaryBizId, salaryBizIds)
+                        .orderByAsc(SalaryRemittance::getCreateTime) // 按需排序
+        );
+        // 按 salaryBizId 分组
+        return list.stream()
+                .collect(Collectors.groupingBy(SalaryRemittance::getSalaryBizId));
+    }
 }