From c5ea85558fea4d82b5368073c598a30f905c4bdc Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 23 十月 2026 17:11:49 +0800
Subject: [PATCH] feat:新增统计标注功能

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java |   71 ++++++++++++++++++++++++++---------
 1 files changed, 52 insertions(+), 19 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 a19180b..8c3e609 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
@@ -12,6 +12,7 @@
 import com.by4cloud.platformx.business.dto.ProductAddDTO;
 import com.by4cloud.platformx.business.dto.ProductQueryDTO;
 import com.by4cloud.platformx.business.dto.SyncProductDTO;
+import com.by4cloud.platformx.business.entity.BusinessCustomer;
 import com.by4cloud.platformx.business.vo.ProductExcelVO;
 import com.by4cloud.platformx.business.vo.ProductTreeVo;
 import com.by4cloud.platformx.common.core.util.R;
@@ -20,6 +21,11 @@
 import com.by4cloud.platformx.business.entity.Product;
 import com.by4cloud.platformx.business.service.ProductService;
 import com.by4cloud.platformx.common.security.annotation.Inner;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import com.github.yulichang.query.MPJLambdaQueryWrapper;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -60,24 +66,33 @@
     @GetMapping("/page" )
     @PreAuthorize("@pms.hasPermission('business_product_view')" )
     public R getProductPage(@ParameterObject Page page, @ParameterObject Product product) {
-        LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
-        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());
-		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);
+//		if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+//			MPJLambdaWrapper<Product> wrapper =new MPJLambdaWrapper<Product>()
+//					.selectAll(Product.class)
+//							.selectAs("ifnull((select product_name from product t1 where t1.id = t.parent_id),'鏍圭骇浜у搧')",Product::getParentName)
+//							.eq(product.getParentId()!=null,Product::getParentId,product.getParentId())
+//							.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName())
+//							.like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode())
+//							.like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode());
+//			List<String> smjList = new ArrayList<>();
+//			smjList.add(smj);
+////			smjList.add(smjsc);
+////			smjList.add(smjzt);
+//			smjList.add(smjhw);
+//			wrapper.in(Product::getCompId, smjList);
+//			wrapper.orderByDesc(Product::getCreateTime);
+//			return R.ok(productService.page(page, wrapper));
+//		}
+//		MPJLambdaWrapper<Product> wrapper =new MPJLambdaWrapper<Product>()
+//				.selectAll(Product.class)
+//				.selectAs("ifnull((select product_name from product t1 where t1.id = parent_id),'鏍圭骇浜у搧')",Product::getParentName)
+//				.eq(product.getParentId()!=null,Product::getParentId,product.getParentId())
+//				.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName())
+//				.like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode())
+//				.like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode());
+////				.eq(Product::getCompId,SecurityUtils.getUser().getCompId());
+//        return R.ok(productService.pageByScope(page, wrapper));
+		return R.ok(productService.pageScope(page,product));
     }
 
     /**
@@ -206,7 +221,7 @@
 	}
 
 	/**
-	 * 瀵煎叆閮ㄩ棬
+	 * 瀵煎叆浜у搧
 	 * @param excelVOList
 	 * @param bindingResult
 	 * @return
@@ -225,4 +240,22 @@
 	public R syncSMJByDate(@ParameterObject SyncProductDTO dto) {
 		return productService.syncSMJByDate(dto);
 	}
+
+	/**
+	 * 鐭崇叅鏈轰骇鍝佸悓姝�
+	 * @return
+	 */
+	@GetMapping("/pullProductData")
+	public R pullProductData() {
+		return productService.pullProductData();
+	}
+
+	/**
+	 * 鐭崇叅鏈轰骇鍝佸悓姝�
+	 * @return
+	 */
+	@GetMapping("/pullProductPage")
+	public R pullProductPage() {
+		return productService.pullProductPage();
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1