From 5b73f899c41957496ee0e4257a8e8bd38fc51d37 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 九月 2026 14:50:10 +0800
Subject: [PATCH] 天津-智科电子 1.协同办公-协同审批：待审批节点，第三人账号不可进行修改 2.营销管理-销售台账：勾选单个导出会出现整个导出的情况，但只能显示父项、不能显示子项 3.营销管理-销售台账：点击下拉没有价格，点击详情有价格
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index ea18246..1e10092 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -15,8 +15,11 @@
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ICommonFileService;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
+import com.ruoyi.sales.vo.SalesLedgerExportVo;
import com.ruoyi.sales.vo.SalesLedgerVo;
import io.swagger.annotations.ApiParam;
import io.swagger.v3.oas.annotations.Operation;
@@ -52,6 +55,7 @@
private ISalesLedgerService salesLedgerService;
private ICommonFileService commonFileService;
+ private final ISalesLedgerProductService salesLedgerProductService;
private final FileUtil fileUtil;
/**
@@ -127,20 +131,35 @@
}
/**
- * 瀵煎嚭閿�鍞彴璐﹀垪琛�
+ * 瀵煎嚭閿�鍞彴璐﹀垪琛ㄣ��
+ * 浼犱簡 ids 鍙鍕鹃�夌殑鍙拌处锛屽惁鍒欐寜鎼滅储鏉′欢瀵煎嚭鍏ㄩ儴锛涘鍑哄唴瀹逛负鐖堕」锛堝彴璐︼級涓庡瓙椤癸紙浜у搧锛夊垎琛屻��
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
- Page page = new Page(-1,-1);
- IPage<SalesLedgerVo> salesLedgerIPage = listPage(page, salesLedgerDto);
- ExcelUtil<SalesLedgerVo> util = new ExcelUtil<SalesLedgerVo>(SalesLedgerVo.class);
- if(salesLedgerIPage == null){
- util.exportExcel(response, new ArrayList<>(), "閿�鍞彴璐︽暟鎹�");
- return;
+ Page page = new Page(-1, -1);
+ IPage<SalesLedgerVo> salesLedgerIPage = salesLedgerService.selectSalesLedgerListPage(page, salesLedgerDto);
+
+ List<SalesLedgerExportVo> rows = new ArrayList<>();
+ if (salesLedgerIPage != null && !CollectionUtils.isEmpty(salesLedgerIPage.getRecords())) {
+ for (SalesLedgerVo ledger : salesLedgerIPage.getRecords()) {
+ SalesLedgerExportVo row = SalesLedgerExportVo.fromLedger(ledger);
+
+ SalesLedgerProduct productQuery = new SalesLedgerProduct();
+ productQuery.setSalesLedgerId(ledger.getId());
+ productQuery.setType(1);
+ List<SalesLedgerProduct> products = salesLedgerProductService.selectSalesLedgerProductList(productQuery);
+ if (!CollectionUtils.isEmpty(products)) {
+ for (SalesLedgerProduct product : products) {
+ row.addProduct(product);
+ }
+ }
+ rows.add(row);
+ }
}
- List<SalesLedgerVo> list = salesLedgerIPage.getRecords();
- util.exportExcel(response, list, "閿�鍞彴璐︽暟鎹�");
+
+ ExcelUtil<SalesLedgerExportVo> util = new ExcelUtil<SalesLedgerExportVo>(SalesLedgerExportVo.class);
+ util.exportExcel(response, rows, "閿�鍞彴璐︽暟鎹�");
}
/**
--
Gitblit v1.9.3