push

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

@@ -309,7 +309,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
         ExportParam exportParam = new ExportParam();
         ExportParam exportParam = new ExportParam();
         // 指定需要导出的字段（字段名必须与 DTO 中的属性名一致）
         // 指定需要导出的字段（字段名必须与 DTO 中的属性名一致）
         exportParam.setFieldNames(Arrays.asList(
         exportParam.setFieldNames(Arrays.asList(
-                "salarySplitNo","brokerName","team","fromAmount",
+                "salarySplitNo","businessNo","brokerName","team","fromAmount",
                 "currency","exchangeRate","toAmount","toCurrency",
                 "currency","exchangeRate","toAmount","toCurrency",
                 "fortuneAccountMonth","billOrg","hkdAmount","fortuneAccountBizId"
                 "fortuneAccountMonth","billOrg","hkdAmount","fortuneAccountBizId"
         ));
         ));

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

@@ -10,6 +10,9 @@ public class ApiSalarySplitSummaryExcelDto {
     @Excel(name = "发放编号", orderNum = "1")
     @Excel(name = "发放编号", orderNum = "1")
     private String salarySplitNo;
     private String salarySplitNo;
 
 
+    @Excel(name = "业务编号", orderNum = "1")
+    private String businessNo;
+
     @Excel(name = "转介人", orderNum = "2")
     @Excel(name = "转介人", orderNum = "2")
     private String brokerName;
     private String brokerName;
 
 
@@ -43,7 +46,4 @@ public class ApiSalarySplitSummaryExcelDto {
     @Excel(name = "本期总出账金额（原币种）", orderNum = "12")
     @Excel(name = "本期总出账金额（原币种）", orderNum = "12")
     private BigDecimal hkdAmount;
     private BigDecimal hkdAmount;
 
 
-    @Excel(name = "出账业务编号", orderNum = "13")
-    private String businessNo;
-
 }
 }