From dfcd8b37f532ef54b259c1e716e7a2660951ae57 Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期六, 09 五月 2026 10:19:25 +0800
Subject: [PATCH] 客商、销售员、产品、排产计划后台部分字段和方法的调整
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java | 4 ++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java | 10 +++++-----
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 5 +++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java | 6 +++++-
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductionPlanController.java | 5 +++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/SalesManController.java | 3 +++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java | 14 ++++++++++----
7 files changed, 37 insertions(+), 10 deletions(-)
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 dcc7e51..ecfa3ea 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
@@ -43,8 +43,12 @@
@Column(columnDefinition = "double default 0.00 comment '绋庣巼'")
private Double taxRate;
+ @Schema(description = "绋庢敹鍒嗙被")
+ @Column(columnDefinition = "VARCHAR(50) comment '绋庢敹鍒嗙被'")
+ private String taxClass;
+
@Schema(description = "鐖禝D")
- @Column(columnDefinition = "bigint comment '鐖禝D'")
+ @Column(columnDefinition = "bigint default 0 comment '鐖禝D'")
private Long parentId;
/**
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java
index 504cc46..58f98e3 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java
@@ -43,19 +43,19 @@
@Schema(description = "鐢叉柟id")
@Column(columnDefinition = "bigint comment '鐢叉柟id'")
- private Long partyAId;
+ private Long partyaid;
@Schema(description = "鐢叉柟鍚嶇О")
@Column(columnDefinition = "VARCHAR(100) comment '鐢叉柟鍚嶇О'")
- private String partyA;
+ private String partya;
@Schema(description = "涔欐柟id")
@Column(columnDefinition = "bigint comment '涔欐柟id'")
- private Long partyBId;
+ private Long partybid;
@Schema(description = "涔欐柟鍚嶇О")
@Column(columnDefinition = "VARCHAR(100) comment '涔欐柟鍚嶇О'")
- private String partyB;
+ private String partyb;
@Schema(description = "閲戦")
@Column(columnDefinition = "double comment '閲戦'")
@@ -109,6 +109,12 @@
@Column(columnDefinition = "datetime comment '瀹℃壒鏃堕棿'")
private String approveTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @Schema(description = "杞垚鍚堝悓鏃堕棿")
+ @Column(columnDefinition = "datetime comment '杞垚鍚堝悓鏃堕棿'")
+ private String contractTime;
+
/**
* 鏍囩殑鐗�
*/
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 d620e85..1e94694 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
@@ -2,6 +2,7 @@
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;
@@ -48,6 +49,9 @@
@PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" )
public R getBusinessCustomerPage(@ParameterObject Page page, @ParameterObject BusinessCustomer businessCustomer) {
LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(businessCustomer.getIndustryId()!=null,BusinessCustomer::getIndustryId,businessCustomer.getIndustryId());
+ wrapper.eq(businessCustomer.getAreaId()!=null,BusinessCustomer::getAreaId,businessCustomer.getAreaId());
+ wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName());
return R.ok(businessCustomerService.page(page, wrapper));
}
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 a4666aa..a885b85 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
@@ -2,6 +2,7 @@
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;
@@ -49,6 +50,10 @@
@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());
return R.ok(productService.page(page, wrapper));
}
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 838530c..d925735 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
@@ -2,6 +2,7 @@
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;
@@ -48,6 +49,10 @@
@PreAuthorize("@pms.hasPermission('business_productionPlan_view')" )
public R getProductionPlanPage(@ParameterObject Page page, @ParameterObject ProductionPlan productionPlan) {
LambdaQueryWrapper<ProductionPlan> wrapper = Wrappers.lambdaQuery();
+ wrapper.like(StrUtil.isNotEmpty(productionPlan.getProductionPlanName()),ProductionPlan::getProductionPlanName,productionPlan.getProductionPlanName());
+ wrapper.eq(productionPlan.getPartyaid()!=null,ProductionPlan::getPartyaid,productionPlan.getPartyaid());
+ wrapper.eq(productionPlan.getPartybid()!=null,ProductionPlan::getPartybid,productionPlan.getPartybid());
+ wrapper.eq(productionPlan.getStatus()!=null,ProductionPlan::getStatus,productionPlan.getStatus());
return R.ok(productionPlanService.page(page, wrapper));
}
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 853201b..bb202fa 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
@@ -2,6 +2,7 @@
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;
@@ -48,6 +49,8 @@
@PreAuthorize("@pms.hasPermission('business_salesMan_view')" )
public R getSalesManPage(@ParameterObject Page page, @ParameterObject SalesMan salesMan) {
LambdaQueryWrapper<SalesMan> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(salesMan.getCustomerId()!=null,SalesMan::getCustomerId,salesMan.getCustomerId());
+ wrapper.like(StrUtil.isNotEmpty(salesMan.getSalesName()),SalesMan::getSalesName,salesMan.getSalesName());
return R.ok(salesManService.page(page, wrapper));
}
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 f90c637..75b1d87 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
@@ -57,7 +57,7 @@
node.setId(product.getId());
node.setName(product.getProductName());
node.setParentId(product.getParentId());
- node.setWeight(product.getParentId());
+ //node.setWeight(product.getParentId());
// 鎵╁睍灞炴��
Map<String, Object> extra = new HashMap<>();
// extra.put("picPath", category.getPicPath());
@@ -68,11 +68,11 @@
// 閫傞厤 vue3
Map<String, Object> meta = new HashMap<>();
- meta.put("title", product.getProductName());
- meta.put("icon", product.getPrice());
+ /* meta.put("title", product.getProductName());
+ meta.put("icon", product.getPrice());*/
- extra.put("meta", meta);
- node.setExtra(extra);
+ //extra.put("meta", meta);
+ //node.setExtra(extra);
return node;
};
}
--
Gitblit v1.9.1