导出问题修复

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementTradeController.java

@@ -4,14 +4,12 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.dto.SettlementTradeDto;
 import com.sckw.payment.model.vo.req.SettlementTradeReq;
 import com.sckw.payment.model.vo.res.SettlementTradeVo;
 import com.sckw.payment.service.KwpSettlementTradeService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 结算-交易订单
@@ -91,7 +88,7 @@ public class KwpSettlementTradeController {
         settlementReq.check();
         settlementReq.setUnitType(TradeUnitType.PURCHASE);
         settlementReq.setUnitTypeTwo(TradeUnitType.SELL);
-        List<SettlementTradeDto> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
+        List<SettlementTradeVo> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
         return this.export(response, list);
     }
 
@@ -155,7 +152,7 @@ public class KwpSettlementTradeController {
         settlementReq.setUnitType(TradeUnitType.SELL);
         settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
         settlementReq.setEntId(LoginUserHolder.getEntId());
-        List<SettlementTradeDto> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
+        List<SettlementTradeVo> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
         return this.export(response, list);
     }
 
@@ -165,16 +162,11 @@ public class KwpSettlementTradeController {
      * @author Aick Spt
      * @date 2023-07-24 15:49
      */
-    private HttpResult export(HttpServletResponse response, List<SettlementTradeDto> list) {
+    private HttpResult export(HttpServletResponse response, List<SettlementTradeVo> list) {
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("暂无数据，请确认");
         }
-        List<SettlementTradeVo> collect = list.stream().map(a -> {
-            SettlementTradeVo settlementTradeVo = new SettlementTradeVo();
-            BeanUtils.copyProperties(a, settlementTradeVo);
-            return settlementTradeVo;
-        }).collect(Collectors.toList());
-        ExcelUtil.downData(response, SettlementTradeVo.class, collect);
+        ExcelUtil.downData(response, SettlementTradeVo.class, list);
         return null;
     }
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/SettlementTradeDto.java

@@ -103,6 +103,8 @@ public class SettlementTradeDto implements ISettlement {
     private String statusLabel;
     //客户企业名称
     private String firmName;
+    private String sellFirmName;
+    private String purchaseFirmName;
 
     /**
      * 创建人
@@ -134,6 +136,22 @@ public class SettlementTradeDto implements ISettlement {
     //百分比
     private String percentage;
 
+    public String getSellFirmName() {
+        return sellFirmName;
+    }
+
+    public void setSellFirmName(String sellFirmName) {
+        this.sellFirmName = sellFirmName;
+    }
+
+    public String getPurchaseFirmName() {
+        return purchaseFirmName;
+    }
+
+    public void setPurchaseFirmName(String purchaseFirmName) {
+        this.purchaseFirmName = purchaseFirmName;
+    }
+
     public String getContacts() {
         return contacts;
     }

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

@@ -19,11 +19,6 @@ import java.util.Date;
 @Setter
 @ExcelContext(fileName = "贸易结算订单列表", sheetName = "贸易结算订单列表")
 public class SettlementTradeVo {
-    /**
-     * 主键
-     */
-    @ExcelProperty(value = "主键")
-    private Long id;
 
     /**
      * 结算单编号
@@ -36,7 +31,11 @@ public class SettlementTradeVo {
      */
     @ExcelProperty(value = "名称")
     private String name;
-
+    /**
+     * 客户名称
+     */
+    @ExcelProperty(value = "客户名称")
+    private String firmName;
     /**
      * 对账金额
      */
@@ -56,73 +55,24 @@ public class SettlementTradeVo {
     @ExcelProperty(value = "预计收款日期")
     private Date receiptTime;
 
-    /**
-     * 备注
-     */
-    @ExcelProperty(value = "备注")
-    private String remark;
 
     /**
-     * 对账托运方财务联系人
+     * 财务联系人
      */
-    @ExcelProperty(value = "对账托运方财务联系人")
-    private String auditUser;
+    @ExcelProperty(value = "财务联系人")
+    private String contacts;
 
     /**
-     * 对账托运方财务联系人电话
+     * 联系人电话
      */
-    @ExcelProperty(value = "对账托运方财务联系人电话")
-    private String auditPhone;
-
-    /**
-     * 对账承运方财务联系人
-     */
-    @ExcelProperty(value = "对账承运方财务联系人")
-    private String successUser;
-
-    /**
-     * 对账承运方财务联系人电话
-     */
-    @ExcelProperty(value = "对账承运方财务联系人电话")
-    private String successPhone;
+    @ExcelProperty(value = "联系人电话")
+    private String phone;
 
 
     @ExcelProperty(value = "状态")
     private String statusLabel;
 
-    /**
-     * 创建人名称
-     */
-    @ExcelProperty(value = "创建人名称")
-    private String createByLabel;
 
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "创建时间")
-    private Date createTime;
-
-
-    /**
-     * 更新人名称
-     */
-    @ExcelProperty(value = "更新人名称")
-    private String updateByLabel;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "更新时间")
-    private Date updateTime;
-
-
-    /**
-     * 对账单名称
-     */
-    @ExcelProperty(value = "对账单名称")
-    private String ledgerName;
 
 
     /**
@@ -138,12 +88,6 @@ public class SettlementTradeVo {
     private String lLedgerNo;
 
 
-    /**
-     * 客户名称
-     */
-    @ExcelProperty(value = "客户名称")
-    private String firmName;
-
 
     /**
      * 实际应收还款
@@ -157,5 +101,17 @@ public class SettlementTradeVo {
     @ExcelProperty(value = "剩余待还款")
     private BigDecimal residuePrice;
 
+    /**
+     * 创建人名称
+     */
+    @ExcelProperty(value = "创建人名称")
+    private String createByLabel;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
 
 }

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

@@ -19,6 +19,7 @@ import com.sckw.payment.model.dto.*;
 import com.sckw.payment.model.vo.SettlementVo;
 import com.sckw.payment.model.vo.req.SettlementTradeReq;
 import com.sckw.payment.model.vo.res.SettlementSumVo;
+import com.sckw.payment.model.vo.res.SettlementTradeVo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
@@ -87,7 +88,7 @@ public class KwpSettlementTradeService {
      *
      * @param list 结算单列表数据
      */
-    private void changeDict(List<ISettlement> list) {
+    private void changeDict(List<? extends ISettlement> list) {
         //字典等数据转换
         Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.TRADE_TYPE.getType());
         for (ISettlement iSettlement : list) {
@@ -265,10 +266,10 @@ public class KwpSettlementTradeService {
         Integer payType = TradingEnum.getPrefix(trading);
         List<SettlementVo> settlementVoList = new ArrayList<>();
         if (Objects.nonNull(payType)) {
-            if(payType==TradingEnum.OFFLINE_PAY.getStatus()){
+            if (payType == TradingEnum.OFFLINE_PAY.getStatus()) {
                 settlementVoList = kwpSettlementOfflineService.queryList(id, SettlementOrderTypeEnum.TRADE.getStatus(), payType);
 
-            }else {
+            } else {
                 settlementVoList = kwpSettlementWalletService.queryList(id, SettlementOrderTypeEnum.TRADE.getStatus(), payType);
             }
         }
@@ -285,7 +286,23 @@ public class KwpSettlementTradeService {
         return settlementTradeMapper.sumMoneyType(entId, cur, pre, unitType);
     }
 
-    public List<SettlementTradeDto> exportList(SettlementTradeReq settlementReq, List<Long> idList) {
-        return settlementTradeMapper.exportList(settlementReq,idList);
+    public List<SettlementTradeVo> exportList(SettlementTradeReq settlementReq, List<Long> idList) {
+        List<SettlementTradeDto> settlementTradeDtos = settlementTradeMapper.exportList(settlementReq, idList);
+        if (CollectionUtils.isEmpty(settlementTradeDtos)) {
+            return null;
+        }
+        changeDict(settlementTradeDtos);
+        List<SettlementTradeVo> res = new ArrayList<>();
+        SettlementTradeVo settlementTradeVo;
+        for (SettlementTradeDto settlementTradeDto : settlementTradeDtos) {
+            settlementTradeVo = new SettlementTradeVo();
+            BeanUtils.copyProperties(settlementTradeDto, settlementTradeVo);
+            UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(settlementTradeDto.getCreateBy());
+            if (Objects.nonNull(userCacheResDto)) {
+                settlementTradeVo.setCreateByLabel(userCacheResDto.getName());
+            }
+            res.add(settlementTradeVo);
+        }
+        return res;
     }
 }