From 84344f16a7f783cd32731764010a75a0af268384 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 08 四月 2026 11:32:37 +0800
Subject: [PATCH] feat:同步烜曌工贸（gongchunyi-26/4/3）
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 2358caf..e3413e2 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -17,7 +16,6 @@
import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import io.swagger.annotations.Api;
@@ -33,11 +31,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
/**
* 閲囪喘鍙拌处Controller
@@ -128,8 +124,8 @@
@PostMapping("/export")
public void export(HttpServletResponse response, PurchaseLedger purchaseLedger) {
List<PurchaseLedger> list = purchaseLedgerService.selectPurchaseLedgerList(purchaseLedger);
- ExcelUtil<PurchaseLedger> util = new ExcelUtil<PurchaseLedger>(PurchaseLedger.class);
- util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
+ ExcelUtil<PurchaseLedger> util = new ExcelUtil<>(PurchaseLedger.class);
+ util.exportExcel(response, list, "閲囪喘鍙拌处鏁版嵁");
}
/**
@@ -160,8 +156,11 @@
*/
@ApiOperation("/鏌ヨ閲囪喘妯℃澘")
@GetMapping("/getPurchaseTemplateList")
- public AjaxResult getPurchaseTemplateList() {
- List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
+ public AjaxResult getPurchaseTemplateList(@RequestParam(required = false) Integer templateType) {
+ if (templateType == null){
+ return AjaxResult.success(new ArrayList<>());
+ }
+ List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(new LambdaQueryWrapper<PurchaseLedgerTemplate>().eq(PurchaseLedgerTemplate::getTemplateType,templateType));
purchaseLedgers.forEach(purchaseLedgerDto1 -> {
LambdaQueryWrapper<SalesLedgerProductTemplate> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SalesLedgerProductTemplate::getSalesLedgerId, purchaseLedgerDto1.getId())
--
Gitblit v1.9.3