From 3d3284f5ba3eff6f92228e0703a4f5ace4cbf343 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 15 十二月 2025 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderTransferServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderTransferServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderTransferServiceImpl.java
index 431f37a..95b59ba 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderTransferServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderTransferServiceImpl.java
@@ -46,4 +46,22 @@
}
return tOrderTransferVos;
}
+
+ @Override
+ public List<TOrderTransferVo> pageListExport(OrderTransferQuery query) {
+ List<TOrderTransferVo> tOrderTransferVos = this.baseMapper.pageListExport(query);
+ for (TOrderTransferVo tOrderTransferVo : tOrderTransferVos) {
+ Integer newCompanyId = tOrderTransferVo.getNewCompanyId();
+ if(newCompanyId!=null){
+ TCompany tCompany = tCompanyMapper.selectById(newCompanyId);
+ tOrderTransferVo.setNewCompany(tCompany.getName());
+ }
+ Integer oldCompanyId = tOrderTransferVo.getOldCompanyId();
+ if(oldCompanyId!=null){
+ TCompany tCompany = tCompanyMapper.selectById(oldCompanyId);
+ tOrderTransferVo.setOldCompany(tCompany.getName());
+ }
+ }
+ return tOrderTransferVos;
+ }
}
--
Gitblit v1.7.1