导出问题修复

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/SettlementTradeVo.java

@@ -19,6 +19,11 @@ import java.util.Date;
 @Setter
 @ExcelContext(fileName = "贸易结算订单列表", sheetName = "贸易结算订单列表")
 public class SettlementTradeVo {
+    /**
+     * 对账单编号
+     */
+    @ExcelProperty(value = "对账单编号")
+    private String tLedgerNo;
 
     /**
      * 结算单编号
@@ -36,17 +41,7 @@ public class SettlementTradeVo {
      */
     @ExcelProperty(value = "客户名称")
     private String firmName;
-    /**
-     * 对账金额
-     */
-    @ExcelProperty(value = "对账金额")
-    private BigDecimal totalPrice;
 
-    /**
-     * 已收账款
-     */
-    @ExcelProperty(value = "已收账款")
-    private BigDecimal actualPrice;
 
     /**
      * 预计收款日期
@@ -73,39 +68,34 @@ public class SettlementTradeVo {
     private String statusLabel;
 
 
-
-
     /**
      * 交易方式
      */
     @ExcelProperty(value = "交易方式")
-    private String trading;
+    private String tradingLabel;
 
     /**
-     * 对账单编号
+     * 实际应收/元
      */
-    @ExcelProperty(value = "对账单编号")
-    private String lLedgerNo;
-
-
+    @ExcelProperty(value = "实际应收/元")
+    private BigDecimal totalPrice;
 
     /**
-     * 实际应收还款
+     * 当前收款/元
      */
-    @ExcelProperty(value = "实际应收还款")
-    private BigDecimal ledgerSettlePrice;
-
+    @ExcelProperty(value = "当前收款/元")
+    private BigDecimal actualPrice;
     /**
      * 剩余待还款
      */
     @ExcelProperty(value = "剩余待还款")
-    private BigDecimal residuePrice;
+    private BigDecimal waitPrice;
 
     /**
-     * 创建人名称
+     * 变更人
      */
-    @ExcelProperty(value = "创建人名称")
-    private String createByLabel;
+    @ExcelProperty(value = "变更人")
+    private String updateByLabel;
 
     /**
      * 创建时间

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementTradeService.java

@@ -297,9 +297,9 @@ public class KwpSettlementTradeService {
         for (SettlementTradeDto settlementTradeDto : settlementTradeDtos) {
             settlementTradeVo = new SettlementTradeVo();
             BeanUtils.copyProperties(settlementTradeDto, settlementTradeVo);
-            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(settlementTradeDto.getCreateBy());
+            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(settlementTradeDto.getUpdateBy());
             if (Objects.nonNull(userCacheResDto)) {
-                settlementTradeVo.setCreateByLabel(userCacheResDto.getName());
+                settlementTradeVo.setUpdateByLabel(userCacheResDto.getName());
             }
             res.add(settlementTradeVo);
         }

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementTradeMapper.xml

@@ -516,6 +516,8 @@
                (case
                     when #{settlementReq.unitType,jdbcType=INTEGER} = 1 then klt.audit_phone
                     else klt.success_phone end) as                phone,
+               kst.create_by                                      createBy,
+               kst.update_by                                      updateBy,
                kst.create_time,
                kst.t_ledger_id,
                klt.id                                             ledgerId,