From f09879d1dcad327c15550b27814183f30f2b23f4 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 23 Sep 2026 11:29:52 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=AE=A2=E5=95=86?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/entity/CustomerArchive.java          |  3 ++
 .../transport/pojo/vo/CustomerArchiveVO.java  |  4 ---
 .../transport/excel/CustomerArchiveExcel.java |  3 ++
 .../mapper/CustomerArchiveMapper.xml          |  5 +++
 .../impl/CustomerArchiveServiceImpl.java      | 33 +++++++++++++++++--
 doc/sql/transport/blade_customer_archive.sql  |  1 +
 ...ustomer_archive_customer_kind_20260923.sql | 19 +++++++++++
 7 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 doc/sql/transport/blade_customer_archive_customer_kind_20260923.sql

diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CustomerArchive.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CustomerArchive.java
index 0fc9777..fa780bb 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CustomerArchive.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CustomerArchive.java
@@ -58,6 +58,9 @@ public class CustomerArchive extends TenantEntity {
 	@Schema(description = "客商全称")
 	private String fullName;
 
+	@Schema(description = "客商类型：external外部客商，internal内部组织")
+	private String customerKind;
+
 	@Schema(description = "客商性质")
 	private String customerNature;
 
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java
index 880566e..802ed9e 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java
@@ -82,10 +82,6 @@ public class CustomerArchiveVO extends CustomerArchive {
 	@Schema(description = "是否保存变更记录（仅提交时为 true，保存时不记录）")
 	private Boolean recordChange;
 
-	@TableField(exist = false)
-	@Schema(description = "客商类型：external外部客商，internal内部组织")
-	private String customerKind;
-
 	@TableField(exist = false)
 	@Schema(description = "资金使用风险等级：high、medium、none")
 	private String fundUseRisk;
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java
index cc15e8b..bd9c470 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java
@@ -58,6 +58,9 @@ public class CustomerArchiveExcel implements Serializable {
 	private String fullName;
 
 	@ExcelProperty("客商类型")
+	private String customerKind;
+
+	@ExcelProperty("客商分类")
 	private String customerType;
 
 	@ExcelProperty("客商性质")
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
index f67cfed..6da293f 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
@@ -15,6 +15,7 @@
         <result column="customer_code" property="customerCode"/>
         <result column="short_name" property="shortName"/>
         <result column="full_name" property="fullName"/>
+        <result column="customer_kind" property="customerKind"/>
         <result column="customer_nature" property="customerNature"/>
         <result column="guangxi_top100" property="guangxiTop100"/>
         <result column="unified_credit_code" property="unifiedCreditCode"/>
@@ -63,6 +64,7 @@
             customer_code,
             short_name,
             full_name,
+            customer_kind,
             customer_nature,
             guangxi_top100,
             unified_credit_code,
@@ -128,6 +130,9 @@
             <bind name="creditCodeLike" value="'%' + customer.unifiedCreditCode + '%'"/>
             AND unified_credit_code LIKE #{creditCodeLike}
         </if>
+        <if test="customer.customerKind != null and customer.customerKind != ''">
+            AND customer_kind = #{customer.customerKind}
+        </if>
         <if test="customer.customerNature != null and customer.customerNature != ''">
             AND customer_nature = #{customer.customerNature}
         </if>
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
index 53c479c..3ff5574 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
@@ -461,6 +461,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 	private void prepare(CustomerArchiveVO customer) {
 		customer.setShortName(trimToNull(customer.getShortName()));
 		customer.setFullName(trimToEmpty(customer.getFullName()));
+		customer.setCustomerKind(normalizeCustomerKind(customer.getCustomerKind()));
 		customer.setCustomerNature(trimToEmpty(customer.getCustomerNature()));
 		customer.setGuangxiTop100(normalizeYesNoFlag(customer.getGuangxiTop100()));
 		customer.setUnifiedCreditCode(trimToEmpty(customer.getUnifiedCreditCode()));
@@ -499,6 +500,12 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		if (Func.isEmpty(customer.getFullName())) {
 			throw new ServiceException("客商全称不能为空");
 		}
+		if (Func.isEmpty(customer.getCustomerKind())) {
+			throw new ServiceException("客商类型不能为空");
+		}
+		if (!"external".equals(customer.getCustomerKind()) && !"internal".equals(customer.getCustomerKind())) {
+			throw new ServiceException("客商类型只能是外部客商或内部组织");
+		}
 		if (Func.isEmpty(customer.getCustomerNature())) {
 			throw new ServiceException("客商性质不能为空");
 		}
@@ -509,7 +516,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 			throw new ServiceException("统一社会信用代码必须为18位大写字母或数字");
 		}
 		if (Func.isEmpty(customer.getCustomerType())) {
-			throw new ServiceException("客商类型不能为空");
+			throw new ServiceException("客商分类不能为空");
 		}
 		validateCustomerType(customer.getCustomerType());
 		if (Func.isEmpty(customer.getLegalPerson())) {
@@ -551,7 +558,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 			.filter(Func::isNotEmpty)
 			.toList();
 		if (Func.isEmpty(typeList)) {
-			throw new ServiceException("客商类型不能为空");
+			throw new ServiceException("客商分类不能为空");
 		}
 	}
 
@@ -939,6 +946,24 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		throw new ServiceException("是否广西百强只能选择是或否");
 	}
 
+	private String normalizeCustomerKind(String customerKind) {
+		String value = trimToEmpty(customerKind);
+		if (Func.isEmpty(value) || "外部客商".equals(value) || "external".equals(value)) {
+			return "external";
+		}
+		if ("内部组织".equals(value) || "internal".equals(value)) {
+			return "internal";
+		}
+		return value;
+	}
+
+	private String customerKindName(String customerKind) {
+		if ("internal".equals(customerKind) || "内部组织".equals(customerKind)) {
+			return "内部组织";
+		}
+		return "外部客商";
+	}
+
 	private Object parseScoreAttachments(String value) {
 		if (Func.isEmpty(value)) {
 			return new ArrayList<>();
@@ -1423,10 +1448,11 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		snapshot.put("客商编号", customer.getCustomerCode());
 		snapshot.put("客商简称", customer.getShortName());
 		snapshot.put("客商全称", customer.getFullName());
+		snapshot.put("客商类型(内外部)", customer.getCustomerKind());
 		snapshot.put("客商性质", customer.getCustomerNature());
 		snapshot.put("是否广西百强", customer.getGuangxiTop100());
 		snapshot.put("统一社会信用代码", customer.getUnifiedCreditCode());
-		snapshot.put("客商类型", customer.getCustomerType());
+		snapshot.put("客商分类", customer.getCustomerType());
 		snapshot.put("所属项目", customer.getProjectName());
 		snapshot.put("注册/实际经营地址", customer.getRegisteredAddress());
 		snapshot.put("注册地址行政区划", customer.getRegisteredRegionName());
@@ -1521,6 +1547,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		excel.setCustomerCode(customer.getCustomerCode());
 		excel.setShortName(customer.getShortName());
 		excel.setFullName(customer.getFullName());
+		excel.setCustomerKind(customerKindName(customer.getCustomerKind()));
 		excel.setCustomerType(customer.getCustomerType());
 		excel.setCustomerNature(customer.getCustomerNature());
 		excel.setUnifiedCreditCode(customer.getUnifiedCreditCode());
diff --git a/doc/sql/transport/blade_customer_archive.sql b/doc/sql/transport/blade_customer_archive.sql
index 79d5a91..d2a0ef8 100644
--- a/doc/sql/transport/blade_customer_archive.sql
+++ b/doc/sql/transport/blade_customer_archive.sql
@@ -8,6 +8,7 @@ CREATE TABLE `blade_customer_archive` (
   `customer_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客商编号',
   `short_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客商简称',
   `full_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客商全称',
+  `customer_kind` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'external' COMMENT '客商类型：external外部客商，internal内部组织',
   `customer_nature` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客商性质',
   `guangxi_top100` tinyint NULL DEFAULT NULL COMMENT '是否广西百强：0否，1是',
   `unified_credit_code` varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '统一社会信用代码',
diff --git a/doc/sql/transport/blade_customer_archive_customer_kind_20260923.sql b/doc/sql/transport/blade_customer_archive_customer_kind_20260923.sql
new file mode 100644
index 0000000..50cc459
--- /dev/null
+++ b/doc/sql/transport/blade_customer_archive_customer_kind_20260923.sql
@@ -0,0 +1,19 @@
+-- 客商档案：新增「客商类型」字段（external外部客商，internal内部组织）
+-- 历史数据默认外部客商；重复执行不会报重复列错误。
+
+SET @customer_archive_schema = DATABASE();
+
+SET @customer_archive_sql = (
+  SELECT IF(
+    COUNT(*) = 0,
+    'ALTER TABLE `blade_customer_archive` ADD COLUMN `customer_kind` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT ''external'' COMMENT ''客商类型：external外部客商，internal内部组织'' AFTER `full_name`',
+    'SELECT 1'
+  )
+  FROM information_schema.columns
+  WHERE table_schema = @customer_archive_schema
+    AND table_name = 'blade_customer_archive'
+    AND column_name = 'customer_kind'
+);
+PREPARE customer_archive_stmt FROM @customer_archive_sql;
+EXECUTE customer_archive_stmt;
+DEALLOCATE PREPARE customer_archive_stmt;