From 0b3cbc9c80c5544bfc0f9aeea8a89141dd5abe0d Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 08 一月 2026 18:49:27 +0800
Subject: [PATCH] 调整-查询采购台账列表接口，查询采购模板接口
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 17 +++++++++++------
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 3 +++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 7370882..6a507bc 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -94,16 +94,18 @@
*/
@GetMapping("/getPurchaseTemplateList")
public AjaxResult getPurchaseTemplateList() {
- IPage<PurchaseLedgerDto> purchaseLedgerDtoIPage = purchaseLedgerService.selectPurchaseLedgerListPage(new Page(1, -1), new PurchaseLedgerDto());
+ PurchaseLedgerDto purchaseLedgerDto = new PurchaseLedgerDto();
+ purchaseLedgerDto.setApprovalStatus(3);
+ IPage<PurchaseLedgerDto> purchaseLedgerDtoIPage = purchaseLedgerService.selectPurchaseLedgerListPage(new Page(1, -1), purchaseLedgerDto);
List<PurchaseLedgerDto> purchaseLedgers = purchaseLedgerDtoIPage.getRecords();
- purchaseLedgers = purchaseLedgers.stream().filter(purchaseLedger -> purchaseLedger.getApprovalStatus() == 3).collect(Collectors.toList());
- purchaseLedgers.forEach(purchaseLedgerDto -> {
+ purchaseLedgers.forEach(purchaseLedgerDto1 -> {
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedgerDto.getId());
+ queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedgerDto1.getId())
+ .eq(SalesLedgerProduct::getType, 2);
List<SalesLedgerProduct> list = salesLedgerProductService.list(queryWrapper);
if (!list.isEmpty()) {
- purchaseLedgerDto.setProductData(list);
+ purchaseLedgerDto1.setProductData(list);
}
});
return AjaxResult.success(purchaseLedgers);
@@ -186,7 +188,10 @@
*/
@GetMapping("/listPage")
public AjaxResult listPage(Page page, PurchaseLedgerDto purchaseLedger) {
- return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page ,purchaseLedger));
+ IPage<PurchaseLedgerDto> purchaseLedgerDtoIPage = purchaseLedgerService.selectPurchaseLedgerListPage(page ,purchaseLedger);
+ //杩囨护鎺塧pprovalStatus=3鐨勮褰�
+ purchaseLedgerDtoIPage.getRecords().removeIf(purchaseLedgerDto -> purchaseLedgerDto.getApprovalStatus() == 3);
+ return AjaxResult.success(purchaseLedgerDtoIPage);
}
@ApiOperation("鐢熸垚閲囪喘搴忓垪鍙�")
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 8eb9370..2dba9c8 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -39,6 +39,9 @@
<if test="c.supplierName != null and c.supplierName != ''">
and pl.supplier_name like concat('%',#{c.supplierName},'%')
</if>
+ <if test="c.ApprovalStatus != null and c.ApprovalStatus != ''">
+ and pl.approval_status = #{c.ApprovalStatus}
+ </if>
<if test="c.salesContractNo != null and c.salesContractNo != ''">
and pl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
</if>
--
Gitblit v1.9.3