From 72585fb117463bf6f26324b7e8e139c86d13c7ba Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期三, 13 五月 2026 17:38:03 +0800
Subject: [PATCH] 开会后对客商排产计划，销售人员的整体修改
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java | 1
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java | 2 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java | 4 +-
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductionPlanController.java | 5 ++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java | 38 +++++++++++-------
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java | 50 +++++++++++++++++--------
6 files changed, 67 insertions(+), 33 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 4f4e2a1..8706068 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
@@ -27,15 +27,15 @@
@Column(columnDefinition = "VARCHAR(100) comment '浼佷笟鍚嶇О'")
private String companyName;
- @Schema(description = "鍏徃绫诲瀷")
- @Column(columnDefinition = "VARCHAR(50) comment '鍏徃绫诲瀷'")
- private String companyType;
+// @Schema(description = "鍏徃绫诲瀷")
+// @Column(columnDefinition = "VARCHAR(50) comment '鍏徃绫诲瀷'")
+// private String companyType;
@Schema(description = "娉曞畾浠ｈ〃浜�")
@Column(columnDefinition = "VARCHAR(20) comment '娉曞畾浠ｈ〃浜�'")
private String legalPerson;
- @Schema(description = "娉ㄥ唽璧勬湰")
+/* @Schema(description = "娉ㄥ唽璧勬湰")
@Column(columnDefinition = "VARCHAR(30) comment '娉ㄥ唽璧勬湰'")
private String registeredCapital;
@@ -57,11 +57,11 @@
@Schema(description = "绛惧彂鏃ユ湡")
@Column(columnDefinition = "VARCHAR(20) comment '绛惧彂鏃ユ湡'")
- private String issueDate;
+ private String issueDate;*/
- @Schema(description = "鐘舵��")
+/* @Schema(description = "鐘舵��")
@Column(columnDefinition = "VARCHAR(20) default '姝ｅ父' comment '鐘舵��'")
- private String status;
+ private String status;*/
@Schema(description = "琛屼笟Id")
@Column(columnDefinition = "VARCHAR(50) comment '琛屼笟Id'")
@@ -71,25 +71,35 @@
@Column(columnDefinition = "VARCHAR(50) comment '琛屼笟'")
private String industry;
+ // 鐓ょ偔銆佹湁鑹层�侀粦鑹层�佺數鍔涖�佸叾瀹冦�佹哀鍖栭摑銆佸寲宸ャ�佹按娉ャ�佽埞杩�
+
+ @Schema(description = "寮�鎴烽摱琛�")
+ @Column(columnDefinition = "VARCHAR(20) comment '寮�鎴烽摱琛�'")
+ private String bankName;
+
+ @Schema(description = "閾惰璐﹀彿")
+ @Column(columnDefinition = "VARCHAR(50) comment '閾惰璐﹀彿'")
+ private String bankAccount;
+
@Schema(description = "鑱旂郴鐢佃瘽")
@Column(columnDefinition = "VARCHAR(20) comment '鑱旂郴鐢佃瘽'")
private String contactPhone;
- @Schema(description = "閭")
+/* @Schema(description = "閭")
@Column(columnDefinition = "VARCHAR(50) comment '閭'")
- private String email;
+ private String email;*/
@Schema(description = "鐪�")
@Column(columnDefinition = "VARCHAR(50) comment '鐪�'")
private String province;
- @Schema(description = "甯�")
- @Column(columnDefinition = "VARCHAR(50) comment '甯�'")
- private String city;
-
- @Schema(description = "鍖�")
- @Column(columnDefinition = "VARCHAR(50) comment '鍖�'")
- private String district;
+// @Schema(description = "甯�")
+// @Column(columnDefinition = "VARCHAR(50) comment '甯�'")
+// private String city;
+//
+// @Schema(description = "鍖�")
+// @Column(columnDefinition = "VARCHAR(50) comment '鍖�'")
+// private String district;
@Schema(description = "鎵�灞炲尯鍩烮d")
@Column(columnDefinition = "bigint comment '鎵�灞炲尯鍩烮d'")
@@ -99,4 +109,12 @@
@Column(columnDefinition = "bigint comment '鎵�灞炲尯鍩�'")
private Long areaName;
+ @Schema(description = "甯傚満绫诲瀷Id")
+ @Column(columnDefinition = "bigint comment '甯傚満绫诲瀷Id'")
+ private Long classId;
+
+ @Schema(description = "甯傚満绫诲瀷")
+ @Column(columnDefinition = "bigint comment '甯傚満绫诲瀷'")
+ private Long className;
+
}
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 5ebd342..8de5aac 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
@@ -39,9 +39,9 @@
@Column(columnDefinition = "VARCHAR(50) comment '浜у搧鍨嬪彿'")
private String productType;
- @Schema(description = "浜у搧浠锋牸")
+ /* @Schema(description = "浜у搧浠锋牸")
@Column(columnDefinition = "double comment '浜у搧浠锋牸'")
- private Double price;
+ private Double price;*/
@Schema(description = "绋庣巼锛堢櫨鍒嗘瘮锛屽13琛ㄧず13%锛�")
@Column(columnDefinition = "double default 0.00 comment '绋庣巼'")
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 58f98e3..809bce0 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
@@ -25,13 +25,17 @@
@Comment("鎺掍骇璁″垝")
public class ProductionPlan extends BaseModel<BusinessCustomer> {
- @Schema(description = "鎵�灞炲悎鍚岀紪鍙�")
+ /*@Schema(description = "鎵�灞炲悎鍚岀紪鍙�")
@Column(columnDefinition = "VARCHAR(64) comment '鍚堝悓缂栧彿'")
private String contractNo;
@Schema(description = "鎵�灞炲悎鍚屽悕绉�")
@Column(columnDefinition = "VARCHAR(200) comment '鍚堝悓鍚嶇О'")
- private String contractName;
+ private String contractName;*/
+
+ @Schema(description = "鍚堝悓id")
+ @Column(columnDefinition = "bigint comment '鍚堝悓id'")
+ private Long contractId;
@Schema(description = "鎺掍骇璁″垝缂栧彿")
@Column(columnDefinition = "VARCHAR(64) comment '鎺掍骇璁″垝缂栧彿'")
@@ -57,7 +61,7 @@
@Column(columnDefinition = "VARCHAR(100) comment '涔欐柟鍚嶇О'")
private String partyb;
- @Schema(description = "閲戦")
+/* @Schema(description = "閲戦")
@Column(columnDefinition = "double comment '閲戦'")
private Double amount;
@@ -67,21 +71,25 @@
@Schema(description = "绫诲瀷锛�0-鐢熸垚寮� 1-澶囨寮忥級")
@Column(columnDefinition = "tinyint(2) default 0 comment '绫诲瀷'")
- private Integer contractType;
+ private Integer contractType;*/
- @Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬")
+ /*@Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬")
@Column(columnDefinition = "tinyint(2) default 0 comment '渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬'")
- private Integer supplyAttribute;
+ private Integer supplyAttribute;*/
@Schema(description = "璁″垝鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級")
@Column(columnDefinition = "tinyint(2) default 0 comment '璁″垝鐘舵��'")
private Integer status;
- @Schema(description = "鏈嶅姟灞炴�э紙0-浜у搧閿�鍞� 1-鏃犲舰鏈嶅姟锛�")
- @Column(columnDefinition = "tinyint(2) default 0 comment '鏈嶅姟灞炴��'")
- private Integer attribute;
+ @Schema(description = "鏄惁鎺ㄩ�乪rp锛�0-娌℃湁 1-鎺ㄩ�侊級")
+ @Column(columnDefinition = "tinyint(2) default 0 comment '鏄惁鎺ㄩ�乪rp锛�0-娌℃湁 1-鎺ㄩ�侊級'")
+ private Integer sendErp;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ /*@Schema(description = "鏈嶅姟灞炴�э紙0-浜у搧閿�鍞� 1-鏃犲舰鏈嶅姟锛�")
+ @Column(columnDefinition = "tinyint(2) default 0 comment '鏈嶅姟灞炴��'")
+ private Integer attribute;*/
+
+ /* @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "绛剧讲鏃ユ湡")
@Column(columnDefinition = "VARCHAR(64) comment '绛剧讲鏃ユ湡'")
@@ -97,23 +105,23 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "鍒版湡鏃ユ湡")
@Column(columnDefinition = "VARCHAR(64) comment '鍒版湡鏃ユ湡'")
- private String expirationDate;
+ private String expirationDate;*/
@Schema(description = "澶囨敞")
@Column(columnDefinition = "TEXT comment '澶囨敞'")
private String remark;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ /*@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "瀹℃壒鏃堕棿")
@Column(columnDefinition = "datetime comment '瀹℃壒鏃堕棿'")
- private String approveTime;
+ private String approveTime;*/
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ /*@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "杞垚鍚堝悓鏃堕棿")
@Column(columnDefinition = "datetime comment '杞垚鍚堝悓鏃堕棿'")
- private String contractTime;
+ private String contractTime;*/
/**
* 鏍囩殑鐗�
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 8f8d6c0..a81440f 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,4 +35,6 @@
@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 1e94694..fb95221 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
@@ -65,6 +65,7 @@
@PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" )
public R getBusinessCustomerList(@ParameterObject BusinessCustomer businessCustomer) {
LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery();
+ wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName());
return R.ok(businessCustomerService.list(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 234d838..3ed883a 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
@@ -8,11 +8,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
import com.by4cloud.platformx.business.service.ContractSubjectMatterService;
+import com.by4cloud.platformx.business.utils.ContractNumberGenerator;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.ProductionPlan;
import com.by4cloud.platformx.business.service.ProductionPlanService;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -117,6 +119,9 @@
if(StrUtil.isEmpty(productionPlan.getProductionPlanName())){
return R.failed("鎺掍骇璁″垝鍚嶇О涓嶈兘涓虹┖锛�");
}
+ productionPlan.setPartybid(SecurityUtils.getUser().getCompId());
+ productionPlan.setPartyb(SecurityUtils.getUser().getCompName());
+ productionPlan.setProductionPlanNo("p-"+ContractNumberGenerator.generateContractNumber());
productionPlanService.save(productionPlan);
if(productionPlan.getContractSubjectMatterList()!=null){
--
Gitblit v1.9.1