From 5024682a739495a9546803188af8b203c6ad8a18 Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期五, 08 五月 2026 14:13:11 +0800
Subject: [PATCH] 客商、销售员、产品、排产计划后台加入list列表,产品加入treeList接口
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java | 12 ++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java | 63 +++++++++++++++++++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 28 +++++++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java | 4 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java | 1
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java | 17 ++++-
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductionPlanController.java | 12 ++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SalesManController.java | 13 ++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java | 4 +
9 files changed, 150 insertions(+), 4 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
index 02bc9c3..4f4e2a1 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
@@ -95,4 +95,8 @@
@Column(columnDefinition = "bigint comment '鎵�灞炲尯鍩烮d'")
private Long areaId;
+ @Schema(description = "鎵�灞炲尯鍩�")
+ @Column(columnDefinition = "bigint comment '鎵�灞炲尯鍩�'")
+ private Long areaName;
+
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
index 02b1358..dcc7e51 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
@@ -1,12 +1,16 @@
package com.by4cloud.platformx.business.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
import lombok.Data;
import org.hibernate.annotations.Comment;
import jakarta.persistence.Table;
+
+import java.util.List;
/**
* @author wjli
@@ -39,7 +43,14 @@
@Column(columnDefinition = "double default 0.00 comment '绋庣巼'")
private Double taxRate;
- @Schema(description = "鍒嗙被ID")
- @Column(columnDefinition = "bigint comment '鍒嗙被ID'")
- private Long categoryId;
+ @Schema(description = "鐖禝D")
+ @Column(columnDefinition = "bigint comment '鐖禝D'")
+ private Long parentId;
+
+ /**
+ * 鏍囩殑鐗�
+ */
+ @Transient
+ @TableField(exist = false)
+ private List<Product> children;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java
index b0ac3de..8f8d6c0 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java
@@ -35,5 +35,4 @@
@Column(columnDefinition = "VARCHAR(20) comment '鑱旂郴鐢佃瘽'")
private String phone;
-
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
index bca111a..d620e85 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
@@ -51,6 +51,18 @@
return R.ok(businessCustomerService.page(page, wrapper));
}
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param businessCustomer 瀹㈠晢淇℃伅
+ * @return
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ @GetMapping("/list" )
+ @PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" )
+ public R getBusinessCustomerList(@ParameterObject BusinessCustomer businessCustomer) {
+ LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery();
+ return R.ok(businessCustomerService.list(wrapper));
+ }
/**
* 閫氳繃id鏌ヨ瀹㈠晢淇℃伅
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 4b74887..a4666aa 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
@@ -9,6 +9,7 @@
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.Product;
import com.by4cloud.platformx.business.service.ProductService;
+import com.by4cloud.platformx.common.security.annotation.Inner;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -51,6 +52,33 @@
return R.ok(productService.page(page, wrapper));
}
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param product 浜у搧淇℃伅
+ * @return
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ @GetMapping("/list" )
+ @PreAuthorize("@pms.hasPermission('business_product_view')" )
+ @Inner(value = false)
+ public R getProductList(@ParameterObject Product product) {
+ LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
+ return R.ok(productService.list(wrapper));
+ }
+
+ /**
+ * 灞傜骇鏌ヨ
+ * @param product 鍟嗗搧琛�
+ * @return
+ */
+ @Operation(summary = "灞傜骇鏌ヨ" , description = "灞傜骇鏌ヨ" )
+ @GetMapping("/treeList" )
+ //@PreAuthorize("@pms.hasPermission('business_product_view')" )
+ @Inner(value = false)
+ public R getNewsCategoryTree(@ParameterObject Product product) {
+ return R.ok(productService.treeList(product.getParentId(), product.getProductName()));
+ }
+
/**
* 閫氳繃id鏌ヨ浜у搧淇℃伅
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductionPlanController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductionPlanController.java
index ec8281b..838530c 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductionPlanController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductionPlanController.java
@@ -51,6 +51,18 @@
return R.ok(productionPlanService.page(page, wrapper));
}
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param productionPlan 鎺掍骇璁″垝
+ * @return
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ @GetMapping("/list" )
+ @PreAuthorize("@pms.hasPermission('business_productionPlan_view')" )
+ public R getProductionPlanList(@ParameterObject ProductionPlan productionPlan) {
+ LambdaQueryWrapper<ProductionPlan> wrapper = Wrappers.lambdaQuery();
+ return R.ok(productionPlanService.list(wrapper));
+ }
/**
* 閫氳繃id鏌ヨ鎺掍骇璁″垝
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SalesManController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SalesManController.java
index e2a33e7..853201b 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SalesManController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SalesManController.java
@@ -51,6 +51,19 @@
return R.ok(salesManService.page(page, wrapper));
}
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param salesMan 閿�鍞汉鍛�
+ * @return
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ @GetMapping("/list" )
+ @PreAuthorize("@pms.hasPermission('business_salesMan_view')" )
+ public R getSalesManList(@ParameterObject SalesMan salesMan) {
+ LambdaQueryWrapper<SalesMan> wrapper = Wrappers.lambdaQuery();
+ return R.ok(salesManService.list(wrapper));
+ }
+
/**
* 閫氳繃id鏌ヨ閿�鍞汉鍛�
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java
index 302b1ca..5a42c73 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ProductService.java
@@ -1,8 +1,12 @@
package com.by4cloud.platformx.business.service;
+import cn.hutool.core.lang.tree.Tree;
import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.business.entity.Product;
+import java.util.List;
+
public interface ProductService extends IService<Product> {
+ List<Tree<Long>> treeList(Long parentId, String productName);
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
index b389286..f90c637 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
@@ -1,10 +1,24 @@
package com.by4cloud.platformx.business.service.impl;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNode;
+import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.business.entity.Product;
import com.by4cloud.platformx.business.mapper.ProductMapper;
import com.by4cloud.platformx.business.service.ProductService;
+import jakarta.validation.constraints.NotNull;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
/**
* 浜у搧淇℃伅
*
@@ -13,4 +27,53 @@
*/
@Service
public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
+ @Override
+ public List<Tree<Long>> treeList(Long parentId, String productName) {
+ Long parent = parentId == null ? 0l : parentId;
+
+ List<TreeNode<Long>> collect = baseMapper
+ .selectList(Wrappers.<Product>lambdaQuery()
+ .like(StrUtil.isNotBlank(productName), Product::getProductName, productName)
+ .orderByAsc(Product::getCreateTime))
+ .stream().map(getNodeFunction()).collect(Collectors.toList());
+
+ // 妯＄硦鏌ヨ 涓嶇粍瑁呮爲缁撴瀯 鐩存帴杩斿洖 琛ㄦ牸鏂逛究缂栬緫
+ if (StrUtil.isNotBlank(productName)) {
+ return collect.stream().map(node -> {
+ Tree<Long> tree = new Tree<>();
+ tree.putAll(node.getExtra());
+ BeanUtils.copyProperties(node, tree);
+ return tree;
+ }).collect(Collectors.toList());
+ }
+
+ return TreeUtil.build(collect, parent);
+ }
+
+ @NotNull
+ private Function<Product, TreeNode<Long>> getNodeFunction() {
+ return product -> {
+ TreeNode<Long> node = new TreeNode<>();
+ node.setId(product.getId());
+ node.setName(product.getProductName());
+ node.setParentId(product.getParentId());
+ node.setWeight(product.getParentId());
+ // 鎵╁睍灞炴��
+ Map<String, Object> extra = new HashMap<>();
+// extra.put("picPath", category.getPicPath());
+// extra.put("Type", category.getType());
+// extra.put("isShow", category.getIsShow());
+// extra.put("iconPicPath", category.getIconPath());
+// extra.put("status", category.getStatus());
+
+ // 閫傞厤 vue3
+ Map<String, Object> meta = new HashMap<>();
+ meta.put("title", product.getProductName());
+ meta.put("icon", product.getPrice());
+
+ extra.put("meta", meta);
+ node.setExtra(extra);
+ return node;
+ };
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1