From c54f243c9a13ce53e7dc3f7823f585466eab0bd1 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 01 十二月 2025 09:53:28 +0800
Subject: [PATCH] yys 替换ip
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index c384520..a6f33b1 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -15,23 +16,19 @@
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
-import com.ruoyi.sales.pojo.InvoiceLedger;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
-import com.ruoyi.sales.pojo.ReceiptPayment;
-import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.ICommonFileService;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -46,6 +43,9 @@
public class SalesLedgerController extends BaseController {
private ISalesLedgerService salesLedgerService;
+
+ @Autowired
+ private ISalesLedgerProductService salesLedgerProductService;
private ICommonFileService commonFileService;
@@ -198,6 +198,18 @@
*/
@GetMapping("/listPage")
public IPage<SalesLedger> listPage(Page page, SalesLedgerDto salesLedgerDto) {
+ Set<Long> ids = new HashSet<>();
+ if(!StringUtils.isEmpty(salesLedgerDto.getProductCategory())){
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductService.getBaseMapper().selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getType, 1)
+ .like(SalesLedgerProduct::getProductCategory, salesLedgerDto.getProductCategory())
+ .select(SalesLedgerProduct::getSalesLedgerId));
+ ids = salesLedgerProducts.stream().map(SalesLedgerProduct::getSalesLedgerId).collect(Collectors.toSet());
+ if(CollectionUtils.isEmpty(ids)){
+ throw new BaseException("鏆傛棤鏌ュ埌姝や骇鍝佸ぇ绫绘垨姝や骇鍝佸ぇ绫绘棤閿�鍞暟鎹紝璇蜂粩缁嗘鏌ワ紒");
+ }
+ }
+ salesLedgerDto.setIds(ids);
IPage<SalesLedger> iPage = salesLedgerService.selectSalesLedgerListPage(page,salesLedgerDto);
// 璁＄畻宸插紑绁ㄩ噾棰�/鏈紑绁ㄩ噾棰�(宸插～鍐欏彂绁ㄩ噾棰濅负鍑�)
if(CollectionUtils.isEmpty(iPage.getRecords())){
--
Gitblit v1.9.3