From 45847670fea5d7354c2bfb4b53a321887271dcd4 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 11 六月 2026 17:26:00 +0800
Subject: [PATCH] feat:产品页面体验优化
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 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..d3c0ffa 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
@@ -1,11 +1,14 @@
package com.by4cloud.platformx.business.controller;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.vo.ProductTreeVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.Product;
@@ -54,7 +57,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);
}
/**
@@ -67,8 +82,23 @@
@PreAuthorize("@pms.hasPermission('business_product_view')" )
@Inner(value = false)
public R getProductList(@ParameterObject Product product) {
+ return R.ok(productService.getProductList(product));
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @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();
- return R.ok(productService.list(wrapper));
+ wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
+ wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
+ return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
}
/**
@@ -107,6 +137,9 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('business_product_add')" )
public R save(@RequestBody Product product) {
+ if (ArrayUtil.isNotEmpty(productService.listByScope(Wrappers.lambdaQuery(product).eq(Product::getErpCode,product.getErpCode())).toArray())){
+ return R.failed("浜у搧Erp缂栫爜宸插瓨鍦�");
+ }
return R.ok(productService.save(product));
}
--
Gitblit v1.9.1