From a0974f04b5a83e3ab152ce79e53f180e7b496165 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 08 六月 2026 15:00:51 +0800
Subject: [PATCH] fix:发票管理模块
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
index a885b85..d6c38af 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
@@ -54,7 +54,19 @@
wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
wrapper.like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode());
wrapper.like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode());
- return R.ok(productService.page(page, wrapper));
+ wrapper.orderByDesc(Product::getCreateTime);
+ Page<Product> page1 = productService.pageByScope(page, wrapper);
+ List<Product> list = page1.getRecords();
+ for(Product product1 : list){
+ Product parent = productService.getById(product1.getParentId());
+ if(parent==null){
+ product1.setParentName("鏍圭骇浜у搧");
+ }else {
+ product1.setParentName(parent.getProductName());
+ }
+ }
+ page1.setRecords(list);
+ return R.ok(page1);
}
/**
@@ -68,7 +80,26 @@
@Inner(value = false)
public R getProductList(@ParameterObject Product product) {
LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
- return R.ok(productService.list(wrapper));
+ wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
+ wrapper.last("limit 20");
+ return R.ok(productService.listByScope(wrapper));
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param product 浜у搧淇℃伅
+ * @return
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ @GetMapping("/listByParentId" )
+ @PreAuthorize("@pms.hasPermission('business_product_view')" )
+ //@Inner(value = false)
+ public R getProductListByParentId(@ParameterObject Product product) {
+ LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
+ wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
+ wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
+ wrapper.last("limit 30");
+ return R.ok(productService.listByScope(wrapper));
}
/**
--
Gitblit v1.9.1