push

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

@@ -53,10 +53,15 @@ public class ApiSalarySplitSummaryPageDto {
      */
      */
     private String toCurrency;
     private String toCurrency;
 
 
+//    /**
+//     * 即时汇率（原币种->目标币种)（查询原出账币种兑目标币种汇率，可修改）
+//     */
+//    private BigDecimal exchangeRate;
+
     /**
     /**
-     * 即时汇率（原币种->目标币种)（查询原出账币种兑目标币种汇率，可修改）
+     * 即时汇率（原币种->目标币种)（查询原出账币种兑目标币种汇率，可修改）字符串  例：100%
      */
      */
-    private BigDecimal exchangeRate;
+    private String exchangeRate;
 
 
     /**
     /**
      * 目标金额
      * 目标金额

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

@@ -21,7 +21,7 @@
         fa.team,
         fa.team,
         ss.from_amount,
         ss.from_amount,
         ss.to_currency,
         ss.to_currency,
-        ss.exchange_rate,
+        concat(ss.exchange_rate, '%') as exchangeRate,
         ss.to_amount,
         ss.to_amount,
         fa.fortune_account_date,
         fa.fortune_account_date,
         ss.bill_org,
         ss.bill_org,