push

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

@@ -242,7 +242,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
                 "salarySplitBizId","salarySplitNo", "brokerName", "internalNumber", "team",
                 "salarySplitBizId","salarySplitNo", "brokerName", "internalNumber", "team",
                 "fromAmount", "toCurrency", "exchangeRate", "toAmount",
                 "fromAmount", "toCurrency", "exchangeRate", "toAmount",
                 "fortuneAccountDate", "fortuneAccountMonth", "billOrg",
                 "fortuneAccountDate", "fortuneAccountMonth", "billOrg",
-                "status", "amount", "hkdAmount", "currency"
+                "status", "hkdAmount", "currency"
         ));
         ));
         exportParam.setFileName("薪资拆分应发信息汇总");
         exportParam.setFileName("薪资拆分应发信息汇总");
         exportParam.setUploadToOss(true);
         exportParam.setUploadToOss(true);

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/excel/ApiSalarySplitSummaryExcelDto.java

@@ -2,23 +2,18 @@ package com.yd.csf.feign.dto.excel;
 
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 import lombok.Data;
-
 import java.math.BigDecimal;
 import java.math.BigDecimal;
-import java.util.Date;
 
 
 @Data
 @Data
 public class ApiSalarySplitSummaryExcelDto {
 public class ApiSalarySplitSummaryExcelDto {
 
 
-    @Excel(name = "薪资拆分应发表唯一业务ID", orderNum = "1")
-    private String salarySplitBizId;
-
     @Excel(name = "发放编号", orderNum = "1")
     @Excel(name = "发放编号", orderNum = "1")
     private String salarySplitNo;
     private String salarySplitNo;
 
 
-    @Excel(name = "转介人名称", orderNum = "2")
+    @Excel(name = "转介人", orderNum = "2")
     private String brokerName;
     private String brokerName;
 
 
-    @Excel(name = "转介人内部编号", orderNum = "3")
+    @Excel(name = "内部编号", orderNum = "3")
     private String internalNumber;
     private String internalNumber;
 
 
     @Excel(name = "所属团队", orderNum = "4")
     @Excel(name = "所属团队", orderNum = "4")
@@ -27,33 +22,28 @@ public class ApiSalarySplitSummaryExcelDto {
     @Excel(name = "原币种金额", orderNum = "5")
     @Excel(name = "原币种金额", orderNum = "5")
     private BigDecimal fromAmount;
     private BigDecimal fromAmount;
 
 
-    @Excel(name = "目标币种", orderNum = "6")
-    private String toCurrency;
+    @Excel(name = "原币种", orderNum = "6")
+    private String currency;
 
 
-    @Excel(name = "即时汇率", orderNum = "7")
+    @Excel(name = "汇率（原币种->目标币种）", orderNum = "7")
     private BigDecimal exchangeRate;
     private BigDecimal exchangeRate;
 
 
     @Excel(name = "目标金额", orderNum = "8")
     @Excel(name = "目标金额", orderNum = "8")
     private BigDecimal toAmount;
     private BigDecimal toAmount;
 
 
-    @Excel(name = "出账日期", format = "yyyy-MM-dd", orderNum = "9")
-    private Date fortuneAccountDate;
+    @Excel(name = "目标币种", orderNum = "9")
+    private String toCurrency;
 
 
-    @Excel(name = "出账月", orderNum = "10")
+    @Excel(name = "出账月（实）", orderNum = "10")
     private String fortuneAccountMonth;
     private String fortuneAccountMonth;
 
 
     @Excel(name = "出账机构", orderNum = "11")
     @Excel(name = "出账机构", orderNum = "11")
     private String billOrg;
     private String billOrg;
 
 
-    @Excel(name = "出账状态", orderNum = "12")
-    private String status;
-
-    @Excel(name = "出账总额", orderNum = "13")
-    private BigDecimal amount;
-
-    @Excel(name = "港币出账金额", orderNum = "14")
+    @Excel(name = "本期总出账金额（原币种）", orderNum = "12")
     private BigDecimal hkdAmount;
     private BigDecimal hkdAmount;
 
 
-    @Excel(name = "出账币种", orderNum = "15")
-    private String currency;
+    @Excel(name = "出账记录业务id", orderNum = "13")
+    private String fortuneAccountBizId;
+
 }
 }