push

yd-csf-feign/src/main/java/com/yd/csf/feign/client/salarysplit/ApiSalarySplitFeignClient.java

@@ -57,4 +57,12 @@ public interface ApiSalarySplitFeignClient {
      */
      */
     @PostMapping("/query/rate")
     @PostMapping("/query/rate")
     Result<ApiSalarySplitQueryRateResponse> queryRate(@Validated @RequestBody ApiSalarySplitQueryRateRequest request);
     Result<ApiSalarySplitQueryRateResponse> queryRate(@Validated @RequestBody ApiSalarySplitQueryRateRequest request);
+
+//    /**
+//     * 导出-薪资拆分应发信息汇总列表
+//     * @param request
+//     * @return
+//     */
+//    @PostMapping("/export/summary/list")
+//    Result export(@Validated @RequestBody ApiSalarySplitBatchSaveRequest request);
 }
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/salarysplit/ApiSalarySplitSummaryPageDto.java

@@ -84,6 +84,11 @@ public class ApiSalarySplitSummaryPageDto {
     private BigDecimal amount;
     private BigDecimal amount;
 
 
     /**
     /**
+     * 港币出账金额
+     */
+    private BigDecimal hkdAmount;
+
+    /**
      * 出账币种（原币种）
      * 出账币种（原币种）
      */
      */
     private String currency;
     private String currency;

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

@@ -26,6 +26,7 @@
         ss.bill_org,
         ss.bill_org,
         fa.status,
         fa.status,
         fa.amount,
         fa.amount,
+        fa.hkd_amount,
         fa.currency,
         fa.currency,
         DATE_FORMAT(fa.fortune_account_date, '%Y%m') as fortune_account_month
         DATE_FORMAT(fa.fortune_account_date, '%Y%m') as fortune_account_month
         from salary_split ss
         from salary_split ss