feat(customer): 添加客户跟进步骤字段和审批逻辑

- 在CreditMpCustomer实体中新增第1步跟进相关字段，包括联系人、电话、录音、截图等信息
- 实现服务层中对第1至第4步审批状态的设置逻辑
- 添加审批时间、审批人等审计信息的存储功能
- 支持多步骤客户跟进流程的数据管理需求

README.md

@@ -283,4 +283,6 @@ docker run -d -p 9200:9200 websoft-api
 
 ---
 
-⭐ 如果这个项目对您有帮助，请给我们一个星标！
+⭐ 如果这个项目对您有帮助，请给我们一个星标！
+
+

com/wechat/pay/java/core/exception/ServiceException.java

@@ -0,0 +1,86 @@
+package com.wechat.pay.java.core.exception;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.wechat.pay.java.core.http.HttpRequest;
+import com.wechat.pay.java.core.util.GsonUtil;
+
+/** 发送HTTP请求成功，返回异常时抛出。例如返回状态码小于200或大于等于300、返回体参数不完整。 */
+public class ServiceException extends WechatPayException {
+
+  private static final long serialVersionUID = -7174975090366956652L;
+
+  private final HttpRequest httpRequest;
+  private final int httpStatusCode;
+  private final String responseBody;
+  private String errorCode;
+  private String errorMessage;
+
+  /**
+   * 返回状态码小于200或大于300调用
+   *
+   * @param httpRequest http请求
+   * @param httpStatusCode http状态码
+   * @param responseBody http返回体
+   */
+  public ServiceException(HttpRequest httpRequest, int httpStatusCode, String responseBody) {
+    super(
+        String.format(
+            "Wrong HttpStatusCode[%d]%nhttpResponseBody[%.1024s]\tHttpRequest[%s]",
+            httpStatusCode, responseBody, httpRequest));
+    this.httpRequest = httpRequest;
+    this.httpStatusCode = httpStatusCode;
+    this.responseBody = responseBody;
+    if (responseBody != null && !responseBody.isEmpty()) {
+      JsonObject jsonObject = GsonUtil.getGson().fromJson(responseBody, JsonObject.class);
+      JsonElement code = jsonObject.get("code");
+      JsonElement message = jsonObject.get("message");
+      this.errorCode = code == null ? null : code.getAsString();
+      this.errorMessage = message == null ? null : message.getAsString();
+    }
+  }
+
+  /**
+   * 获取序列化版本UID
+   *
+   * @return UID
+   */
+  public static long getSerialVersionUID() {
+    return serialVersionUID;
+  }
+
+  /**
+   * 获取HTTP请求
+   *
+   * @return HTTP请求
+   */
+  public HttpRequest getHttpRequest() {
+    return httpRequest;
+  }
+
+  /**
+   * 获取HTTP返回体
+   *
+   * @return HTTP返回体
+   */
+  public String getResponseBody() {
+    return responseBody;
+  }
+
+  /**
+   * 获取HTTP状态码
+   *
+   * @return HTTP状态码
+   */
+  public int getHttpStatusCode() {
+    return httpStatusCode;
+  }
+
+  public String getErrorCode() {
+    return errorCode;
+  }
+
+  public String getErrorMessage() {
+    return errorMessage;
+  }
+}

com/wechat/pay/java/core/http/AbstractHttpClient.java

@@ -0,0 +1,151 @@
+package com.wechat.pay.java.core.http;
+
+import static com.wechat.pay.java.core.http.Constant.ACCEPT;
+import static com.wechat.pay.java.core.http.Constant.AUTHORIZATION;
+import static com.wechat.pay.java.core.http.Constant.OS;
+import static com.wechat.pay.java.core.http.Constant.REQUEST_ID;
+import static com.wechat.pay.java.core.http.Constant.USER_AGENT;
+import static com.wechat.pay.java.core.http.Constant.USER_AGENT_FORMAT;
+import static com.wechat.pay.java.core.http.Constant.VERSION;
+import static com.wechat.pay.java.core.http.Constant.WECHAT_PAY_SERIAL;
+import static java.net.HttpURLConnection.HTTP_MULT_CHOICE;
+import static java.net.HttpURLConnection.HTTP_OK;
+import static java.util.Objects.requireNonNull;
+
+import com.wechat.pay.java.core.auth.Credential;
+import com.wechat.pay.java.core.auth.Validator;
+import com.wechat.pay.java.core.exception.MalformedMessageException;
+import com.wechat.pay.java.core.exception.ServiceException;
+import com.wechat.pay.java.core.exception.ValidationException;
+import com.wechat.pay.java.core.http.HttpRequest.Builder;
+import java.io.InputStream;
+
+/** 请求客户端抽象基类 */
+public abstract class AbstractHttpClient implements HttpClient {
+
+  protected final Credential credential;
+  protected final Validator validator;
+
+  public AbstractHttpClient(Credential credential, Validator validator) {
+    this.credential = requireNonNull(credential);
+    this.validator = requireNonNull(validator);
+  }
+
+  @Override
+  public <T> HttpResponse<T> execute(HttpRequest httpRequest, Class<T> responseClass) {
+    HttpRequest innerRequest =
+        new Builder()
+            .url(httpRequest.getUrl())
+            .httpMethod(httpRequest.getHttpMethod())
+            .headers(httpRequest.getHeaders())
+            .addHeader(AUTHORIZATION, getAuthorization(httpRequest))
+            .addHeader(USER_AGENT, getUserAgent())
+            .addHeader(WECHAT_PAY_SERIAL, getWechatPaySerial())
+            .body(httpRequest.getBody())
+            .build();
+    OriginalResponse originalResponse = innerExecute(innerRequest);
+    validateResponse(originalResponse);
+    return assembleHttpResponse(originalResponse, responseClass);
+  }
+
+  @Override
+  public InputStream download(String url) {
+    HttpRequest originRequest =
+        new HttpRequest.Builder().httpMethod(HttpMethod.GET).url(url).build();
+    HttpRequest httpRequest =
+        new HttpRequest.Builder()
+            .url(url)
+            .httpMethod(HttpMethod.GET)
+            .addHeader(AUTHORIZATION, getAuthorization(originRequest))
+            .addHeader(ACCEPT, "*/*")
+            .addHeader(USER_AGENT, getUserAgent())
+            .addHeader(WECHAT_PAY_SERIAL, getWechatPaySerial())
+            .build();
+    return innerDownload(httpRequest);
+  }
+
+  protected abstract InputStream innerDownload(HttpRequest httpRequest);
+
+  protected abstract OriginalResponse innerExecute(HttpRequest httpRequest);
+
+  private void validateResponse(OriginalResponse originalResponse) {
+
+    if (isInvalidHttpCode(originalResponse.getStatusCode())) {
+      throw new ServiceException(
+          originalResponse.getRequest(),
+          originalResponse.getStatusCode(),
+          originalResponse.getBody());
+    }
+
+    if (originalResponse.getBody() != null
+        && !originalResponse.getBody().isEmpty()
+        && !MediaType.APPLICATION_JSON.equalsWith(originalResponse.getContentType())) {
+      throw new MalformedMessageException(
+          String.format(
+              "Unsupported content-type[%s]%nhttpRequest[%s]",
+              originalResponse.getContentType(), originalResponse.getRequest()));
+    }
+
+    if (!validator.validate(originalResponse.getHeaders(), originalResponse.getBody())) {
+      String requestId = originalResponse.getHeaders().getHeader(REQUEST_ID);
+      throw new ValidationException(
+          String.format(
+              "Validate response failed,the WechatPay signature is incorrect.%n"
+                  + "Request-ID[%s]\tresponseHeader[%s]\tresponseBody[%.1024s]",
+              requestId, originalResponse.getHeaders(), originalResponse.getBody()));
+    }
+  }
+
+  protected boolean isInvalidHttpCode(int httpCode) {
+    return httpCode < HTTP_OK || httpCode >= HTTP_MULT_CHOICE;
+  }
+
+  private <T> HttpResponse<T> assembleHttpResponse(
+      OriginalResponse originalResponse, Class<T> responseClass) {
+    return new HttpResponse.Builder<T>()
+        .originalResponse(originalResponse)
+        .serviceResponseType(responseClass)
+        .build();
+  }
+
+  private String getSignBody(RequestBody requestBody) {
+    if (requestBody == null) {
+      return "";
+    }
+    if (requestBody instanceof JsonRequestBody) {
+      return ((JsonRequestBody) requestBody).getBody();
+    }
+    if (requestBody instanceof FileRequestBody) {
+      return ((FileRequestBody) requestBody).getMeta();
+    }
+    throw new UnsupportedOperationException(
+        String.format("Unsupported RequestBody Type[%s]", requestBody.getClass().getName()));
+  }
+
+  private String getUserAgent() {
+    return String.format(
+        USER_AGENT_FORMAT,
+        getClass().getPackage().getImplementationVersion(),
+        OS,
+        VERSION == null ? "Unknown" : VERSION,
+        credential.getClass().getSimpleName(),
+        validator.getClass().getSimpleName(),
+        getHttpClientInfo());
+  }
+
+  private String getWechatPaySerial() {
+    return this.validator.getSerialNumber();
+  }
+
+  /**
+   * 获取http客户端信息，用于User-Agent。 格式：客户端名称/版本 示例：okhttp3/4.9.3
+   *
+   * @return 客户端信息
+   */
+  protected abstract String getHttpClientInfo();
+
+  private String getAuthorization(HttpRequest request) {
+    return credential.getAuthorization(
+        request.getUri(), request.getHttpMethod().name(), getSignBody(request.getBody()));
+  }
+}

docs/TICKET_PACKAGE_FEATURE_PLAN.md

@@ -0,0 +1,31 @@
+# 套票（冻结/可用、分期释放）功能开发计划
+
+## 目标
+- 为“买N送M（例如买1送4）、起售（例如20桶起售）、按月释放（例如每月释放10桶）、可用未用完叠加”的套票/权益，提供后端可配置、可发放、可释放、可消费的能力。
+
+## 核心概念
+- 套票模板：按商品(goodsId)配置买赠规则、起售/起送、释放规则（每期释放数或释放期数）、首期释放时机。
+- 用户套票账户：记录总量、可用量、冻结量、已用量、已释放量；绑定订单（用于幂等与追溯）。
+- 释放计划：每期一条，到期后把冻结转可用（可用未用完自然叠加）。
+- 变更流水：发放/释放/消费等都记录流水，便于对账与排查。
+
+## 关键默认规则（可在模板里改）
+- 仅赠送量进入套票账户（默认不包含“购买量”本身）；如需“买20送80=总100”，可在模板设置 `includeBuyQty=true`。
+- 首期释放：默认“支付成功当日/当刻”释放（`firstReleaseMode=0`）；如需“下个月同日释放”，设 `firstReleaseMode=1`。
+- 每期释放：默认按 `monthlyReleaseQty`；如配置了 `releasePeriods`，则平均分摊并处理余数。
+
+## 开发步骤（建议按顺序）
+1. 需求确认与接入点确认（订单哪个节点发放、桶票如何消费/核销、退款是否回滚、释放日期规则）。
+2. 数据表设计与SQL输出（模板/账户/释放计划/流水）。
+3. 实现套票模板后台CRUD接口。
+4. 支付成功接入：在订单支付成功后发放套票账户+生成释放计划（幂等）。
+5. 定时任务释放：扫描到期释放计划，执行“冻结->可用”转账（幂等）。
+6. 消费扣减：对用户可用量做扣减（支持跨多套票账户FIFO扣减），并落流水。
+7. 测试与验收：至少覆盖（买赠计算、分期拆分、叠加逻辑、幂等、并发扣减）。
+
+## 待确认点（不确认也可先按默认实现）
+- 套票数量=赠送量？还是（购买量+赠送量）？
+- “释放日期”是按支付时间的“日”还是固定每月某一天？（31号跨月如何处理？）
+- 退款/取消：是否回滚未使用的可用/冻结？已释放但未用如何处理？
+- 消费场景：在哪个业务点扣减（下单抵扣/提货核销/线下核销）？
+

docs/TICKET_PACKAGE_TABLES.sql

@@ -0,0 +1,121 @@
+-- 套票（冻结/可用、分期释放）相关表
+-- 说明：项目使用了 MyBatis-Plus 的 tenant 拦截；表内显式保留 tenant_id 字段并建议建立联合唯一索引。
+
+-- 1) 套票模板（按商品配置）
+CREATE TABLE IF NOT EXISTS shop_ticket_template (
+  id INT AUTO_INCREMENT PRIMARY KEY,
+  goods_id INT NOT NULL,
+  name VARCHAR(100) NOT NULL,
+
+  enabled TINYINT(1) NOT NULL DEFAULT 1,
+  unit_name VARCHAR(20) NOT NULL DEFAULT '桶',
+
+  -- 起售/起送
+  min_buy_qty INT NOT NULL DEFAULT 1,
+  start_send_qty INT NOT NULL DEFAULT 1,
+
+  -- 买赠：买1送4 => gift_multiplier=4
+  gift_multiplier INT NOT NULL DEFAULT 0,
+  -- 是否把购买量也计入套票总量（默认仅计入赠送量）
+  include_buy_qty TINYINT(1) NOT NULL DEFAULT 0,
+
+  -- 释放规则：二选一
+  -- A) 每期释放数量（默认每月释放10）
+  monthly_release_qty INT NOT NULL DEFAULT 10,
+  -- B) 总共释放多少期（若配置>0，则按期数平均分摊）
+  release_periods INT NULL,
+
+  -- 首期释放时机：0=支付成功当刻；1=下个月同日
+  first_release_mode INT NOT NULL DEFAULT 0,
+
+  comments VARCHAR(255) NULL,
+  sort_number INT NOT NULL DEFAULT 0,
+  user_id INT NULL,
+
+  deleted INT NOT NULL DEFAULT 0,
+  tenant_id INT NOT NULL,
+  create_time DATETIME NULL,
+  update_time DATETIME NULL,
+
+  UNIQUE KEY uk_ticket_template_tenant_goods (tenant_id, goods_id),
+  KEY idx_ticket_template_tenant (tenant_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 2) 用户套票账户（一次购买通常生成一条）
+CREATE TABLE IF NOT EXISTS shop_user_ticket (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  template_id INT NOT NULL,
+  goods_id INT NOT NULL,
+
+  user_id INT NOT NULL,
+  order_id INT NULL,
+  order_no VARCHAR(64) NULL,
+  order_goods_id INT NULL,
+
+  total_qty INT NOT NULL DEFAULT 0,
+  available_qty INT NOT NULL DEFAULT 0,
+  frozen_qty INT NOT NULL DEFAULT 0,
+  used_qty INT NOT NULL DEFAULT 0,
+  released_qty INT NOT NULL DEFAULT 0,
+
+  status INT NOT NULL DEFAULT 0,
+
+  deleted INT NOT NULL DEFAULT 0,
+  tenant_id INT NOT NULL,
+  create_time DATETIME NULL,
+  update_time DATETIME NULL,
+
+  KEY idx_user_ticket_user (tenant_id, user_id),
+  KEY idx_user_ticket_order (tenant_id, order_no),
+  UNIQUE KEY uk_user_ticket_order_goods (tenant_id, template_id, order_no, order_goods_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 3) 释放计划/释放记录（每期一条，幂等执行）
+CREATE TABLE IF NOT EXISTS shop_user_ticket_release (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  user_ticket_id BIGINT NOT NULL,
+  user_id INT NOT NULL,
+  period_no INT NOT NULL,
+
+  release_qty INT NOT NULL,
+  release_time DATETIME NOT NULL,
+
+  status INT NOT NULL DEFAULT 0, -- 0待释放 1已释放 2作废
+  released_time DATETIME NULL,
+
+  tenant_id INT NOT NULL,
+  create_time DATETIME NULL,
+  update_time DATETIME NULL,
+
+  UNIQUE KEY uk_ticket_release_period (tenant_id, user_ticket_id, period_no),
+  KEY idx_ticket_release_due (status, release_time),
+  KEY idx_ticket_release_user (tenant_id, user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 4) 套票变更流水（发放/释放/消费/回滚等）
+CREATE TABLE IF NOT EXISTS shop_user_ticket_log (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  user_ticket_id BIGINT NOT NULL,
+  user_id INT NOT NULL,
+
+  change_type INT NOT NULL, -- 10发放 20释放 30消费 40回滚/退款
+  change_available INT NOT NULL DEFAULT 0,
+  change_frozen INT NOT NULL DEFAULT 0,
+  change_used INT NOT NULL DEFAULT 0,
+
+  available_after INT NOT NULL DEFAULT 0,
+  frozen_after INT NOT NULL DEFAULT 0,
+  used_after INT NOT NULL DEFAULT 0,
+
+  order_id INT NULL,
+  order_no VARCHAR(64) NULL,
+  remark VARCHAR(255) NULL,
+
+  tenant_id INT NOT NULL,
+  create_time DATETIME NULL,
+  update_time DATETIME NULL,
+
+  KEY idx_ticket_log_user (tenant_id, user_id),
+  KEY idx_ticket_log_ticket (tenant_id, user_ticket_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+

docs/ai/README.md

@@ -0,0 +1,61 @@
+# AI 模块（Ollama + RAG + 订单分析）
+
+## 1. 配置
+
+见 `src/main/resources/application.yml`：
+
+- `ai.ollama.base-url`：主地址（例如 `https://ai-api.websoft.top`）
+- `ai.ollama.fallback-url`：备用地址（例如 `http://47.119.165.234:11434`）
+- `ai.ollama.chat-model`：对话模型（`qwen3.5:cloud`）
+- `ai.ollama.embed-model`：向量模型（`qwen3-embedding:4b`）
+
+## 2. 建表（知识库）
+
+执行：`docs/ai/ai_kb_tables.sql`
+
+## 3. API
+
+说明：所有接口默认需要登录（`@PreAuthorize("isAuthenticated()")`），并且要求能够拿到 `tenantId`（header 或登录用户）。
+
+### 3.1 对话
+
+- `GET /api/ai/models`：获取 Ollama 模型列表
+- `POST /api/ai/chat`：非流式对话
+- `POST /api/ai/chat/stream`：流式对话（SSE）
+- `GET /api/ai/chat/stream?prompt=...`：流式对话（SSE，适配 EventSource）
+
+请求示例（非流式）：
+```json
+{
+  "prompt": "帮我写一个退款流程说明"
+}
+```
+
+### 3.2 知识库（RAG）
+
+- `POST /api/ai/kb/upload`：上传文档入库（建议 txt/md/html）
+- `POST /api/ai/kb/sync/cms`：同步 CMS 已发布文章到知识库（当前租户）
+- `POST /api/ai/kb/query`：仅检索 topK
+- `POST /api/ai/kb/ask`：检索 + 生成答案（答案要求引用 chunk_id）
+
+请求示例（ask）：
+```json
+{
+  "question": "怎么开具发票？",
+  "topK": 5
+}
+```
+
+### 3.3 商城订单分析（按租户/按天）
+
+- `POST /api/ai/analytics/query`：返回按天指标数据
+- `POST /api/ai/analytics/ask`：基于指标数据生成分析结论
+
+请求示例（ask）：
+```json
+{
+  "question": "最近30天支付率有没有明显下滑？请给出原因排查建议。",
+  "startDate": "2026-02-01",
+  "endDate": "2026-02-27"
+}
+```

docs/ai/ai_kb_tables.sql

@@ -0,0 +1,39 @@
+-- AI 知识库（RAG）建表脚本（MySQL）
+-- 说明：本项目使用 MyBatis-Plus 默认命名规则（AiKbDocument -> ai_kb_document）。
+
+CREATE TABLE IF NOT EXISTS `ai_kb_document` (
+  `document_id` INT NOT NULL AUTO_INCREMENT COMMENT '文档ID',
+  `title` VARCHAR(255) NULL COMMENT '标题',
+  `source_type` VARCHAR(32) NULL COMMENT '来源类型：upload/cms',
+  `source_id` INT NULL COMMENT '来源ID（如 cms.article_id）',
+  `source_ref` VARCHAR(255) NULL COMMENT '来源引用（如文件名、文章 code）',
+  `content_hash` CHAR(64) NULL COMMENT '内容hash(SHA-256)，用于增量同步',
+  `status` TINYINT NULL DEFAULT 0 COMMENT '状态',
+  `deleted` TINYINT NULL DEFAULT 0 COMMENT '逻辑删除：0否1是',
+  `tenant_id` INT NOT NULL COMMENT '租户ID',
+  `update_time` DATETIME NULL COMMENT '更新时间',
+  `create_time` DATETIME NULL COMMENT '创建时间',
+  PRIMARY KEY (`document_id`),
+  KEY `idx_ai_kb_document_tenant` (`tenant_id`),
+  KEY `idx_ai_kb_document_source` (`tenant_id`, `source_type`, `source_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI 知识库文档';
+
+CREATE TABLE IF NOT EXISTS `ai_kb_chunk` (
+  `id` INT NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+  `document_id` INT NOT NULL COMMENT '文档ID',
+  `chunk_id` VARCHAR(64) NOT NULL COMMENT 'chunk 唯一ID（用于引用）',
+  `chunk_index` INT NULL COMMENT 'chunk 序号',
+  `title` VARCHAR(255) NULL COMMENT '标题（冗余，便于展示）',
+  `content` LONGTEXT NULL COMMENT 'chunk 文本',
+  `content_hash` CHAR(64) NULL COMMENT 'chunk 内容hash',
+  `embedding` LONGTEXT NULL COMMENT 'embedding(JSON数组)',
+  `embedding_norm` DOUBLE NULL COMMENT 'embedding L2 范数',
+  `deleted` TINYINT NULL DEFAULT 0 COMMENT '逻辑删除：0否1是',
+  `tenant_id` INT NOT NULL COMMENT '租户ID',
+  `create_time` DATETIME NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_ai_kb_chunk_chunk_id` (`chunk_id`),
+  KEY `idx_ai_kb_chunk_tenant` (`tenant_id`),
+  KEY `idx_ai_kb_chunk_document` (`document_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI 知识库 chunk';
+

docs/ai/后端实现指南.md

@@ -0,0 +1,458 @@
+# 客户跟进7步骤后端实现指南
+
+## 📋 概述
+
+本指南详细说明如何实现客户跟进7个步骤功能的后端代码，包括数据库设计、Java后端实现和API接口。
+
+## 🗄️ 数据库设计
+
+### 1. 修改 credit_mp_customer 表结构
+
+```sql
+-- 为第5-7步添加字段（第1-4步字段已存在）
+-- 第5步：合同签订
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_submitted TINYINT DEFAULT 0 COMMENT '是否已提交';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_submitted_at VARCHAR(255) COMMENT '提交时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_contracts TEXT COMMENT '合同信息JSON数组';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_need_approval TINYINT DEFAULT 1 COMMENT '是否需要审核';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_approved TINYINT DEFAULT 0 COMMENT '是否审核通过';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_approved_at VARCHAR(255) COMMENT '审核时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_approved_by BIGINT COMMENT '审核人ID';
+
+-- 第6步：订单回款
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_submitted TINYINT DEFAULT 0 COMMENT '是否已提交';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_submitted_at VARCHAR(255) COMMENT '提交时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_payment_records TEXT COMMENT '财务录入的回款记录JSON数组';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_expected_payments TEXT COMMENT '预计回款JSON数组';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_need_approval TINYINT DEFAULT 1 COMMENT '是否需要审核';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_approved TINYINT DEFAULT 0 COMMENT '是否审核通过';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_approved_at VARCHAR(255) COMMENT '审核时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_approved_by BIGINT COMMENT '审核人ID';
+
+-- 第7步：电话回访
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_submitted TINYINT DEFAULT 0 COMMENT '是否已提交';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_submitted_at VARCHAR(255) COMMENT '提交时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_visit_records TEXT COMMENT '回访记录JSON数组';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_need_approval TINYINT DEFAULT 1 COMMENT '是否需要审核';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_approved TINYINT DEFAULT 0 COMMENT '是否审核通过';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_approved_at VARCHAR(255) COMMENT '审核时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_approved_by BIGINT COMMENT '审核人ID';
+
+-- 添加流程结束相关字段
+ALTER TABLE credit_mp_customer ADD COLUMN follow_process_ended TINYINT DEFAULT 0 COMMENT '流程是否已结束';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_process_end_time VARCHAR(255) COMMENT '流程结束时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_process_end_reason TEXT COMMENT '流程结束原因';
+```
+
+### 2. 创建审核记录表（可选）
+
+```sql
+CREATE TABLE credit_follow_approval (
+  id BIGINT PRIMARY KEY AUTO_INCREMENT,
+  customer_id BIGINT NOT NULL COMMENT '客户ID',
+  step TINYINT NOT NULL COMMENT '步骤号',
+  approved TINYINT NOT NULL COMMENT '是否通过',
+  remark TEXT COMMENT '审核备注',
+  approved_by BIGINT COMMENT '审核人ID',
+  approved_at VARCHAR(255) COMMENT '审核时间',
+  created_at VARCHAR(255) COMMENT '创建时间',
+  INDEX idx_customer_step (customer_id, step),
+  INDEX idx_approved_by (approved_by)
+) COMMENT='跟进步骤审核记录';
+```
+
+## ☕ Java后端实现
+
+### 1. 实体类修改
+
+```java
+// CreditMpCustomer.java 添加字段
+public class CreditMpCustomer {
+    // ... 现有字段
+    
+    // 第5步字段
+    private Integer followStep5Submitted;
+    private String followStep5SubmittedAt;
+    private String followStep5Contracts;
+    private Integer followStep5NeedApproval;
+    private Integer followStep5Approved;
+    private String followStep5ApprovedAt;
+    private Long followStep5ApprovedBy;
+    
+    // 第6步字段
+    private Integer followStep6Submitted;
+    private String followStep6SubmittedAt;
+    private String followStep6PaymentRecords;
+    private String followStep6ExpectedPayments;
+    private Integer followStep6NeedApproval;
+    private Integer followStep6Approved;
+    private String followStep6ApprovedAt;
+    private Long followStep6ApprovedBy;
+    
+    // 第7步字段
+    private Integer followStep7Submitted;
+    private String followStep7SubmittedAt;
+    private String followStep7VisitRecords;
+    private Integer followStep7NeedApproval;
+    private Integer followStep7Approved;
+    private String followStep7ApprovedAt;
+    private Long followStep7ApprovedBy;
+    
+    // 流程结束字段
+    private Integer followProcessEnded;
+    private String followProcessEndTime;
+    private String followProcessEndReason;
+    
+    // getter/setter 方法...
+}
+```
+
+### 2. DTO类创建
+
+```java
+// FollowStepApprovalDTO.java
+@Data
+public class FollowStepApprovalDTO {
+    private Long customerId;
+    private Integer step;
+    private Boolean approved;
+    private String remark;
+}
+
+// BatchFollowStepApprovalDTO.java
+@Data
+public class BatchFollowStepApprovalDTO {
+    private List<FollowStepApprovalDTO> approvals;
+}
+
+// FollowStatisticsDTO.java
+@Data
+public class FollowStatisticsDTO {
+    private Integer totalSteps;
+    private Integer completedSteps;
+    private Integer currentStep;
+    private Double progress;
+    private List<FollowStepDetailDTO> stepDetails;
+}
+
+// FollowStepDetailDTO.java
+@Data
+public class FollowStepDetailDTO {
+    private Integer step;
+    private String title;
+    private String status; // pending, submitted, approved, rejected
+    private String submittedAt;
+    private String approvedAt;
+}
+```
+
+### 3. Service层实现
+
+```java
+// CreditMpCustomerServiceImpl.java 添加方法
+
+@Service
+public class CreditMpCustomerServiceImpl implements CreditMpCustomerService {
+    
+    /**
+     * 审核跟进步骤
+     */
+    @Override
+    @Transactional
+    public void approveFollowStep(FollowStepApprovalDTO dto) {
+        CreditMpCustomer customer = getById(dto.getCustomerId());
+        if (customer == null) {
+            throw new ServiceException("客户不存在");
+        }
+        
+        // 验证步骤是否已提交
+        if (!isStepSubmitted(customer, dto.getStep())) {
+            throw new ServiceException("该步骤尚未提交，无法审核");
+        }
+        
+        // 更新审核状态
+        updateStepApproval(customer, dto);
+        
+        // 记录审核日志
+        saveApprovalLog(dto);
+        
+        // 如果审核通过，更新客户步骤状态
+        if (dto.getApproved()) {
+            updateCustomerStep(customer, dto.getStep());
+        }
+    }
+    
+    /**
+     * 批量审核跟进步骤
+     */
+    @Override
+    @Transactional
+    public void batchApproveFollowSteps(BatchFollowStepApprovalDTO dto) {
+        for (FollowStepApprovalDTO approval : dto.getApprovals()) {
+            approveFollowStep(approval);
+        }
+    }
+    
+    /**
+     * 获取待审核的跟进步骤列表
+     */
+    @Override
+    public List<PendingApprovalStepVO> getPendingApprovalSteps(FollowStepQueryDTO query) {
+        return baseMapper.selectPendingApprovalSteps(query);
+    }
+    
+    /**
+     * 获取客户跟进统计
+     */
+    @Override
+    public FollowStatisticsDTO getFollowStatistics(Long customerId) {
+        CreditMpCustomer customer = getById(customerId);
+        if (customer == null) {
+            throw new ServiceException("客户不存在");
+        }
+        
+        FollowStatisticsDTO statistics = new FollowStatisticsDTO();
+        statistics.setTotalSteps(7);
+        
+        List<FollowStepDetailDTO> stepDetails = new ArrayList<>();
+        int completedSteps = 0;
+        int currentStep = 1;
+        
+        for (int i = 1; i <= 7; i++) {
+            FollowStepDetailDTO detail = getStepDetail(customer, i);
+            stepDetails.add(detail);
+            
+            if ("approved".equals(detail.getStatus())) {
+                completedSteps++;
+                currentStep = i + 1;
+            } else if ("submitted".equals(detail.getStatus()) && currentStep == 1) {
+                currentStep = i;
+            }
+        }
+        
+        statistics.setCompletedSteps(completedSteps);
+        statistics.setCurrentStep(Math.min(currentStep, 7));
+        statistics.setProgress((double) completedSteps / 7 * 100);
+        statistics.setStepDetails(stepDetails);
+        
+        return statistics;
+    }
+    
+    /**
+     * 结束客户跟进流程
+     */
+    @Override
+    @Transactional
+    public void endFollowProcess(Long customerId, String reason) {
+        CreditMpCustomer customer = getById(customerId);
+        if (customer == null) {
+            throw new ServiceException("客户不存在");
+        }
+        
+        customer.setFollowProcessEnded(1);
+        customer.setFollowProcessEndTime(DateUtil.formatDateTime(new Date()));
+        customer.setFollowProcessEndReason(reason);
+        
+        updateById(customer);
+    }
+    
+    // 私有辅助方法...
+    private boolean isStepSubmitted(CreditMpCustomer customer, Integer step) {
+        switch (step) {
+            case 1: return customer.getFollowStep1Submitted() == 1;
+            case 2: return customer.getFollowStep2Submitted() == 1;
+            // ... 其他步骤
+            case 7: return customer.getFollowStep7Submitted() == 1;
+            default: return false;
+        }
+    }
+    
+    private void updateStepApproval(CreditMpCustomer customer, FollowStepApprovalDTO dto) {
+        String currentTime = DateUtil.formatDateTime(new Date());
+        Long currentUserId = SecurityFrameworkUtils.getLoginUserId();
+        
+        switch (dto.getStep()) {
+            case 5:
+                customer.setFollowStep5Approved(dto.getApproved() ? 1 : 0);
+                customer.setFollowStep5ApprovedAt(currentTime);
+                customer.setFollowStep5ApprovedBy(currentUserId);
+                break;
+            case 6:
+                customer.setFollowStep6Approved(dto.getApproved() ? 1 : 0);
+                customer.setFollowStep6ApprovedAt(currentTime);
+                customer.setFollowStep6ApprovedBy(currentUserId);
+                break;
+            case 7:
+                customer.setFollowStep7Approved(dto.getApproved() ? 1 : 0);
+                customer.setFollowStep7ApprovedAt(currentTime);
+                customer.setFollowStep7ApprovedBy(currentUserId);
+                break;
+        }
+        
+        updateById(customer);
+    }
+}
+```
+
+### 4. Controller层实现
+
+```java
+// CreditMpCustomerController.java 添加接口
+
+@RestController
+@RequestMapping("/credit/credit-mp-customer")
+public class CreditMpCustomerController {
+    
+    @PostMapping("/approve-follow-step")
+    @OperLog(title = "审核跟进步骤", businessType = BusinessType.UPDATE)
+    public R<Void> approveFollowStep(@RequestBody FollowStepApprovalDTO dto) {
+        creditMpCustomerService.approveFollowStep(dto);
+        return R.ok();
+    }
+    
+    @PostMapping("/batch-approve-follow-steps")
+    @OperLog(title = "批量审核跟进步骤", businessType = BusinessType.UPDATE)
+    public R<Void> batchApproveFollowSteps(@RequestBody BatchFollowStepApprovalDTO dto) {
+        creditMpCustomerService.batchApproveFollowSteps(dto);
+        return R.ok();
+    }
+    
+    @GetMapping("/pending-approval-steps")
+    @OperLog(title = "获取待审核跟进步骤", businessType = BusinessType.SELECT)
+    public R<List<PendingApprovalStepVO>> getPendingApprovalSteps(FollowStepQueryDTO query) {
+        List<PendingApprovalStepVO> list = creditMpCustomerService.getPendingApprovalSteps(query);
+        return R.ok(list);
+    }
+    
+    @GetMapping("/follow-statistics/{customerId}")
+    @OperLog(title = "获取客户跟进统计", businessType = BusinessType.SELECT)
+    public R<FollowStatisticsDTO> getFollowStatistics(@PathVariable Long customerId) {
+        FollowStatisticsDTO statistics = creditMpCustomerService.getFollowStatistics(customerId);
+        return R.ok(statistics);
+    }
+    
+    @PostMapping("/end-follow-process")
+    @OperLog(title = "结束客户跟进流程", businessType = BusinessType.UPDATE)
+    public R<Void> endFollowProcess(@RequestBody EndFollowProcessDTO dto) {
+        creditMpCustomerService.endFollowProcess(dto.getCustomerId(), dto.getReason());
+        return R.ok();
+    }
+}
+```
+
+### 5. Mapper层SQL
+
+```xml
+<!-- CreditMpCustomerMapper.xml 添加查询方法 -->
+
+<select id="selectPendingApprovalSteps" resultType="com.your.package.PendingApprovalStepVO">
+    SELECT 
+        c.id as customerId,
+        c.to_user as customerName,
+        5 as step,
+        '合同签订' as stepTitle,
+        c.follow_step5_submitted_at as submittedAt,
+        u.real_name as submittedBy,
+        c.follow_step5_contracts as content
+    FROM credit_mp_customer c
+    LEFT JOIN sys_user u ON c.user_id = u.user_id
+    WHERE c.follow_step5_submitted = 1 
+    AND c.follow_step5_approved = 0 
+    AND c.deleted = 0
+    
+    UNION ALL
+    
+    SELECT 
+        c.id as customerId,
+        c.to_user as customerName,
+        6 as step,
+        '订单回款' as stepTitle,
+        c.follow_step6_submitted_at as submittedAt,
+        u.real_name as submittedBy,
+        c.follow_step6_expected_payments as content
+    FROM credit_mp_customer c
+    LEFT JOIN sys_user u ON c.user_id = u.user_id
+    WHERE c.follow_step6_submitted = 1 
+    AND c.follow_step6_approved = 0 
+    AND c.deleted = 0
+    
+    UNION ALL
+    
+    SELECT 
+        c.id as customerId,
+        c.to_user as customerName,
+        7 as step,
+        '电话回访' as stepTitle,
+        c.follow_step7_submitted_at as submittedAt,
+        u.real_name as submittedBy,
+        c.follow_step7_visit_records as content
+    FROM credit_mp_customer c
+    LEFT JOIN sys_user u ON c.user_id = u.user_id
+    WHERE c.follow_step7_submitted = 1 
+    AND c.follow_step7_approved = 0 
+    AND c.deleted = 0
+    
+    <if test="step != null">
+        HAVING step = #{step}
+    </if>
+    <if test="customerId != null">
+        HAVING customerId = #{customerId}
+    </if>
+    ORDER BY submittedAt DESC
+</select>
+```
+
+## 🔧 业务逻辑说明
+
+### 1. 步骤解锁机制
+- 第一步始终可用
+- 后续步骤需要前一步审核通过才能进行
+- 前端通过 `canEnterStep` 逻辑控制
+
+### 2. 审核流程
+- 步骤提交后设置 `needApproval = 1`
+- 管理员在后台审核
+- 审核通过后设置 `approved = 1` 并更新时间
+
+### 3. 数据格式
+- 所有复杂数据使用JSON格式存储
+- 文件上传返回URL，存储在JSON数组中
+- 时间统一使用 `YYYY-MM-DD HH:mm:ss` 格式
+
+### 4. 权限控制
+- 销售只能提交和查看自己的客户
+- 管理员可以审核所有步骤
+- 财务人员可以录入第6步回款数据
+
+## 📱 前端集成
+
+前端代码已经完成，包括：
+- 7个步骤的完整页面
+- 步骤状态显示和跳转逻辑
+- 数据提交和验证
+- 客户详情页面的汇总显示
+
+## 🚀 部署步骤
+
+1. 执行数据库迁移脚本
+2. 部署Java后端代码
+3. 更新前端API调用
+4. 测试完整流程
+5. 配置权限和审核流程
+
+## 📝 注意事项
+
+1. **数据备份**：执行数据库变更前请备份
+2. **权限配置**：确保各角色权限正确配置
+3. **文件上传**：确认文件上传服务正常
+4. **审核流程**：测试审核流程的完整性
+5. **性能优化**：大量数据时考虑分页和索引优化
+
+## 🔄 后续扩展
+
+可以考虑的功能：
+- 跟进模板和标准化流程
+- 自动提醒和通知
+- 数据统计和报表
+- 跟进效率分析
+- 客户满意度评估

docs/sql/2026-02-06_glt_ticket_order_delivery_fields.sql

@@ -0,0 +1,14 @@
+-- 水票配送订单：配送流程字段（需在数据库执行）
+-- 表：glt_ticket_order
+
+ALTER TABLE glt_ticket_order2
+  ADD COLUMN delivery_status INT NULL DEFAULT 10 COMMENT '配送状态：10待配送、20配送中、30待客户确认、40已完成',
+  ADD COLUMN send_start_time DATETIME NULL COMMENT '开始配送时间',
+  ADD COLUMN send_end_time DATETIME NULL COMMENT '确认送达时间',
+  ADD COLUMN send_end_img VARCHAR(512) NULL COMMENT '送达拍照留档图片URL',
+  ADD COLUMN receive_confirm_time DATETIME NULL COMMENT '客户确认收货时间',
+  ADD COLUMN receive_confirm_type INT NULL COMMENT '确认方式：10手动、20照片、30超时';
+
+CREATE INDEX idx_glt_ticket_order_rider_status ON glt_ticket_order (tenant_id, rider_id, delivery_status, deleted);
+CREATE INDEX idx_glt_ticket_order_user_status ON glt_ticket_order (tenant_id, user_id, delivery_status, deleted);
+

docs/sql/2026-03-18_credit_user_add_indexes.sql

@@ -0,0 +1,34 @@
+-- credit_user 索引优化（MySQL/InnoDB）
+--
+-- 背景：
+-- - credit_user 列表分页默认排序：sort_number asc, create_time desc
+-- - 常见过滤：tenant_id（TenantLine 自动追加）、deleted=0、company_id、user_id、create_time 范围
+-- - 统计/刷新关联数：WHERE deleted=0 AND company_id IN (...) GROUP BY company_id
+--
+-- 使用前建议先查看现有索引，避免重复：
+--   SHOW INDEX FROM credit_user;
+--
+-- 注意：
+-- - 大表加索引会消耗 IO/CPU，建议在低峰执行。
+-- - MySQL 8 可考虑：ALTER TABLE ... ALGORITHM=INPLACE, LOCK=NONE（视版本/引擎而定）。
+
+-- 1) 覆盖默认分页排序 + 逻辑删除 + 租户隔离
+--    典型：WHERE tenant_id=? AND deleted=0 ORDER BY sort_number, create_time DESC LIMIT ...
+CREATE INDEX idx_credit_user_tenant_deleted_sort_create_id
+    ON credit_user (tenant_id, deleted, sort_number, create_time, id);
+
+-- 2) 企业维度查询/统计（也服务于 credit_company 记录数刷新）
+--    典型：WHERE tenant_id=? AND company_id=? AND deleted=0 ...
+--    典型：WHERE tenant_id=? AND deleted=0 AND company_id IN (...) GROUP BY company_id
+CREATE INDEX idx_credit_user_tenant_company_deleted
+    ON credit_user (tenant_id, company_id, deleted);
+
+-- 3) 用户维度查询（后台常按录入人/负责人筛选）
+--    典型：WHERE tenant_id=? AND user_id=? AND deleted=0 ...
+CREATE INDEX idx_credit_user_tenant_user_deleted
+    ON credit_user (tenant_id, user_id, deleted);
+
+-- 可选：如果你们经常按 type 过滤（0/1），再加这个（否则先别加，避免过多索引影响写入）
+-- CREATE INDEX idx_credit_user_tenant_type_deleted
+--     ON credit_user (tenant_id, type, deleted);
+

docs/水票配送订单-后端提示词.md

@@ -0,0 +1,98 @@
+# 水票配送订单：后端提示词（可直接发给后端）
+
+> 目标：把“水票下单后 -> 配送员接单/配送 -> 用户确认 -> 自动确认”的闭环放到后端，用明确的字段 + 状态机校验保证不越权、不乱跳状态、并发不重复接单。
+>
+> 接口前缀：当前后端控制器为 `@RequestMapping("/api/glt/glt-ticket-order")`，下文默认都带 `/api` 前缀（如需兼容旧路径，可做网关转发或保留旧路由）。
+
+## 0) 角色与权限边界（务必在后端兜底）
+- 用户端（小程序用户）：只能看/操作自己的订单（`userId` = token userId）。
+- 配送员端：只能看/操作分配给自己的订单（`riderId` = token userId / rider userId）。
+- 管理端：按后台权限控制（可查询/派单/改状态，但仍需 tenantId 隔离）。
+
+建议：对“配送员端接口”忽略前端传入的 `riderId/userId/tenantId`，统一从登录态注入，避免越权。
+
+## 1) 订单查询（配送员端）
+建议提供配送员专用分页接口：`GET /api/glt/glt-ticket-order/rider/page`（避免与后台管理分页混用）。
+请支持以下筛选，并保证权限隔离：
+- `deliveryStatus`：10待配送、20配送中、30待客户确认、40已完成（配送员端必要；不传默认=10）
+- `keywords`：支持按地址/备注等模糊搜索（可选）
+- 排序：建议默认 `sendTime asc, createTime desc`（或沿用后端默认排序，但请告知前端）
+
+权限隔离要求（配送员端）：
+- 只返回当前登录配送员的订单：后端强制 `param.riderId = loginUserId`（前端传不传都一样）。
+- `tenantId/deleted` 等同样后端兜底（只查当前租户、只查未删除）。
+
+返回字段建议（配送员端用得上）：
+- 门店/仓库/用户/配送员的展示字段：`storeName/storeAddress/storePhone`、`warehouseName/warehouseAddress`、`nickname/phone/avatar`、`riderName/riderPhone`（现有 `pageRel/listRel` 已在做关联返回）。
+- 导航相关（详见第 5 节）：收货地址 `lat/lng`、门店/仓库 `lngAndLat`（可关联返回或做快照字段）。
+
+## 2) 配送流程字段（建议后端落库并回传）
+订单表建议确保有以下字段（当前前端已按这些字段做流程判断/展示）：
+- `riderId/riderName/riderPhone`：配送员信息
+- `deliveryStatus`：10/20/30/40
+- `sendStartTime`：配送员点击“开始配送”的时间（建议 datetime）
+- `sendEndTime`：配送员点击“确认送达”的时间（建议 datetime）
+- `sendEndImg`：送达拍照留档图片 URL（可选/必填由后端策略决定；建议 varchar(512)）
+- `receiveConfirmTime`：客户确认收货时间（建议 datetime）
+- `receiveConfirmType`：10客户手动确认、20配送照片自动确认、30超时自动确认
+
+数据库变更（示例SQL见：`docs/sql/2026-02-06_glt_ticket_order_delivery_fields.sql`）。
+
+强烈建议把“配送状态”与“业务状态(status=0/1、deleted=0/1)”分开，避免混用：
+- `status/deleted`：系统通用字段（现有逻辑）
+- `deliveryStatus`：配送流程状态（本需求新增）
+
+## 3) 状态流转与校验（强烈建议在后端做）
+请在更新订单时做状态机校验，避免前端绕过流程：
+- `10 -> 20`：仅允许订单属于当前配送员，且未开始/未送达
+- `20 -> 30`：配送员确认送达（可带 `sendEndImg`）
+- `20/30 -> 40`：完成；来源可能是
+  - 客户手动确认（写 `receiveConfirmTime` + `receiveConfirmType=10`）
+  - 配送照片直接完成（写 `receiveConfirmTime` + `receiveConfirmType=20`，并要求 `sendEndImg`）
+  - 超时自动确认（写 `receiveConfirmTime` + `receiveConfirmType=30`，建议由定时任务执行）
+
+并发/幂等建议（避免重复点击/重复请求带来的脏数据）：
+- 所有“状态变更接口”用条件更新实现原子校验：`UPDATE ... SET ... WHERE id=? AND rider_id=? AND delivery_status=? AND deleted=0`
+- 对重复调用做幂等：
+  - `start`：如果已是 20 则直接返回成功；如果已到 30/40 返回“状态不允许”
+  - `delivered`：如果已是 30/40 则返回成功（或提示已送达）；避免重复写 `sendEndTime`
+  - `confirm-receive`：如果已是 40 则返回成功（或提示已完成）
+
+## 4) 建议新增/明确的接口能力
+为了避免并发抢单/越权更新，建议新增更语义化的接口（或在 update 内做等价校验）：
+- 接单（抢单/派单）：`POST /api/glt/glt-ticket-order/{id}/accept`
+  - 配送员端：后端原子校验：仅当 `rider_id IS NULL`（或为 0）时才能写入当前 rider 信息
+  - 管理端派单：允许传 `riderId`，但需校验骑手归属门店/租户（如有该约束）
+- 开始配送：`POST /api/glt/glt-ticket-order/{id}/start`
+  - 写：`sendStartTime=now`、`deliveryStatus=20`
+  - 校验：必须 `riderId=当前登录配送员` 且当前 `deliveryStatus=10`
+- 确认送达：`POST /api/glt/glt-ticket-order/{id}/delivered`
+  - 入参：`sendEndImg`（可选/必填，按策略）
+  - 写：`sendEndTime=now`、`deliveryStatus=30`、`sendEndImg`
+  - 可选策略 A（推荐可配置）：若 `sendEndImg` 必填且存在，则可直接 `deliveryStatus=40` 并写 `receiveConfirmTime/Type=20`
+- 客户确认收货：`POST /api/glt/glt-ticket-order/{id}/confirm-receive`
+  - 校验：只能本人 `userId` 操作，且必须 `deliveryStatus=30`
+  - 写：`deliveryStatus=40`、`receiveConfirmTime=now`、`receiveConfirmType=10`
+
+接口返回建议：
+- 成功统一返回 `ApiResult.success(...)`
+- 失败请返回明确 msg（例如：`无权限`、`订单不存在`、`订单状态不允许`、`订单已被其他配送员接单`）
+
+## 5) 为了“导航到收货地址/取货点”的字段补充（建议）
+当前仅有 `address` 字符串，无法在小程序内 `openLocation` 精准导航；建议补充：
+- 收货地址（推荐至少返回）：`receiverName`、`receiverPhone`、`province/city/region/address/fullAddress`、`lat/lng`
+- 取货点（门店/仓库，推荐至少返回）：`store.lngAndLat`、`warehouse.lngAndLat`
+
+实现方式二选一：
+- 方式 A（更快）：查询时关联 `shop_user_address`、`shop_store`、`shop_warehouse`，把经纬度字段透出给前端。
+- 方式 B（更稳）：下单时把收货地址的 `name/phone/lat/lng/fullAddress` 以及门店/仓库 `lngAndLat` 做快照写入订单，避免后续数据变更影响历史订单导航。
+
+## 6)（可选但很有用）超时自动确认规则
+- 建议后端提供可配置项：`autoConfirmHours`（例如 24h/48h）
+- 定时任务扫描：`deliveryStatus=30` 且 `sendEndTime < now - autoConfirmHours` 的订单
+- 原子更新：只更新仍处于 30 的订单，写入 `deliveryStatus=40`、`receiveConfirmTime=now`、`receiveConfirmType=30`
+
+## 7)（可选）字段/枚举建议（便于前后端对齐）
+- `deliveryStatus`：10待配送、20配送中、30待客户确认、40已完成
+- `receiveConfirmType`：10客户手动确认、20配送照片自动确认、30超时自动确认
+- 时间字段统一返回格式：`yyyy-MM-dd HH:mm:ss`（与项目现有 `@JsonFormat` 风格一致）

pom.xml

@@ -38,6 +38,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <!-- spring-boot-web -->
     <dependency>

scripts/fix-chinese-font.sh

@@ -1,125 +0,0 @@
-#!/bin/bash
-
-###############################################################################
-# 捐款证书中文乱码修复脚本
-# 用途：在运行中的Docker容器内安装中文字体
-# 适用于：无法重新构建镜像的紧急情况
-###############################################################################
-
-set -e  # 遇到错误立即退出
-
-# 颜色输出
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-# 容器名称（可根据实际情况修改）
-CONTAINER_NAME="websoft-api-container"
-
-echo -e "${GREEN}================================${NC}"
-echo -e "${GREEN}中文字体修复脚本${NC}"
-echo -e "${GREEN}================================${NC}"
-echo ""
-
-# 检查容器是否存在
-echo -e "${YELLOW}步骤 1/6: 检查容器状态...${NC}"
-if ! docker ps | grep -q "$CONTAINER_NAME"; then
-    echo -e "${RED}错误：容器 $CONTAINER_NAME 未运行！${NC}"
-    echo "当前运行的容器："
-    docker ps --format "table {{.Names}}\t{{.Status}}"
-    echo ""
-    read -p "请输入正确的容器名称: " CONTAINER_NAME
-    if [ -z "$CONTAINER_NAME" ]; then
-        echo -e "${RED}容器名称不能为空，退出。${NC}"
-        exit 1
-    fi
-fi
-echo -e "${GREEN}✓ 容器正在运行${NC}"
-echo ""
-
-# 检查是否已安装字体
-echo -e "${YELLOW}步骤 2/6: 检查是否已安装中文字体...${NC}"
-if docker exec "$CONTAINER_NAME" fc-list :lang=zh 2>/dev/null | grep -q "WenQuanYi"; then
-    echo -e "${GREEN}✓ 中文字体已安装${NC}"
-    docker exec "$CONTAINER_NAME" fc-list :lang=zh
-    echo ""
-    read -p "是否重新安装？(y/N): " REINSTALL
-    if [[ ! "$REINSTALL" =~ ^[Yy]$ ]]; then
-        echo "跳过安装，退出。"
-        exit 0
-    fi
-else
-    echo -e "${YELLOW}未检测到中文字体，开始安装...${NC}"
-fi
-echo ""
-
-# 安装字体工具
-echo -e "${YELLOW}步骤 3/6: 安装字体工具...${NC}"
-docker exec -u root "$CONTAINER_NAME" sh -c "apk add --no-cache fontconfig ttf-dejavu wget" || {
-    echo -e "${RED}✗ 字体工具安装失败${NC}"
-    exit 1
-}
-echo -e "${GREEN}✓ 字体工具安装成功${NC}"
-echo ""
-
-# 下载中文字体
-echo -e "${YELLOW}步骤 4/6: 下载文泉驿微米黑字体...${NC}"
-echo "正在从GitHub下载（约10MB），请稍候..."
-docker exec -u root "$CONTAINER_NAME" sh -c "
-    wget -O /tmp/wqy-microhei.ttc https://github.com/anthonyfok/fonts-wqy-microhei/raw/master/wqy-microhei.ttc 2>&1 | grep -E 'Connecting|Length|saved' || true
-" || {
-    echo -e "${YELLOW}GitHub下载失败，尝试使用代理...${NC}"
-    docker exec -u root "$CONTAINER_NAME" sh -c "
-        wget -O /tmp/wqy-microhei.ttc https://ghproxy.com/https://github.com/anthonyfok/fonts-wqy-microhei/raw/master/wqy-microhei.ttc
-    " || {
-        echo -e "${RED}✗ 字体下载失败${NC}"
-        echo "请检查网络连接或手动下载字体文件。"
-        exit 1
-    }
-}
-echo -e "${GREEN}✓ 字体下载成功${NC}"
-echo ""
-
-# 安装字体
-echo -e "${YELLOW}步骤 5/6: 安装字体文件...${NC}"
-docker exec -u root "$CONTAINER_NAME" sh -c "
-    mkdir -p /usr/share/fonts/truetype/wqy && \
-    mv /tmp/wqy-microhei.ttc /usr/share/fonts/truetype/wqy/ && \
-    fc-cache -fv
-" || {
-    echo -e "${RED}✗ 字体安装失败${NC}"
-    exit 1
-}
-echo -e "${GREEN}✓ 字体安装成功${NC}"
-echo ""
-
-# 验证安装
-echo -e "${YELLOW}步骤 6/6: 验证字体安装...${NC}"
-FONT_COUNT=$(docker exec "$CONTAINER_NAME" fc-list :lang=zh | wc -l)
-if [ "$FONT_COUNT" -gt 0 ]; then
-    echo -e "${GREEN}✓ 中文字体验证成功！${NC}"
-    echo "已安装的中文字体："
-    docker exec "$CONTAINER_NAME" fc-list :lang=zh
-else
-    echo -e "${RED}✗ 字体验证失败${NC}"
-    exit 1
-fi
-echo ""
-
-# 完成提示
-echo -e "${GREEN}================================${NC}"
-echo -e "${GREEN}修复完成！${NC}"
-echo -e "${GREEN}================================${NC}"
-echo ""
-echo "后续步骤："
-echo "1. 不需要重启容器，字体已生效"
-echo "2. 重新生成捐款证书即可看到效果"
-echo "3. 如果仍有问题，请查看容器日志："
-echo "   docker logs -f $CONTAINER_NAME"
-echo ""
-echo -e "${YELLOW}注意：${NC}"
-echo "- 此修复方法在容器重启后会失效"
-echo "- 建议后续使用更新后的Dockerfile重新构建镜像"
-echo "- 详细文档请参考：docs/chinese-font-fix-guide.md"
-echo ""

src/main/java/com/gxwebsoft/ai/client/OllamaClient.java

@@ -0,0 +1,194 @@
+package com.gxwebsoft.ai.client;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gxwebsoft.ai.client.dto.*;
+import com.gxwebsoft.ai.config.AiOllamaProperties;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.JSONUtil;
+import okhttp3.*;
+import okio.BufferedSource;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+/**
+ * 轻量 Ollama HTTP Client（兼容 /api/chat、/api/embeddings、/api/tags）。
+ */
+@Component
+public class OllamaClient {
+  @Resource
+  private AiOllamaProperties props;
+
+  @Resource
+  private ObjectMapper objectMapper;
+
+  private volatile OkHttpClient http;
+
+  private OkHttpClient http() {
+    OkHttpClient c = http;
+    if (c != null) {
+      return c;
+    }
+    synchronized (this) {
+      if (http == null) {
+        http = new OkHttpClient.Builder()
+          .connectTimeout(Duration.ofMillis(props.getConnectTimeoutMs()))
+          .readTimeout(Duration.ofMillis(props.getReadTimeoutMs()))
+          .writeTimeout(Duration.ofMillis(props.getWriteTimeoutMs()))
+          .build();
+      }
+      return http;
+    }
+  }
+
+  public OllamaTagsResponse tags() {
+    return getJson("/api/tags", OllamaTagsResponse.class);
+  }
+
+  public OllamaChatResponse chat(OllamaChatRequest req) {
+    if (req.getStream() == null) {
+      req.setStream(false);
+    }
+    return postJson("/api/chat", req, OllamaChatResponse.class);
+  }
+
+  /**
+   * 流式对话：Ollama 会返回按行分隔的 JSON。
+   */
+  public void chatStream(OllamaChatRequest req, Consumer<OllamaChatResponse> onEvent) {
+    Objects.requireNonNull(onEvent, "onEvent");
+    if (req.getStream() == null) {
+      req.setStream(true);
+    }
+
+    Request request = buildPost(baseUrl(), "/api/chat", JSONUtil.toJSONString(req));
+    try (Response resp = http().newCall(request).execute()) {
+      if (!resp.isSuccessful()) {
+        throw new BusinessException("Ollama chat stream failed: HTTP " + resp.code());
+      }
+      ResponseBody body = resp.body();
+      if (body == null) {
+        throw new BusinessException("Ollama chat stream failed: empty body");
+      }
+
+      BufferedSource source = body.source();
+      String line;
+      while ((line = source.readUtf8Line()) != null) {
+        line = line.trim();
+        if (line.isEmpty()) {
+          continue;
+        }
+        OllamaChatResponse event = objectMapper.readValue(line, OllamaChatResponse.class);
+        onEvent.accept(event);
+        if (Boolean.TRUE.equals(event.getDone())) {
+          break;
+        }
+      }
+    } catch (IOException e) {
+      throw new BusinessException("Ollama chat stream IO error: " + e.getMessage());
+    }
+  }
+
+  public OllamaEmbeddingResponse embedding(String prompt) {
+    OllamaEmbeddingRequest req = new OllamaEmbeddingRequest();
+    req.setModel(props.getEmbedModel());
+    req.setPrompt(prompt);
+    return postJson("/api/embeddings", req, OllamaEmbeddingResponse.class);
+  }
+
+  private String baseUrl() {
+    if (props.getBaseUrl() == null || props.getBaseUrl().trim().isEmpty()) {
+      throw new BusinessException("ai.ollama.base-url 未配置");
+    }
+    return props.getBaseUrl().trim();
+  }
+
+  private String fallbackUrl() {
+    if (props.getFallbackUrl() == null || props.getFallbackUrl().trim().isEmpty()) {
+      return null;
+    }
+    return props.getFallbackUrl().trim();
+  }
+
+  private <T> T getJson(String path, Class<T> clazz) {
+    try {
+      return getJsonOnce(baseUrl(), path, clazz);
+    } catch (Exception e) {
+      String fb = fallbackUrl();
+      if (fb == null) {
+        throw e;
+      }
+      return getJsonOnce(fb, path, clazz);
+    }
+  }
+
+  private <T> T getJsonOnce(String base, String path, Class<T> clazz) {
+    Request req = new Request.Builder()
+      .url(join(base, path))
+      .get()
+      .build();
+    try (Response resp = http().newCall(req).execute()) {
+      if (!resp.isSuccessful()) {
+        throw new BusinessException("Ollama GET failed: HTTP " + resp.code());
+      }
+      ResponseBody body = resp.body();
+      if (body == null) {
+        throw new BusinessException("Ollama GET failed: empty body");
+      }
+      return objectMapper.readValue(body.string(), clazz);
+    } catch (IOException e) {
+      throw new BusinessException("Ollama GET IO error: " + e.getMessage());
+    }
+  }
+
+  private <T> T postJson(String path, Object payload, Class<T> clazz) {
+    String json = JSONUtil.toJSONString(payload);
+    try {
+      return postJsonOnce(baseUrl(), path, json, clazz);
+    } catch (Exception e) {
+      String fb = fallbackUrl();
+      if (fb == null) {
+        throw e;
+      }
+      return postJsonOnce(fb, path, json, clazz);
+    }
+  }
+
+  private <T> T postJsonOnce(String base, String path, String json, Class<T> clazz) {
+    Request req = buildPost(base, path, json);
+    try (Response resp = http().newCall(req).execute()) {
+      if (!resp.isSuccessful()) {
+        throw new BusinessException("Ollama POST failed: HTTP " + resp.code());
+      }
+      ResponseBody body = resp.body();
+      if (body == null) {
+        throw new BusinessException("Ollama POST failed: empty body");
+      }
+      return objectMapper.readValue(body.string(), clazz);
+    } catch (IOException e) {
+      throw new BusinessException("Ollama POST IO error: " + e.getMessage());
+    }
+  }
+
+  private Request buildPost(String base, String path, String json) {
+    RequestBody body = RequestBody.create(json, MediaType.parse("application/json; charset=utf-8"));
+    return new Request.Builder()
+      .url(join(base, path))
+      .post(body)
+      .build();
+  }
+
+  private static String join(String base, String path) {
+    String b = base;
+    if (b.endsWith("/")) {
+      b = b.substring(0, b.length() - 1);
+    }
+    String p = path.startsWith("/") ? path : ("/" + path);
+    return b + p;
+  }
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaChatRequest.java

@@ -0,0 +1,19 @@
+package com.gxwebsoft.ai.client.dto;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class OllamaChatRequest {
+  private String model;
+  private List<OllamaMessage> messages;
+  private Boolean stream;
+
+  /**
+   * Ollama options，例如：temperature、top_k、top_p、num_predict...
+   */
+  private Map<String, Object> options;
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaChatResponse.java

@@ -0,0 +1,28 @@
+package com.gxwebsoft.ai.client.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class OllamaChatResponse {
+  private String model;
+
+  @JsonProperty("created_at")
+  private String createdAt;
+
+  private OllamaMessage message;
+
+  private Boolean done;
+
+  @JsonProperty("total_duration")
+  private Long totalDuration;
+
+  @JsonProperty("prompt_eval_count")
+  private Integer promptEvalCount;
+
+  @JsonProperty("eval_count")
+  private Integer evalCount;
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaEmbeddingRequest.java

@@ -0,0 +1,14 @@
+package com.gxwebsoft.ai.client.dto;
+
+import lombok.Data;
+
+@Data
+public class OllamaEmbeddingRequest {
+  private String model;
+
+  /**
+   * Ollama embeddings 目前常用字段为 prompt。
+   */
+  private String prompt;
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaEmbeddingResponse.java

@@ -0,0 +1,13 @@
+package com.gxwebsoft.ai.client.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class OllamaEmbeddingResponse {
+  private List<Double> embedding;
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaMessage.java

@@ -0,0 +1,14 @@
+package com.gxwebsoft.ai.client.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OllamaMessage {
+  private String role;
+  private String content;
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaTagsResponse.java

@@ -0,0 +1,22 @@
+package com.gxwebsoft.ai.client.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class OllamaTagsResponse {
+  private List<Model> models;
+
+  @Data
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  public static class Model {
+    private String name;
+    private Long size;
+    private String digest;
+    private String modified_at;
+  }
+}
+

src/main/java/com/gxwebsoft/ai/config/AiOllamaProperties.java

@@ -0,0 +1,68 @@
+package com.gxwebsoft.ai.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * Ollama API 配置。
+ *
+ * 说明：本项目通过自建 Ollama 网关提供服务，因此这里用 baseUrl + fallbackUrl。
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "ai.ollama")
+public class AiOllamaProperties {
+  /**
+   * 主地址，例如：https://ai-api.websoft.top
+   */
+  private String baseUrl;
+
+  /**
+   * 备用地址，例如：http://47.119.165.234:11434
+   */
+  private String fallbackUrl;
+
+  /**
+   * 对话模型，例如：qwen3.5:cloud
+   */
+  private String chatModel;
+
+  /**
+   * 向量模型，例如：qwen3-embedding:4b
+   */
+  private String embedModel;
+
+  /**
+   * HTTP 超时（毫秒）。
+   */
+  private long connectTimeoutMs = 10_000;
+  private long readTimeoutMs = 300_000;
+  private long writeTimeoutMs = 60_000;
+
+  /**
+   * 并发上限（用于 embedding/入库等批处理场景）。
+   */
+  private int maxConcurrency = 4;
+
+  /**
+   * RAG：检索候选 chunk 最大数量（避免一次性拉取过多数据导致内存/耗时过高）。
+   */
+  private int ragMaxCandidates = 2000;
+
+  /**
+   * RAG：检索返回 topK。
+   */
+  private int ragTopK = 5;
+
+  /**
+   * RAG：单个 chunk 最大字符数（用于入库切分）。
+   */
+  private int ragChunkSize = 800;
+
+  /**
+   * RAG：chunk 重叠字符数（用于减少语义断裂）。
+   */
+  private int ragChunkOverlap = 120;
+}
+

src/main/java/com/gxwebsoft/ai/controller/AiAnalyticsController.java

@@ -0,0 +1,37 @@
+package com.gxwebsoft.ai.controller;
+
+import com.gxwebsoft.ai.dto.*;
+import com.gxwebsoft.ai.service.AiAnalyticsService;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Tag(name = "AI - 订单数据分析")
+@RestController
+@RequestMapping("/api/ai/analytics")
+public class AiAnalyticsController extends BaseController {
+  @Resource
+  private AiAnalyticsService analyticsService;
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "查询商城订单按天指标（当前租户）")
+  @PostMapping("/query")
+  public ApiResult<AiShopMetricsQueryResult> query(@RequestBody AiShopMetricsQueryRequest request) {
+    Integer tenantId = getTenantId();
+    return success(analyticsService.queryShopMetrics(tenantId, request));
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "AI 解析并输出订单分析结论（当前租户）")
+  @PostMapping("/ask")
+  public ApiResult<AiAnalyticsAskResult> ask(@RequestBody AiAnalyticsAskRequest request) {
+    Integer tenantId = getTenantId();
+    return success(analyticsService.askShopAnalytics(tenantId, request));
+  }
+}
+

src/main/java/com/gxwebsoft/ai/controller/AiChatController.java

@@ -0,0 +1,95 @@
+package com.gxwebsoft.ai.controller;
+
+import com.gxwebsoft.ai.client.OllamaClient;
+import com.gxwebsoft.ai.client.dto.OllamaChatResponse;
+import com.gxwebsoft.ai.client.dto.OllamaTagsResponse;
+import com.gxwebsoft.ai.dto.AiChatRequest;
+import com.gxwebsoft.ai.dto.AiChatResult;
+import com.gxwebsoft.ai.dto.AiMessage;
+import com.gxwebsoft.ai.service.AiChatService;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+@Tag(name = "AI - 对话")
+@RestController
+@RequestMapping("/api/ai")
+public class AiChatController extends BaseController {
+  @Resource
+  private OllamaClient ollamaClient;
+
+  @Resource
+  private AiChatService aiChatService;
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "获取 Ollama 模型列表")
+  @GetMapping("/models")
+  public ApiResult<OllamaTagsResponse> models() {
+    return success(ollamaClient.tags());
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "非流式对话")
+  @PostMapping("/chat")
+  public ApiResult<AiChatResult> chat(@RequestBody AiChatRequest request) {
+    return success(aiChatService.chat(request));
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "流式对话（SSE）")
+  @PostMapping("/chat/stream")
+  public SseEmitter chatStream(@RequestBody AiChatRequest request) {
+    // 10 分钟超时（可根据前端需要调整）
+    SseEmitter emitter = new SseEmitter(10 * 60 * 1000L);
+
+    CompletableFuture.runAsync(() -> {
+      try {
+        aiChatService.chatStream(request,
+          delta -> {
+            try {
+              emitter.send(SseEmitter.event().name("delta").data(delta));
+            } catch (Exception e) {
+              // 客户端断开会触发 send 异常，这里直接结束即可
+              emitter.complete();
+            }
+          },
+          (OllamaChatResponse done) -> {
+            try {
+              Map<String, Object> meta = new LinkedHashMap<>();
+              meta.put("model", done.getModel());
+              meta.put("prompt_eval_count", done.getPromptEvalCount());
+              meta.put("eval_count", done.getEvalCount());
+              meta.put("total_duration", done.getTotalDuration());
+              emitter.send(SseEmitter.event().name("done").data(meta));
+            } catch (Exception ignored) {
+            } finally {
+              emitter.complete();
+            }
+          });
+      } catch (Exception e) {
+        emitter.completeWithError(e);
+      }
+    });
+
+    return emitter;
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "流式对话（SSE, GET 版本，便于 EventSource）")
+  @GetMapping("/chat/stream")
+  public SseEmitter chatStreamGet(@RequestParam("prompt") String prompt) {
+    AiChatRequest req = new AiChatRequest();
+    req.setMessages(Collections.singletonList(new AiMessage("user", prompt)));
+    return chatStream(req);
+  }
+}

src/main/java/com/gxwebsoft/ai/controller/AiKbController.java

@@ -0,0 +1,54 @@
+package com.gxwebsoft.ai.controller;
+
+import com.gxwebsoft.ai.dto.*;
+import com.gxwebsoft.ai.service.AiKbRagService;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+@Tag(name = "AI - 知识库(RAG)")
+@RestController
+@RequestMapping("/api/ai/kb")
+public class AiKbController extends BaseController {
+  @Resource
+  private AiKbRagService ragService;
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "上传文档入库（txt/md/html 优先）")
+  @PostMapping("/upload")
+  public ApiResult<AiKbIngestResult> upload(@RequestParam("file") MultipartFile file) {
+    Integer tenantId = getTenantId();
+    return success(ragService.ingestUpload(tenantId, file));
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "同步 CMS 文章到知识库（当前租户）")
+  @PostMapping("/sync/cms")
+  public ApiResult<AiKbIngestResult> syncCms() {
+    Integer tenantId = getTenantId();
+    return success(ragService.syncCms(tenantId));
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "仅检索（返回 topK 命中）")
+  @PostMapping("/query")
+  public ApiResult<AiKbQueryResult> query(@RequestBody AiKbQueryRequest request) {
+    Integer tenantId = getTenantId();
+    return success(ragService.query(tenantId, request));
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "知识库问答（RAG 生成 + 返回检索结果）")
+  @PostMapping("/ask")
+  public ApiResult<AiKbAskResult> ask(@RequestBody AiKbAskRequest request) {
+    Integer tenantId = getTenantId();
+    return success(ragService.ask(tenantId, request));
+  }
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiAnalyticsAskRequest.java

@@ -0,0 +1,13 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiAnalyticsAskRequest", description = "AI 数据分析提问")
+public class AiAnalyticsAskRequest {
+  private String question;
+  private String startDate;
+  private String endDate;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiAnalyticsAskResult.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiAnalyticsAskResult", description = "AI 数据分析结果")
+public class AiAnalyticsAskResult {
+  private String analysis;
+  private AiShopMetricsQueryResult data;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiChatRequest.java

@@ -0,0 +1,35 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(name = "AiChatRequest", description = "AI 对话请求")
+public class AiChatRequest {
+  @Schema(description = "可选：直接传一句话。若 messages 为空则使用该字段构造 user message")
+  private String prompt;
+
+  @Schema(description = "可选：OpenAI 风格 messages（role: system/user/assistant）")
+  private List<AiMessage> messages;
+
+  @Schema(description = "可选：覆盖默认模型")
+  private String model;
+
+  @Schema(description = "是否流式输出（/chat/stream 端点通常忽略此字段）")
+  private Boolean stream;
+
+  @Schema(description = "temperature")
+  private Double temperature;
+
+  @Schema(description = "top_k")
+  private Integer topK;
+
+  @Schema(description = "top_p")
+  private Double topP;
+
+  @Schema(description = "num_predict（类似 max_tokens）")
+  private Integer numPredict;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiChatResult.java

@@ -0,0 +1,15 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "AiChatResult", description = "AI 对话结果")
+public class AiChatResult {
+  private String content;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbAskRequest.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiKbAskRequest", description = "知识库问答请求")
+public class AiKbAskRequest {
+  private String question;
+  private Integer topK;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbAskResult.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiKbAskResult", description = "知识库问答结果")
+public class AiKbAskResult {
+  private String answer;
+  private AiKbQueryResult retrieval;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbHit.java

@@ -0,0 +1,15 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiKbHit", description = "知识库命中")
+public class AiKbHit {
+  private String chunkId;
+  private Integer documentId;
+  private String title;
+  private Double score;
+  private String content;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbIngestResult.java

@@ -0,0 +1,15 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiKbIngestResult", description = "知识库入库结果")
+public class AiKbIngestResult {
+  private Integer documentId;
+  private String title;
+  private Integer chunks;
+  private Integer updatedDocuments;
+  private Integer skippedDocuments;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbQueryRequest.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiKbQueryRequest", description = "知识库检索请求")
+public class AiKbQueryRequest {
+  private String query;
+  private Integer topK;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbQueryResult.java

@@ -0,0 +1,13 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(name = "AiKbQueryResult", description = "知识库检索结果")
+public class AiKbQueryResult {
+  private List<AiKbHit> hits;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiMessage.java

@@ -0,0 +1,14 @@
+package com.gxwebsoft.ai.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AiMessage {
+  private String role;
+  private String content;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiShopMetricsQueryRequest.java

@@ -0,0 +1,18 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiShopMetricsQueryRequest", description = "商城订单指标查询请求")
+public class AiShopMetricsQueryRequest {
+  @Schema(description = "开始日期(YYYY-MM-DD)")
+  private String startDate;
+
+  @Schema(description = "结束日期(YYYY-MM-DD)，包含该天")
+  private String endDate;
+
+  @Schema(description = "是否按天分组，默认 true")
+  private Boolean groupByDay;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiShopMetricsQueryResult.java

@@ -0,0 +1,16 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(name = "AiShopMetricsQueryResult", description = "商城订单指标查询结果")
+public class AiShopMetricsQueryResult {
+  private Integer tenantId;
+  private String startDate;
+  private String endDate;
+  private List<AiShopMetricsRow> rows;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiShopMetricsRow.java

@@ -0,0 +1,23 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Schema(name = "AiShopMetricsRow", description = "商城订单指标行（按 tenant/day）")
+public class AiShopMetricsRow {
+  private Integer tenantId;
+  private String day;
+
+  private Long orderCnt;
+  private Long paidOrderCnt;
+  private BigDecimal gmv;
+  private BigDecimal refundAmt;
+  private Long payUserCnt;
+
+  private BigDecimal aov;
+  private BigDecimal payRate;
+}
+

src/main/java/com/gxwebsoft/ai/entity/AiKbChunk.java

@@ -0,0 +1,57 @@
+package com.gxwebsoft.ai.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库分段（chunk）。
+ */
+@Data
+@Schema(name = "AiKbChunk", description = "AI 知识库分段")
+public class AiKbChunk implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @TableId(value = "id", type = IdType.AUTO)
+  private Integer id;
+
+  private Integer documentId;
+
+  /**
+   * 外部引用用的唯一 ID（便于在答案里引用）。
+   */
+  private String chunkId;
+
+  private Integer chunkIndex;
+
+  private String title;
+
+  private String content;
+
+  private String contentHash;
+
+  /**
+   * embedding JSON（数组），存成文本便于快速落库。
+   */
+  private String embedding;
+
+  /**
+   * embedding 的 L2 范数，用于余弦相似度。
+   */
+  private Double embeddingNorm;
+
+  @TableLogic
+  private Integer deleted;
+
+  private Integer tenantId;
+
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private LocalDateTime createTime;
+}
+

src/main/java/com/gxwebsoft/ai/entity/AiKbDocument.java

@@ -0,0 +1,59 @@
+package com.gxwebsoft.ai.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库文档（来源：上传、CMS 等）。
+ */
+@Data
+@Schema(name = "AiKbDocument", description = "AI 知识库文档")
+public class AiKbDocument implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @TableId(value = "document_id", type = IdType.AUTO)
+  private Integer documentId;
+
+  private String title;
+
+  /**
+   * upload / cms
+   */
+  private String sourceType;
+
+  /**
+   * 例如 CMS article_id
+   */
+  private Integer sourceId;
+
+  /**
+   * 例如文件名、路径等
+   */
+  private String sourceRef;
+
+  /**
+   * 文档文本内容哈希（用于增量同步/去重）。
+   */
+  private String contentHash;
+
+  private Integer status;
+
+  @TableLogic
+  private Integer deleted;
+
+  private Integer tenantId;
+
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private LocalDateTime updateTime;
+
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private LocalDateTime createTime;
+}
+

src/main/java/com/gxwebsoft/ai/mapper/AiKbChunkMapper.java

@@ -0,0 +1,10 @@
+package com.gxwebsoft.ai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gxwebsoft.ai.entity.AiKbChunk;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AiKbChunkMapper extends BaseMapper<AiKbChunk> {
+}
+

src/main/java/com/gxwebsoft/ai/mapper/AiKbDocumentMapper.java

@@ -0,0 +1,10 @@
+package com.gxwebsoft.ai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gxwebsoft.ai.entity.AiKbDocument;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AiKbDocumentMapper extends BaseMapper<AiKbDocument> {
+}
+

src/main/java/com/gxwebsoft/ai/mapper/AiShopAnalyticsMapper.java

@@ -0,0 +1,16 @@
+package com.gxwebsoft.ai.mapper;
+
+import com.gxwebsoft.ai.dto.AiShopMetricsRow;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Mapper
+public interface AiShopAnalyticsMapper {
+  List<AiShopMetricsRow> queryMetrics(@Param("tenantId") Integer tenantId,
+                                      @Param("start") LocalDateTime start,
+                                      @Param("end") LocalDateTime end);
+}
+

src/main/java/com/gxwebsoft/ai/mapper/xml/AiShopAnalyticsMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxwebsoft.ai.mapper.AiShopAnalyticsMapper">
+
+  <select id="queryMetrics" resultType="com.gxwebsoft.ai.dto.AiShopMetricsRow">
+    SELECT
+      tenant_id,
+      DATE_FORMAT(create_time, '%Y-%m-%d') AS day,
+      COUNT(1) AS order_cnt,
+      SUM(CASE WHEN pay_status = 1 THEN 1 ELSE 0 END) AS paid_order_cnt,
+      SUM(CASE WHEN pay_status = 1 THEN COALESCE(pay_price, 0) ELSE 0 END) AS gmv,
+      SUM(CASE WHEN COALESCE(refund_money, 0) &gt; 0 THEN COALESCE(refund_money, 0) ELSE 0 END) AS refund_amt,
+      COUNT(DISTINCT IF(pay_status = 1, user_id, NULL)) AS pay_user_cnt
+    FROM shop_order
+    WHERE deleted = 0
+      AND tenant_id = #{tenantId}
+      AND create_time &gt;= #{start}
+      AND create_time &lt; #{end}
+    GROUP BY tenant_id, DATE_FORMAT(create_time, '%Y-%m-%d')
+    ORDER BY day ASC
+  </select>
+
+</mapper>
+

src/main/java/com/gxwebsoft/ai/prompt/AiPrompts.java

@@ -0,0 +1,24 @@
+package com.gxwebsoft.ai.prompt;
+
+/**
+ * 统一提示词模板（尽量简短、可控）。
+ */
+public class AiPrompts {
+  private AiPrompts() {
+  }
+
+  public static final String SYSTEM_SUPPORT =
+    "你是 WebSoft 客服AI。规则：\n" +
+      "- 只使用给定的“上下文资料”回答，禁止编造。\n" +
+      "- 如果资料不足，直接说“资料不足”，并列出需要补充的信息。\n" +
+      "- 答案末尾必须给引用，格式：[source:chunk_id]。\n" +
+      "- 输出中文，简洁可执行。\n";
+
+  public static final String SYSTEM_ANALYTICS =
+    "你是商城订单数据分析助手。你将基于提供的按天指标数据给出结论。\n" +
+      "要求：\n" +
+      "- 只基于数据陈述，不要编造不存在的数字。\n" +
+      "- 输出包含：结论、关键指标变化、异常点、建议的下一步核查。\n" +
+      "- 输出中文，简洁。\n";
+}
+

src/main/java/com/gxwebsoft/ai/service/AiAnalyticsService.java

@@ -0,0 +1,82 @@
+package com.gxwebsoft.ai.service;
+
+import cn.hutool.core.util.StrUtil;
+import com.gxwebsoft.ai.dto.*;
+import com.gxwebsoft.ai.prompt.AiPrompts;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.JSONUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeParseException;
+import java.util.Arrays;
+
+@Service
+public class AiAnalyticsService {
+  @Resource
+  private AiShopAnalyticsService shopAnalyticsService;
+  @Resource
+  private AiChatService aiChatService;
+
+  public AiShopMetricsQueryResult queryShopMetrics(Integer tenantId, AiShopMetricsQueryRequest request) {
+    if (tenantId == null) {
+      throw new BusinessException("tenantId 不能为空");
+    }
+    if (request == null) {
+      throw new BusinessException("请求不能为空");
+    }
+    LocalDate start = parseDate(request.getStartDate(), "startDate");
+    LocalDate end = parseDate(request.getEndDate(), "endDate");
+    if (end.isBefore(start)) {
+      throw new BusinessException("endDate 不能早于 startDate");
+    }
+
+    AiShopMetricsQueryResult r = new AiShopMetricsQueryResult();
+    r.setTenantId(tenantId);
+    r.setStartDate(start.toString());
+    r.setEndDate(end.toString());
+    r.setRows(shopAnalyticsService.queryTenantDaily(tenantId, start, end));
+    return r;
+  }
+
+  public AiAnalyticsAskResult askShopAnalytics(Integer tenantId, AiAnalyticsAskRequest request) {
+    if (request == null || StrUtil.isBlank(request.getQuestion())) {
+      throw new BusinessException("question 不能为空");
+    }
+    AiShopMetricsQueryRequest q = new AiShopMetricsQueryRequest();
+    q.setStartDate(request.getStartDate());
+    q.setEndDate(request.getEndDate());
+    q.setGroupByDay(true);
+    AiShopMetricsQueryResult data = queryShopMetrics(tenantId, q);
+
+    String userPrompt =
+      "用户问题：\n" + request.getQuestion() + "\n\n" +
+        "数据（JSON，字段含义：order_cnt=订单数，paid_order_cnt=已支付订单数，gmv=已支付金额，refund_amt=退款金额，pay_user_cnt=支付用户数，aov=客单价，pay_rate=支付率）：\n" +
+        JSONUtil.toJSONString(data, true);
+
+    AiChatRequest chat = new AiChatRequest();
+    chat.setMessages(Arrays.asList(
+      new AiMessage("system", AiPrompts.SYSTEM_ANALYTICS),
+      new AiMessage("user", userPrompt)
+    ));
+
+    AiChatResult resp = aiChatService.chat(chat);
+    AiAnalyticsAskResult r = new AiAnalyticsAskResult();
+    r.setAnalysis(resp.getContent());
+    r.setData(data);
+    return r;
+  }
+
+  private static LocalDate parseDate(String s, String field) {
+    if (StrUtil.isBlank(s)) {
+      throw new BusinessException(field + " 不能为空，格式 YYYY-MM-DD");
+    }
+    try {
+      return LocalDate.parse(s.trim());
+    } catch (DateTimeParseException e) {
+      throw new BusinessException(field + " 格式错误，需 YYYY-MM-DD");
+    }
+  }
+}
+

src/main/java/com/gxwebsoft/ai/service/AiChatService.java

@@ -0,0 +1,94 @@
+package com.gxwebsoft.ai.service;
+
+import cn.hutool.core.util.StrUtil;
+import com.gxwebsoft.ai.client.OllamaClient;
+import com.gxwebsoft.ai.client.dto.OllamaChatRequest;
+import com.gxwebsoft.ai.client.dto.OllamaChatResponse;
+import com.gxwebsoft.ai.client.dto.OllamaMessage;
+import com.gxwebsoft.ai.config.AiOllamaProperties;
+import com.gxwebsoft.ai.dto.AiChatRequest;
+import com.gxwebsoft.ai.dto.AiChatResult;
+import com.gxwebsoft.ai.dto.AiMessage;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Consumer;
+
+@Service
+public class AiChatService {
+  @Resource
+  private AiOllamaProperties props;
+
+  @Resource
+  private OllamaClient ollamaClient;
+
+  public AiChatResult chat(AiChatRequest request) {
+    OllamaChatRequest req = buildChatRequest(request, false);
+    OllamaChatResponse resp = ollamaClient.chat(req);
+    String content = resp != null && resp.getMessage() != null ? resp.getMessage().getContent() : null;
+    return new AiChatResult(content == null ? "" : content);
+  }
+
+  public void chatStream(AiChatRequest request, Consumer<String> onDelta, Consumer<OllamaChatResponse> onFinal) {
+    Objects.requireNonNull(onDelta, "onDelta");
+    OllamaChatRequest req = buildChatRequest(request, true);
+    ollamaClient.chatStream(req, event -> {
+      String delta = event != null && event.getMessage() != null ? event.getMessage().getContent() : null;
+      if (StrUtil.isNotBlank(delta)) {
+        onDelta.accept(delta);
+      }
+      if (Boolean.TRUE.equals(event.getDone()) && onFinal != null) {
+        onFinal.accept(event);
+      }
+    });
+  }
+
+  private OllamaChatRequest buildChatRequest(AiChatRequest request, boolean stream) {
+    if (request == null) {
+      throw new BusinessException("请求不能为空");
+    }
+
+    List<AiMessage> messages = request.getMessages();
+    if ((messages == null || messages.isEmpty()) && StrUtil.isBlank(request.getPrompt())) {
+      throw new BusinessException("prompt 或 messages 不能为空");
+    }
+    if (messages == null || messages.isEmpty()) {
+      messages = Collections.singletonList(new AiMessage("user", request.getPrompt()));
+    }
+
+    List<OllamaMessage> ollamaMessages = new ArrayList<>();
+    for (AiMessage m : messages) {
+      if (m == null || StrUtil.isBlank(m.getRole()) || m.getContent() == null) {
+        continue;
+      }
+      ollamaMessages.add(new OllamaMessage(m.getRole(), m.getContent()));
+    }
+    if (ollamaMessages.isEmpty()) {
+      throw new BusinessException("messages 为空或无有效内容");
+    }
+
+    Map<String, Object> options = new HashMap<>();
+    if (request.getTemperature() != null) {
+      options.put("temperature", request.getTemperature());
+    }
+    if (request.getTopK() != null) {
+      options.put("top_k", request.getTopK());
+    }
+    if (request.getTopP() != null) {
+      options.put("top_p", request.getTopP());
+    }
+    if (request.getNumPredict() != null) {
+      options.put("num_predict", request.getNumPredict());
+    }
+
+    OllamaChatRequest req = new OllamaChatRequest();
+    req.setModel(StrUtil.blankToDefault(request.getModel(), props.getChatModel()));
+    req.setMessages(ollamaMessages);
+    req.setStream(stream);
+    req.setOptions(options.isEmpty() ? null : options);
+    return req;
+  }
+}
+

src/main/java/com/gxwebsoft/ai/service/AiKbChunkService.java

@@ -0,0 +1,8 @@
+package com.gxwebsoft.ai.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.ai.entity.AiKbChunk;
+
+public interface AiKbChunkService extends IService<AiKbChunk> {
+}
+

src/main/java/com/gxwebsoft/ai/service/AiKbDocumentService.java

@@ -0,0 +1,8 @@
+package com.gxwebsoft.ai.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.ai.entity.AiKbDocument;
+
+public interface AiKbDocumentService extends IService<AiKbDocument> {
+}
+

src/main/java/com/gxwebsoft/ai/service/AiKbRagService.java

@@ -0,0 +1,426 @@
+package com.gxwebsoft.ai.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.ai.client.OllamaClient;
+import com.gxwebsoft.ai.client.dto.OllamaEmbeddingResponse;
+import com.gxwebsoft.ai.config.AiOllamaProperties;
+import com.gxwebsoft.ai.dto.*;
+import com.gxwebsoft.ai.entity.AiKbChunk;
+import com.gxwebsoft.ai.entity.AiKbDocument;
+import com.gxwebsoft.ai.prompt.AiPrompts;
+import com.gxwebsoft.ai.util.AiTextUtil;
+import com.gxwebsoft.cms.entity.CmsArticle;
+import com.gxwebsoft.cms.entity.CmsArticleContent;
+import com.gxwebsoft.cms.service.CmsArticleContentService;
+import com.gxwebsoft.cms.service.CmsArticleService;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.JSONUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.tika.Tika;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+@Service
+public class AiKbRagService {
+  @Resource
+  private AiOllamaProperties props;
+  @Resource
+  private OllamaClient ollamaClient;
+  @Resource
+  private AiKbDocumentService documentService;
+  @Resource
+  private AiKbChunkService chunkService;
+  @Resource
+  private CmsArticleService cmsArticleService;
+  @Resource
+  private CmsArticleContentService cmsArticleContentService;
+  @Resource
+  private AiChatService aiChatService;
+  @Resource
+  private ObjectMapper objectMapper;
+
+  private final Tika tika = new Tika();
+  private volatile ExecutorService embedPool;
+
+  private ExecutorService pool() {
+    ExecutorService p = embedPool;
+    if (p != null) {
+      return p;
+    }
+    synchronized (this) {
+      if (embedPool == null) {
+        embedPool = Executors.newFixedThreadPool(Math.max(1, props.getMaxConcurrency()));
+      }
+      return embedPool;
+    }
+  }
+
+  public AiKbIngestResult ingestUpload(Integer tenantId, MultipartFile file) {
+    if (tenantId == null) {
+      throw new BusinessException("tenantId 不能为空");
+    }
+    if (file == null || file.isEmpty()) {
+      throw new BusinessException("文件不能为空");
+    }
+    String title = StrUtil.blankToDefault(file.getOriginalFilename(), "upload");
+    String text = extractText(file);
+    if (StrUtil.isBlank(text)) {
+      throw new BusinessException("无法解析文件内容，请上传 txt/md/html 等可解析文本");
+    }
+
+    String contentHash = AiTextUtil.sha256(text);
+    AiKbDocument doc = new AiKbDocument();
+    doc.setTitle(title);
+    doc.setSourceType("upload");
+    doc.setSourceRef(title);
+    doc.setContentHash(contentHash);
+    doc.setStatus(0);
+    doc.setTenantId(tenantId);
+    doc.setCreateTime(LocalDateTime.now());
+    doc.setUpdateTime(LocalDateTime.now());
+    documentService.save(doc);
+
+    int chunks = ingestChunks(doc, text);
+
+    AiKbIngestResult r = new AiKbIngestResult();
+    r.setDocumentId(doc.getDocumentId());
+    r.setTitle(doc.getTitle());
+    r.setChunks(chunks);
+    r.setUpdatedDocuments(1);
+    r.setSkippedDocuments(0);
+    return r;
+  }
+
+  /**
+   * 同步 CMS（仅当前 tenant）。
+   */
+  public AiKbIngestResult syncCms(Integer tenantId) {
+    if (tenantId == null) {
+      throw new BusinessException("tenantId 不能为空");
+    }
+    // 仅同步“已发布且未删除”的文章
+    List<CmsArticle> articles = cmsArticleService.list(new LambdaQueryWrapper<CmsArticle>()
+      .eq(CmsArticle::getTenantId, tenantId)
+      .eq(CmsArticle::getDeleted, 0)
+      .eq(CmsArticle::getStatus, 0));
+    if (articles == null || articles.isEmpty()) {
+      AiKbIngestResult r = new AiKbIngestResult();
+      r.setUpdatedDocuments(0);
+      r.setSkippedDocuments(0);
+      r.setChunks(0);
+      return r;
+    }
+
+    Set<Integer> articleIds = articles.stream().map(CmsArticle::getArticleId).collect(Collectors.toSet());
+    List<CmsArticleContent> contents = cmsArticleContentService.list(new LambdaQueryWrapper<CmsArticleContent>()
+      .in(CmsArticleContent::getArticleId, articleIds));
+
+    Map<Integer, CmsArticleContent> contentByArticle = contents.stream()
+      .collect(Collectors.toMap(
+        CmsArticleContent::getArticleId,
+        c -> c,
+        (a, b) -> (a.getCreateTime() != null && b.getCreateTime() != null && a.getCreateTime().isAfter(b.getCreateTime())) ? a : b
+      ));
+
+    int updatedDocs = 0;
+    int skippedDocs = 0;
+    int totalChunks = 0;
+
+    for (CmsArticle a : articles) {
+      CmsArticleContent c = contentByArticle.get(a.getArticleId());
+      String raw = "";
+      if (a.getOverview() != null) {
+        raw += a.getOverview() + "\n";
+      }
+      if (c != null && c.getContent() != null) {
+        raw += c.getContent();
+      }
+      String text = a.getTitle() + "\n" + AiTextUtil.stripHtml(raw);
+      text = AiTextUtil.normalizeWhitespace(text);
+      if (StrUtil.isBlank(text)) {
+        continue;
+      }
+      String hash = AiTextUtil.sha256(text);
+
+      AiKbDocument existing = documentService.getOne(new LambdaQueryWrapper<AiKbDocument>()
+        .eq(AiKbDocument::getTenantId, tenantId)
+        .eq(AiKbDocument::getSourceType, "cms")
+        .eq(AiKbDocument::getSourceId, a.getArticleId())
+        .last("limit 1"));
+
+      if (existing != null && StrUtil.equals(existing.getContentHash(), hash)) {
+        skippedDocs++;
+        continue;
+      }
+
+      AiKbDocument doc;
+      if (existing == null) {
+        doc = new AiKbDocument();
+        doc.setTitle(a.getTitle());
+        doc.setSourceType("cms");
+        doc.setSourceId(a.getArticleId());
+        doc.setSourceRef(a.getCode());
+        doc.setContentHash(hash);
+        doc.setStatus(0);
+        doc.setTenantId(tenantId);
+        doc.setCreateTime(LocalDateTime.now());
+        doc.setUpdateTime(LocalDateTime.now());
+        documentService.save(doc);
+      } else {
+        doc = existing;
+        doc.setTitle(a.getTitle());
+        doc.setSourceRef(a.getCode());
+        doc.setContentHash(hash);
+        doc.setUpdateTime(LocalDateTime.now());
+        documentService.updateById(doc);
+        // 重新入库：先删除旧 chunk
+        chunkService.remove(new LambdaQueryWrapper<AiKbChunk>().eq(AiKbChunk::getDocumentId, doc.getDocumentId()));
+      }
+
+      int chunks = ingestChunks(doc, text);
+      totalChunks += chunks;
+      updatedDocs++;
+    }
+
+    AiKbIngestResult r = new AiKbIngestResult();
+    r.setUpdatedDocuments(updatedDocs);
+    r.setSkippedDocuments(skippedDocs);
+    r.setChunks(totalChunks);
+    return r;
+  }
+
+  public AiKbQueryResult query(Integer tenantId, AiKbQueryRequest request) {
+    if (tenantId == null) {
+      throw new BusinessException("tenantId 不能为空");
+    }
+    if (request == null || StrUtil.isBlank(request.getQuery())) {
+      throw new BusinessException("query 不能为空");
+    }
+    int topK = request.getTopK() != null ? request.getTopK() : props.getRagTopK();
+    topK = Math.max(1, Math.min(20, topK));
+
+    float[] qEmb = embedding(request.getQuery());
+    float qNorm = l2(qEmb);
+    if (qNorm == 0f) {
+      throw new BusinessException("query embedding 为空");
+    }
+
+    // MVP：按 tenant 拉取最新 N 条候选 chunk，再做余弦相似度排序
+    List<AiKbChunk> candidates = chunkService.list(new LambdaQueryWrapper<AiKbChunk>()
+      .eq(AiKbChunk::getTenantId, tenantId)
+      .orderByDesc(AiKbChunk::getId)
+      .last("limit " + props.getRagMaxCandidates()));
+
+    PriorityQueue<AiKbHit> pq = new PriorityQueue<>(Comparator.comparingDouble(h -> h.getScore() == null ? -1d : h.getScore()));
+    for (AiKbChunk c : candidates) {
+      if (StrUtil.isBlank(c.getEmbedding())) {
+        continue;
+      }
+      float[] cEmb = parseEmbedding(c.getEmbedding());
+      if (cEmb == null || cEmb.length == 0) {
+        continue;
+      }
+      Double cNormD = c.getEmbeddingNorm();
+      float cNorm = cNormD == null ? l2(cEmb) : cNormD.floatValue();
+      if (cNorm == 0f) {
+        continue;
+      }
+      double score = dot(qEmb, cEmb) / (qNorm * cNorm);
+      AiKbHit hit = new AiKbHit();
+      hit.setChunkId(c.getChunkId());
+      hit.setDocumentId(c.getDocumentId());
+      hit.setTitle(StrUtil.blankToDefault(c.getTitle(), ""));
+      hit.setScore(score);
+      // 返回给前端时避免过长
+      hit.setContent(clip(c.getContent(), 900));
+
+      if (pq.size() < topK) {
+        pq.add(hit);
+      } else if (hit.getScore() != null && hit.getScore() > pq.peek().getScore()) {
+        pq.poll();
+        pq.add(hit);
+      }
+    }
+
+    List<AiKbHit> hits = new ArrayList<>(pq);
+    hits.sort((a, b) -> Double.compare(b.getScore(), a.getScore()));
+    AiKbQueryResult r = new AiKbQueryResult();
+    r.setHits(hits);
+    return r;
+  }
+
+  public AiKbAskResult ask(Integer tenantId, AiKbAskRequest request) {
+    if (request == null || StrUtil.isBlank(request.getQuestion())) {
+      throw new BusinessException("question 不能为空");
+    }
+    AiKbQueryRequest q = new AiKbQueryRequest();
+    q.setQuery(request.getQuestion());
+    q.setTopK(request.getTopK());
+    AiKbQueryResult retrieval = query(tenantId, q);
+
+    String context = buildContext(retrieval);
+    String userPrompt = "上下文资料：\n" + context + "\n\n用户问题：\n" + request.getQuestion();
+
+    AiChatRequest chatReq = new AiChatRequest();
+    chatReq.setMessages(Arrays.asList(
+      new AiMessage("system", AiPrompts.SYSTEM_SUPPORT),
+      new AiMessage("user", userPrompt)
+    ));
+    AiChatResult chat = aiChatService.chat(chatReq);
+
+    AiKbAskResult r = new AiKbAskResult();
+    r.setAnswer(chat.getContent());
+    r.setRetrieval(retrieval);
+    return r;
+  }
+
+  private int ingestChunks(AiKbDocument doc, String text) {
+    List<String> chunks = AiTextUtil.chunkText(text, props.getRagChunkSize(), props.getRagChunkOverlap());
+    if (chunks.isEmpty()) {
+      return 0;
+    }
+    LocalDateTime now = LocalDateTime.now();
+
+    List<CompletableFuture<AiKbChunk>> futures = new ArrayList<>(chunks.size());
+    for (int i = 0; i < chunks.size(); i++) {
+      final int idx = i;
+      final String chunkText = chunks.get(i);
+      futures.add(CompletableFuture.supplyAsync(() -> {
+        OllamaEmbeddingResponse emb = ollamaClient.embedding(chunkText);
+        if (emb == null || emb.getEmbedding() == null || emb.getEmbedding().isEmpty()) {
+          throw new BusinessException("embedding 生成失败");
+        }
+        float[] v = toFloat(emb.getEmbedding());
+        float norm = l2(v);
+        AiKbChunk c = new AiKbChunk();
+        c.setDocumentId(doc.getDocumentId());
+        c.setChunkId(UUID.randomUUID().toString().replace("-", ""));
+        c.setChunkIndex(idx);
+        c.setTitle(doc.getTitle());
+        c.setContent(chunkText);
+        c.setContentHash(AiTextUtil.sha256(chunkText));
+        c.setEmbedding(JSONUtil.toJSONString(emb.getEmbedding()));
+        c.setEmbeddingNorm((double) norm);
+        c.setTenantId(doc.getTenantId());
+        c.setCreateTime(now);
+        c.setDeleted(0);
+        return c;
+      }, pool()));
+    }
+
+    List<AiKbChunk> entities = futures.stream().map(f -> {
+      try {
+        return f.get(10, TimeUnit.MINUTES);
+      } catch (Exception e) {
+        throw new BusinessException("embedding 批处理失败: " + e.getMessage());
+      }
+    }).collect(Collectors.toList());
+
+    chunkService.saveBatch(entities);
+    return entities.size();
+  }
+
+  private String extractText(MultipartFile file) {
+    try {
+      String contentType = file.getContentType();
+      String filename = file.getOriginalFilename();
+
+      // 优先：对纯文本直接读 UTF-8
+      if ((contentType != null && contentType.startsWith("text/"))
+        || (filename != null && (filename.endsWith(".txt") || filename.endsWith(".md") || filename.endsWith(".html") || filename.endsWith(".htm")))) {
+        return AiTextUtil.normalizeWhitespace(new String(file.getBytes(), StandardCharsets.UTF_8));
+      }
+
+      // 尝试用 tika 解析（注意：当前依赖为 tika-core，解析能力有限）
+      String parsed = tika.parseToString(file.getInputStream());
+      return AiTextUtil.normalizeWhitespace(parsed);
+    } catch (Exception e) {
+      return "";
+    }
+  }
+
+  private float[] embedding(String text) {
+    OllamaEmbeddingResponse emb = ollamaClient.embedding(text);
+    if (emb == null || emb.getEmbedding() == null || emb.getEmbedding().isEmpty()) {
+      throw new BusinessException("embedding 生成失败");
+    }
+    return toFloat(emb.getEmbedding());
+  }
+
+  private float[] parseEmbedding(String json) {
+    try {
+      // embedding 是一维数组，存储为 JSON 文本
+      double[] d = ObjectUtil.isEmpty(json) ? null : objectMapper.readValue(json, double[].class);
+      if (d == null || d.length == 0) {
+        return null;
+      }
+      float[] f = new float[d.length];
+      for (int i = 0; i < d.length; i++) {
+        f[i] = (float) d[i];
+      }
+      return f;
+    } catch (Exception e) {
+      return null;
+    }
+  }
+
+  private static float[] toFloat(List<Double> v) {
+    float[] out = new float[v.size()];
+    for (int i = 0; i < v.size(); i++) {
+      Double d = v.get(i);
+      out[i] = d == null ? 0f : d.floatValue();
+    }
+    return out;
+  }
+
+  private static float dot(float[] a, float[] b) {
+    int n = Math.min(a.length, b.length);
+    double s = 0d;
+    for (int i = 0; i < n; i++) {
+      s += (double) a[i] * (double) b[i];
+    }
+    return (float) s;
+  }
+
+  private static float l2(float[] a) {
+    double s = 0d;
+    for (float v : a) {
+      s += (double) v * (double) v;
+    }
+    return (float) Math.sqrt(s);
+  }
+
+  private static String clip(String s, int max) {
+    if (s == null) {
+      return "";
+    }
+    if (s.length() <= max) {
+      return s;
+    }
+    return s.substring(0, max) + "...";
+  }
+
+  private static String buildContext(AiKbQueryResult retrieval) {
+    if (retrieval == null || retrieval.getHits() == null || retrieval.getHits().isEmpty()) {
+      return "(无)";
+    }
+    StringBuilder sb = new StringBuilder();
+    for (AiKbHit h : retrieval.getHits()) {
+      sb.append("[source:").append(h.getChunkId()).append("] ");
+      if (StrUtil.isNotBlank(h.getTitle())) {
+        sb.append(h.getTitle()).append("\n");
+      }
+      sb.append(h.getContent()).append("\n\n");
+    }
+    return sb.toString();
+  }
+}

src/main/java/com/gxwebsoft/ai/service/AiShopAnalyticsService.java

@@ -0,0 +1,46 @@
+package com.gxwebsoft.ai.service;
+
+import com.gxwebsoft.ai.dto.AiShopMetricsRow;
+import com.gxwebsoft.ai.mapper.AiShopAnalyticsMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class AiShopAnalyticsService {
+  @Resource
+  private AiShopAnalyticsMapper mapper;
+
+  public List<AiShopMetricsRow> queryTenantDaily(Integer tenantId, LocalDate startDate, LocalDate endDateInclusive) {
+    LocalDateTime start = startDate.atStartOfDay();
+    LocalDateTime endExclusive = endDateInclusive.plusDays(1).atStartOfDay();
+    List<AiShopMetricsRow> rows = mapper.queryMetrics(tenantId, start, endExclusive);
+    if (rows == null) {
+      return null;
+    }
+    for (AiShopMetricsRow r : rows) {
+      long orderCnt = r.getOrderCnt() == null ? 0L : r.getOrderCnt();
+      long paidCnt = r.getPaidOrderCnt() == null ? 0L : r.getPaidOrderCnt();
+      BigDecimal gmv = r.getGmv() == null ? BigDecimal.ZERO : r.getGmv();
+
+      if (paidCnt > 0) {
+        r.setAov(gmv.divide(BigDecimal.valueOf(paidCnt), 4, RoundingMode.HALF_UP));
+      } else {
+        r.setAov(BigDecimal.ZERO);
+      }
+      if (orderCnt > 0) {
+        r.setPayRate(BigDecimal.valueOf(paidCnt)
+          .divide(BigDecimal.valueOf(orderCnt), 4, RoundingMode.HALF_UP));
+      } else {
+        r.setPayRate(BigDecimal.ZERO);
+      }
+    }
+    return rows;
+  }
+}
+

src/main/java/com/gxwebsoft/ai/service/impl/AiKbChunkServiceImpl.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.ai.entity.AiKbChunk;
+import com.gxwebsoft.ai.mapper.AiKbChunkMapper;
+import com.gxwebsoft.ai.service.AiKbChunkService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AiKbChunkServiceImpl extends ServiceImpl<AiKbChunkMapper, AiKbChunk> implements AiKbChunkService {
+}
+

src/main/java/com/gxwebsoft/ai/service/impl/AiKbDocumentServiceImpl.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.ai.entity.AiKbDocument;
+import com.gxwebsoft.ai.mapper.AiKbDocumentMapper;
+import com.gxwebsoft.ai.service.AiKbDocumentService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AiKbDocumentServiceImpl extends ServiceImpl<AiKbDocumentMapper, AiKbDocument> implements AiKbDocumentService {
+}
+

src/main/java/com/gxwebsoft/ai/util/AiTextUtil.java

@@ -0,0 +1,100 @@
+package com.gxwebsoft.ai.util;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.List;
+
+public class AiTextUtil {
+  private AiTextUtil() {
+  }
+
+  public static String sha256(String s) {
+    if (s == null) {
+      return null;
+    }
+    try {
+      MessageDigest md = MessageDigest.getInstance("SHA-256");
+      byte[] dig = md.digest(s.getBytes(StandardCharsets.UTF_8));
+      StringBuilder sb = new StringBuilder(dig.length * 2);
+      for (byte b : dig) {
+        sb.append(String.format("%02x", b));
+      }
+      return sb.toString();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * 很轻量的 HTML 转纯文本（不追求完美，只用于知识库入库前清洗）。
+   */
+  public static String stripHtml(String html) {
+    if (StrUtil.isBlank(html)) {
+      return "";
+    }
+    String s = html;
+    s = s.replaceAll("(?is)<script[^>]*>.*?</script>", " ");
+    s = s.replaceAll("(?is)<style[^>]*>.*?</style>", " ");
+    s = s.replaceAll("(?is)<br\\s*/?>", "\n");
+    s = s.replaceAll("(?is)</p\\s*>", "\n");
+    s = s.replaceAll("(?is)<[^>]+>", " ");
+    // 常见 HTML 实体最小处理
+    s = s.replace("&nbsp;", " ");
+    s = s.replace("&lt;", "<").replace("&gt;", ">").replace("&amp;", "&").replace("&quot;", "\"");
+    return normalizeWhitespace(s);
+  }
+
+  public static String normalizeWhitespace(String s) {
+    if (s == null) {
+      return "";
+    }
+    // 合并空白，保留换行用于 chunking
+    String x = s.replace("\r", "\n");
+    x = x.replaceAll("[\\t\\f\\u000B]+", " ");
+    x = x.replaceAll("[ ]{2,}", " ");
+    x = x.replaceAll("\\n{3,}", "\n\n");
+    return x.trim();
+  }
+
+  /**
+   * 按字符数切分，并做固定 overlap。
+   */
+  public static List<String> chunkText(String text, int chunkSize, int overlap) {
+    String s = normalizeWhitespace(text);
+    List<String> out = new ArrayList<>();
+    if (StrUtil.isBlank(s)) {
+      return out;
+    }
+    if (chunkSize <= 0) {
+      chunkSize = 800;
+    }
+    if (overlap < 0) {
+      overlap = 0;
+    }
+    if (overlap >= chunkSize) {
+      overlap = Math.max(0, chunkSize / 5);
+    }
+
+    int n = s.length();
+    int start = 0;
+    while (start < n) {
+      int end = Math.min(n, start + chunkSize);
+      String chunk = s.substring(start, end).trim();
+      if (!chunk.isEmpty()) {
+        out.add(chunk);
+      }
+      if (end >= n) {
+        break;
+      }
+      start = end - overlap;
+      if (start < 0) {
+        start = 0;
+      }
+    }
+    return out;
+  }
+}
+

src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml

@@ -6,8 +6,9 @@
     <sql id="selectSql">
         SELECT a.*, b.title as parentName, b.position as parentPosition, c.name as modelName
         FROM cms_navigation a
-        LEFT JOIN cms_navigation b ON a.parent_id = b.navigation_id
+        LEFT JOIN cms_navigation b ON a.parent_id = b.navigation_id AND b.deleted = 0 AND b.tenant_id = a.tenant_id
-        LEFT JOIN cms_model c ON a.model = c.model
+        <!-- c.model = 0 会触发 MySQL 字符串转数字比较，导致几乎所有模型都匹配，从而把导航行成倍放大 -->
+        LEFT JOIN cms_model c ON a.model = c.model AND c.deleted = 0 AND c.tenant_id = a.tenant_id
         <where>
             <if test="param.navigationId != null">
                 AND a.navigation_id = #{param.navigationId}

src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java

@@ -337,9 +337,16 @@ public class CmsWebsiteServiceImpl extends ServiceImpl<CmsWebsiteMapper, CmsWebs
     if (StrUtil.isNotBlank(siteInfo)) {
       log.info("从缓存获取网站信息，租户ID: {}", tenantId);
       try {
-        return JSONUtil.parseObject(siteInfo, ShopVo.class);
+        // 兼容历史缓存：JSON "null" 会被解析为 null；此时应视为未命中并回源数据库。
+        ShopVo cacheVo = JSONUtil.parseObject(siteInfo, ShopVo.class);
+        if (cacheVo != null) {
+          return cacheVo;
+        }
+        log.warn("网站信息缓存命中但内容为空(null)，清理缓存后回源数据库，租户ID: {}", tenantId);
+        redisUtil.delete(cacheKey);
       } catch (Exception e) {
-        log.warn("缓存解析失败，从数据库重新获取: {}", e.getMessage());
+        log.warn("缓存解析失败，清理缓存后从数据库重新获取: {}", e.getMessage());
+        redisUtil.delete(cacheKey);
       }
     }
 

src/main/java/com/gxwebsoft/common/core/config/ConfigProperties.java

@@ -92,6 +92,11 @@ public class ConfigProperties {
    */
   private String serverUrl;
 
+  /**
+   * API网关地址
+   */
+  private String apiUrl;
+
   /**
    * 阿里云存储 OSS
    * Endpoint

src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java

@@ -67,6 +67,7 @@ public class SecurityConfig {
                         "/api/shop/wx-login/**",
                         "/api/shop/wx-native-pay/**",
                         "/api/shop/wx-pay/**",
+                        "/api/system/wx-pay/**",
                         "/api/bszx/bszx-pay/notify/**",
                         "/api/wxWorkQrConnect",
                         "/WW_verify_QMv7HoblYU6z63bb.txt",

src/main/java/com/gxwebsoft/common/core/service/EnvironmentAwarePaymentService.java

@@ -50,15 +50,26 @@ public class EnvironmentAwarePaymentService {
             return null;
         }
 
-        // 根据环境调整回调地址
+        // 开发/测试环境允许强制覆盖，方便本地联调。
+        if (isDevelopmentEnvironment()) {
+            Payment envPayment = clonePayment(payment);
+            String notifyUrl = getEnvironmentNotifyUrl();
+            log.info("环境感知支付配置(开发/测试) - 环境: {}, 原始回调: {}, 覆盖后回调: {}",
+                activeProfile, payment.getNotifyUrl(), notifyUrl);
+            envPayment.setNotifyUrl(notifyUrl);
+            return envPayment;
+        }
+
+        // 生产/其它环境：优先使用数据库中的 notifyUrl（多租户域名可能不同）。
+        if (payment.getNotifyUrl() != null && !payment.getNotifyUrl().trim().isEmpty()) {
+            return payment;
+        }
+
+        // 数据库未配置时才兜底使用环境配置。
         Payment envPayment = clonePayment(payment);
         String notifyUrl = getEnvironmentNotifyUrl();
-        
+        log.info("环境感知支付配置(兜底) - 环境: {}, 原始回调为空，兜底回调: {}", activeProfile, notifyUrl);
-        log.info("环境感知支付配置 - 环境: {}, 原始回调: {}, 调整后回调: {}", 
-                activeProfile, payment.getNotifyUrl(), notifyUrl);
-        
         envPayment.setNotifyUrl(notifyUrl);
-        
         return envPayment;
     }
 

src/main/java/com/gxwebsoft/common/core/web/ImportParams.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.afterturn.easypoi.excel.entity;
+package com.gxwebsoft.common.core.web;
 
+import cn.afterturn.easypoi.excel.entity.ExcelBaseParams;
 import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler;
 import lombok.Data;
 

src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java

@@ -42,7 +42,6 @@ import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeUnit;
 
 import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_WEIXIN;
 import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY;
@@ -246,27 +245,30 @@ public class WxLoginController extends BaseController {
    * @param userParam 需要传微信凭证code
    */
   private String getPhoneByCode(UserParam userParam) {
-    // 获取手机号码
-    String apiUrl = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + getAccessToken();
     HashMap<String, Object> paramMap = new HashMap<>();
     if (StrUtil.isBlank(userParam.getCode())) {
       throw new BusinessException("code不能为空");
     }
     paramMap.put("code", userParam.getCode());
-    // 执行post请求
+
-    String post = HttpUtil.post(apiUrl, JSON.toJSONString(paramMap));
+    // access_token 失效/过期时自动刷新并重试一次
-    JSONObject json = JSON.parseObject(post);
+    for (int attempt = 0; attempt < 2; attempt++) {
-    if (json.get("errcode").equals(0)) {
+      String accessToken = (attempt == 0) ? getAccessToken(false) : getAccessToken(true);
-      JSONObject phoneInfo = JSON.parseObject(json.getString("phone_info"));
+      String apiUrl = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + accessToken;
-      // 微信用户的手机号码
+
-      final String phoneNumber = phoneInfo.getString("phoneNumber");
+      String post = HttpUtil.post(apiUrl, JSON.toJSONString(paramMap));
-      // 验证手机号码
+      JSONObject json = JSON.parseObject(post);
-//            if (userParam.getNotVerifyPhone() == null && !Validator.isMobile(phoneNumber)) {
+
-//                String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString());
+      Integer errcode = json.getInteger("errcode");
-//                redisTemplate.delete(key);
+      if (errcode != null && errcode.equals(0)) {
-//                throw new BusinessException("手机号码格式不正确");
+        JSONObject phoneInfo = JSON.parseObject(json.getString("phone_info"));
-//            }
+        return phoneInfo.getString("phoneNumber");
-      return phoneNumber;
+      }
+
+      if (errcode != null && (errcode == 40001 || errcode == 42001 || errcode == 40014)) {
+        continue;
+      }
+      return null;
     }
     return null;
   }
@@ -285,6 +287,10 @@ public class WxLoginController extends BaseController {
    * <a href="https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getAccessToken.html">...</a>
    */
   public String getAccessToken() {
+    return getAccessToken(false);
+  }
+
+  private String getAccessToken(boolean forceRefresh) {
     Integer tenantId = getTenantId();
     String key = ACCESS_TOKEN_KEY.concat(":").concat(tenantId.toString());
 
@@ -294,9 +300,13 @@ public class WxLoginController extends BaseController {
       throw new BusinessException("请先配置小程序");
     }
 
+    if (forceRefresh) {
+      redisTemplate.delete(key);
+    }
+
     // 从缓存获取access_token
     String value = redisTemplate.opsForValue().get(key);
-    if (value != null) {
+    if (!forceRefresh && value != null) {
       // 解析access_token
       JSONObject response = JSON.parseObject(value);
       String accessToken = response.getString("access_token");
@@ -305,23 +315,38 @@ public class WxLoginController extends BaseController {
       }
     }
 
-    // 微信获取凭证接口
+    String appId = setting.getString("appId");
-    String apiUrl = "https://api.weixin.qq.com/cgi-bin/token";
+    String appSecret = setting.getString("appSecret");
-    // 组装url参数
-    String url = apiUrl.concat("?grant_type=client_credential")
-      .concat("&appid=").concat(setting.getString("appId"))
-      .concat("&secret=").concat(setting.getString("appSecret"));
 
-    // 执行get请求
+    // 微信稳定版获取凭证接口（避免并发刷新导致旧token失效）
-    String result = HttpUtil.get(url);
+    String apiUrl = "https://api.weixin.qq.com/cgi-bin/stable_token";
-    // 解析access_token
+    JSONObject reqBody = new JSONObject();
+    reqBody.put("grant_type", "client_credential");
+    reqBody.put("appid", appId);
+    reqBody.put("secret", appSecret);
+    reqBody.put("force_refresh", forceRefresh);
+
+    String result = HttpRequest.post(apiUrl)
+      .header("Content-Type", "application/json")
+      .body(reqBody.toJSONString())
+      .execute()
+      .body();
     JSONObject response = JSON.parseObject(result);
-    if (response.getString("access_token") != null) {
+
-      // 存入缓存
+    Integer errcode = response.getInteger("errcode");
-      redisTemplate.opsForValue().set(key, result, 7000L, TimeUnit.SECONDS);
+    if (errcode != null && errcode != 0) {
-      return response.getString("access_token");
+      throw new BusinessException("获取access_token失败: " + response.getString("errmsg") + " (errcode: " + errcode + ")");
     }
-    throw new BusinessException("小程序配置不正确");
+
+    String accessToken = response.getString("access_token");
+    Integer expiresIn = response.getInteger("expires_in");
+    if (accessToken != null) {
+      long ttlSeconds = Math.max((expiresIn != null ? expiresIn : 7200) - 300L, 60L);
+      redisTemplate.opsForValue().set(key, result, ttlSeconds, TimeUnit.SECONDS);
+      return accessToken;
+    }
+
+    throw new BusinessException("获取access_token失败: " + result);
   }
 
   @Operation(summary = "获取微信openId并更新")
@@ -576,23 +601,29 @@ public class WxLoginController extends BaseController {
       throw new IOException("小程序配置不完整，缺少 appId 或 appSecret");
     }
 
-    HttpUrl url = HttpUrl.parse("https://api.weixin.qq.com/cgi-bin/token")
+    HttpUrl url = HttpUrl.parse("https://api.weixin.qq.com/cgi-bin/stable_token").newBuilder().build();
-      .newBuilder()
+    var root = om.createObjectNode();
-      .addQueryParameter("grant_type", "client_credential")
+    root.put("grant_type", "client_credential");
-      .addQueryParameter("appid", appId)
+    root.put("appid", appId);
-      .addQueryParameter("secret", appSecret)
+    root.put("secret", appSecret);
-      .build();
+    root.put("force_refresh", false);
 
-    Request req = new Request.Builder().url(url).get().build();
+    okhttp3.RequestBody reqBody = okhttp3.RequestBody.create(
+      root.toString(), MediaType.parse("application/json; charset=utf-8"));
+    Request req = new Request.Builder().url(url).post(reqBody).build();
     try (Response resp = http.newCall(req).execute()) {
       String body = resp.body().string();
       JsonNode json = om.readTree(body);
+      if (json.has("errcode") && json.get("errcode").asInt() != 0) {
+        throw new IOException("Get access_token failed: " + body);
+      }
       if (json.has("access_token")) {
         String token = json.get("access_token").asText();
         long expiresIn = json.get("expires_in").asInt(7200);
 
         // 缓存完整的JSON响应，与其他方法保持一致
-        redisUtil.set(key, body, expiresIn, TimeUnit.SECONDS);
+        long ttlSeconds = Math.max(expiresIn - 300L, 60L);
+        redisUtil.set(key, body, ttlSeconds, TimeUnit.SECONDS);
         tokenExpireEpoch = now + expiresIn;
         System.out.println("获取新的access_token成功(Local)，租户ID: " + tenantId);
         return token;
@@ -686,7 +717,7 @@ public class WxLoginController extends BaseController {
       // 获取当前线程的租户ID
       Integer tenantId = getTenantId();
       if (tenantId == null) {
-        tenantId = 10550; // 默认租户
+        tenantId = 10584; // 默认租户
       }
 
       System.out.println("=== 开始调试获取AccessToken，租户ID: " + tenantId + " ===");
@@ -748,14 +779,14 @@ public class WxLoginController extends BaseController {
         }
       }
 
-      // 如果无法解析，默认使用租户10550
+      // 如果无法解析，默认使用租户10584
-      System.out.println("无法解析scene参数，使用默认租户ID: 10550");
+      System.out.println("无法解析scene参数，使用默认租户ID: 10584");
-      return 10550;
+      return 10584;
 
     } catch (Exception e) {
       System.err.println("解析scene参数异常: " + e.getMessage());
-      // 出现异常时，默认使用租户10550
+      // 出现异常时，默认使用租户10584
-      return 10550;
+      return 10584;
     }
   }
 
@@ -789,10 +820,21 @@ public class WxLoginController extends BaseController {
       String appId = wxConfig.getString("appId");
       String appSecret = wxConfig.getString("appSecret");
 
-      String apiUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appId + "&secret=" + appSecret;
+      String apiUrl = "https://api.weixin.qq.com/cgi-bin/stable_token";
       System.out.println("调用微信API获取token - 租户ID: " + tenantId + ", AppID: " + (appId != null ? appId.substring(0, Math.min(8, appId.length())) + "..." : "null"));
-      System.out.println("微信API请求URL: " + apiUrl.replaceAll("secret=[^&]*", "secret=***"));
+      System.out.println("微信API请求URL: " + apiUrl);
-      String result = HttpUtil.get(apiUrl);
+
+      JSONObject reqBody = new JSONObject();
+      reqBody.put("grant_type", "client_credential");
+      reqBody.put("appid", appId);
+      reqBody.put("secret", appSecret);
+      reqBody.put("force_refresh", false);
+
+      String result = HttpRequest.post(apiUrl)
+        .header("Content-Type", "application/json")
+        .body(reqBody.toJSONString())
+        .execute()
+        .body();
       System.out.println("微信API响应: " + result);
       JSONObject json = JSON.parseObject(result);
 
@@ -800,14 +842,15 @@ public class WxLoginController extends BaseController {
       if (json.containsKey("errcode")) {
         Integer errcode = json.getInteger("errcode");
         String errmsg = json.getString("errmsg");
-        System.err.println("微信API错误 - errcode: " + errcode + ", errmsg: " + errmsg);
+        if (errcode != null && errcode != 0) {
-
+          System.err.println("微信API错误 - errcode: " + errcode + ", errmsg: " + errmsg);
-        if (errcode == 40125) {
+          if (errcode == 40125) {
-          throw new RuntimeException("微信AppSecret配置错误，请检查并更新正确的AppSecret");
+            throw new RuntimeException("微信AppSecret配置错误，请检查并更新正确的AppSecret");
-        } else if (errcode == 40013) {
+          } else if (errcode == 40013) {
-          throw new RuntimeException("微信AppID配置错误，请检查并更新正确的AppID");
+            throw new RuntimeException("微信AppID配置错误，请检查并更新正确的AppID");
-        } else {
+          } else {
-          throw new RuntimeException("微信API调用失败: " + errmsg + " (errcode: " + errcode + ")");
+            throw new RuntimeException("微信API调用失败: " + errmsg + " (errcode: " + errcode + ")");
+          }
         }
       }
 
@@ -816,7 +859,8 @@ public class WxLoginController extends BaseController {
         Integer expiresIn = json.getInteger("expires_in");
 
         // 缓存access_token，存储完整JSON响应（与getAccessToken方法保持一致）
-        redisUtil.set(key, result, (long) (expiresIn - 300), TimeUnit.SECONDS);
+        long ttlSeconds = Math.max((expiresIn != null ? expiresIn : 7200) - 300L, 60L);
+        redisUtil.set(key, result, ttlSeconds, TimeUnit.SECONDS);
 
         System.out.println("获取新的access_token成功，租户ID: " + tenantId);
         return accessToken;

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml

@@ -102,7 +102,7 @@
                 AND a.deleted = 0
             </if>
             <if test="param.roleId != null">
-                AND a.user_id IN (SELECT user_id FROM sys_user_role WHERE role_id=#{param.roleId})
+                AND a.user_id IN (SELECT user_id FROM gxwebsoft_core.sys_user_role WHERE role_id=#{param.roleId})
             </if>
             <if test="param.userIds != null">
               AND a.user_id IN
@@ -259,6 +259,7 @@
     LEFT JOIN gxwebsoft_core.sys_user_referee h ON a.user_id = h.user_id and h.deleted = 0
     WHERE a.user_id = #{userId}
       AND a.deleted = 0
+    LIMIT 1
   </select>
 
 </mapper>

src/main/java/com/gxwebsoft/common/system/service/WxMiniappAccessTokenService.java

@@ -0,0 +1,18 @@
+package com.gxwebsoft.common.system.service;
+
+/**
+ * 微信小程序 access_token 获取服务（按租户）。
+ *
+ * <p>用于调用微信小程序开放接口（例如：上传发货信息）。</p>
+ */
+public interface WxMiniappAccessTokenService {
+
+    /**
+     * 获取指定租户的小程序 access_token（内部带缓存）。
+     *
+     * @param tenantId 租户ID
+     * @return access_token
+     */
+    String getAccessToken(Integer tenantId);
+}
+

src/main/java/com/gxwebsoft/common/system/service/impl/WxMiniappAccessTokenServiceImpl.java

@@ -0,0 +1,108 @@
+package com.gxwebsoft.common.system.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.system.service.WxMiniappAccessTokenService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.concurrent.TimeUnit;
+
+import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY;
+import static com.gxwebsoft.common.core.constants.RedisConstants.MP_WX_KEY;
+
+/**
+ * 微信小程序 access_token 获取实现（按租户）。
+ *
+ * <p>复用现有缓存结构：
+ * <ul>
+ *   <li>小程序配置：Redis key = {@code mp-weixin:{tenantId}}，value 为 JSON，包含 appId/appSecret</li>
+ *   <li>access_token：Redis key = {@code access-token:{tenantId}}，value 为微信返回的 JSON 字符串</li>
+ * </ul>
+ * </p>
+ */
+@Slf4j
+@Service
+public class WxMiniappAccessTokenServiceImpl implements WxMiniappAccessTokenService {
+
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Override
+    public String getAccessToken(Integer tenantId) {
+        if (tenantId == null) {
+            throw new BusinessException("tenantId 不能为空");
+        }
+
+        final String tokenCacheKey = ACCESS_TOKEN_KEY + ":" + tenantId;
+
+        // 1) 优先从缓存取（兼容 JSON 或纯字符串 token 的历史格式）
+        String cachedValue = redisUtil.get(tokenCacheKey);
+        if (StrUtil.isNotBlank(cachedValue)) {
+            try {
+                JSONObject cachedJson = JSON.parseObject(cachedValue);
+                String accessToken = cachedJson.getString("access_token");
+                if (StrUtil.isNotBlank(accessToken)) {
+                    return accessToken;
+                }
+            } catch (Exception ignore) {
+                // 旧格式：直接存 token
+                return cachedValue;
+            }
+        }
+
+        // 2) 缓存没有则从租户配置获取 appId/appSecret
+        final String wxConfigKey = MP_WX_KEY + tenantId;
+        final String wxConfigValue = redisUtil.get(wxConfigKey);
+        if (StrUtil.isBlank(wxConfigValue)) {
+            throw new BusinessException("未找到微信小程序配置，请检查缓存key: " + wxConfigKey);
+        }
+
+        JSONObject wxConfig;
+        try {
+            wxConfig = JSON.parseObject(wxConfigValue);
+        } catch (Exception e) {
+            throw new BusinessException("微信小程序配置格式错误: " + e.getMessage());
+        }
+
+        final String appId = wxConfig.getString("appId");
+        final String appSecret = wxConfig.getString("appSecret");
+        if (StrUtil.isBlank(appId) || StrUtil.isBlank(appSecret)) {
+            throw new BusinessException("微信小程序配置不完整(appId/appSecret)");
+        }
+
+        // 3) 调用微信接口获取 token
+        final String apiUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential"
+                + "&appid=" + appId + "&secret=" + appSecret;
+        String result = HttpUtil.get(apiUrl);
+
+        JSONObject json = JSON.parseObject(result);
+        if (json.containsKey("errcode") && json.getIntValue("errcode") != 0) {
+            Integer errcode = json.getInteger("errcode");
+            String errmsg = json.getString("errmsg");
+            throw new BusinessException("获取小程序access_token失败: " + errmsg + " (errcode: " + errcode + ")");
+        }
+
+        String accessToken = json.getString("access_token");
+        Integer expiresIn = json.getInteger("expires_in");
+        if (StrUtil.isBlank(accessToken)) {
+            throw new BusinessException("获取小程序access_token失败: access_token为空");
+        }
+
+        // 4) 缓存微信原始 JSON（与现有实现保持一致），提前5分钟过期
+        long ttlSeconds = 7000L;
+        if (expiresIn != null && expiresIn > 300) {
+            ttlSeconds = expiresIn - 300L;
+        }
+        redisUtil.set(tokenCacheKey, result, ttlSeconds, TimeUnit.SECONDS);
+
+        log.info("获取小程序access_token成功 - tenantId={}, ttlSeconds={}", tenantId, ttlSeconds);
+        return accessToken;
+    }
+}
+

src/main/java/com/gxwebsoft/credit/controller/BatchImportSupport.java

@@ -1,22 +1,31 @@
 package com.gxwebsoft.credit.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.service.CreditCompanyService;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.util.CollectionUtils;
 
+import java.io.Serializable;
+import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.ArrayDeque;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Queue;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -45,6 +54,66 @@ public class BatchImportSupport {
         return requiresNewTx.execute(status -> supplier.get());
     }
 
+    /**
+     * 硬删除（物理删除），用于替代 MyBatis-Plus 的 @TableLogic 逻辑删除。
+     *
+     * <p>注意：SQL 仍会经过 MyBatis-Plus 拦截器（如 TenantLine），用于保证租户隔离。</p>
+     */
+    public boolean hardRemoveById(Class<?> entityClass, Serializable id) {
+        if (entityClass == null || id == null) {
+            return false;
+        }
+        TableInfo tableInfo = TableInfoHelper.getTableInfo(entityClass);
+        if (tableInfo == null) {
+            throw new IllegalArgumentException("MyBatis-Plus TableInfo not found for entityClass=" + entityClass.getName());
+        }
+        String tableName = tableInfo.getTableName();
+        String keyColumn = tableInfo.getKeyColumn();
+        if (keyColumn == null || keyColumn.trim().isEmpty()) {
+            keyColumn = "id";
+        }
+        String sql = "DELETE FROM " + tableName + " WHERE " + keyColumn + " = {0}";
+        return SqlRunner.db().delete(sql, id);
+    }
+
+    /**
+     * 硬删除（物理删除）- 批量
+     */
+    public boolean hardRemoveByIds(Class<?> entityClass, List<? extends Serializable> ids) {
+        if (entityClass == null || CollectionUtils.isEmpty(ids)) {
+            return false;
+        }
+        TableInfo tableInfo = TableInfoHelper.getTableInfo(entityClass);
+        if (tableInfo == null) {
+            throw new IllegalArgumentException("MyBatis-Plus TableInfo not found for entityClass=" + entityClass.getName());
+        }
+        String tableName = tableInfo.getTableName();
+        String keyColumn = tableInfo.getKeyColumn();
+        if (keyColumn == null || keyColumn.trim().isEmpty()) {
+            keyColumn = "id";
+        }
+
+        // Keep IN-list size under common DB/driver limits.
+        final int chunkSize = 900;
+        boolean anyDeleted = false;
+        for (int i = 0; i < ids.size(); i += chunkSize) {
+            List<? extends Serializable> chunk = ids.subList(i, Math.min(ids.size(), i + chunkSize));
+            if (CollectionUtils.isEmpty(chunk)) {
+                continue;
+            }
+            StringBuilder inPlaceholders = new StringBuilder();
+            for (int j = 0; j < chunk.size(); j++) {
+                if (j > 0) {
+                    inPlaceholders.append(",");
+                }
+                inPlaceholders.append("{").append(j).append("}");
+            }
+            String sql = "DELETE FROM " + tableName + " WHERE " + keyColumn + " IN (" + inPlaceholders + ")";
+            anyDeleted = SqlRunner.db().delete(sql, chunk.toArray()) || anyDeleted;
+        }
+        return anyDeleted;
+    }
+
     public static final class CompanyIdRefreshStats {
         public final boolean anyDataRead;
         public final int updated;
@@ -109,6 +178,43 @@ public class BatchImportSupport {
             nameGetter);
     }
 
+    /**
+     * 按企业名称匹配 CreditCompany(name / matchName) 并回填 companyId + companyName。
+     *
+     * <p>companyNameSetter 为空时等价于仅回填 companyId。</p>
+     */
+    public <T> CompanyIdRefreshStats refreshCompanyIdByCompanyName(IService<T> service,
+                                                                   CreditCompanyService creditCompanyService,
+                                                                   Integer currentTenantId,
+                                                                   Boolean onlyNull,
+                                                                   Integer limit,
+                                                                   SFunction<T, Integer> idGetter,
+                                                                   BiConsumer<T, Integer> idSetter,
+                                                                   SFunction<T, String> nameGetter,
+                                                                   SFunction<T, Integer> companyIdGetter,
+                                                                   BiConsumer<T, Integer> companyIdSetter,
+                                                                   BiConsumer<T, String> companyNameSetter,
+                                                                   SFunction<T, Boolean> hasDataGetter,
+                                                                   BiConsumer<T, Boolean> hasDataSetter,
+                                                                   SFunction<T, Integer> tenantIdGetter,
+                                                                   Supplier<T> patchFactory) {
+        return refreshCompanyIdByCompanyNames(service,
+            creditCompanyService,
+            currentTenantId,
+            onlyNull,
+            limit,
+            idGetter,
+            idSetter,
+            companyIdGetter,
+            companyIdSetter,
+            companyNameSetter,
+            hasDataGetter,
+            hasDataSetter,
+            tenantIdGetter,
+            patchFactory,
+            nameGetter);
+    }
+
     /**
      * 按多列“当事人/企业名称”匹配 CreditCompany(name / matchName) 并回填 companyId。
      *
@@ -131,6 +237,44 @@ public class BatchImportSupport {
                                                                           SFunction<T, Integer> tenantIdGetter,
                                                                           Supplier<T> patchFactory,
                                                                           SFunction<T, String>... nameGetters) {
+        return refreshCompanyIdByCompanyNames(service,
+            creditCompanyService,
+            currentTenantId,
+            onlyNull,
+            limit,
+            idGetter,
+            idSetter,
+            companyIdGetter,
+            companyIdSetter,
+            null,
+            hasDataGetter,
+            hasDataSetter,
+            tenantIdGetter,
+            patchFactory,
+            nameGetters);
+    }
+
+    /**
+     * 按多列“当事人/企业名称”匹配 CreditCompany(name / matchName) 并回填 companyId + companyName。
+     *
+     * <p>companyNameSetter 为空时等价于仅回填 companyId。</p>
+     */
+    @SafeVarargs
+    public final <T> CompanyIdRefreshStats refreshCompanyIdByCompanyNames(IService<T> service,
+                                                                          CreditCompanyService creditCompanyService,
+                                                                          Integer currentTenantId,
+                                                                          Boolean onlyNull,
+                                                                          Integer limit,
+                                                                          SFunction<T, Integer> idGetter,
+                                                                          BiConsumer<T, Integer> idSetter,
+                                                                          SFunction<T, Integer> companyIdGetter,
+                                                                          BiConsumer<T, Integer> companyIdSetter,
+                                                                          BiConsumer<T, String> companyNameSetter,
+                                                                          SFunction<T, Boolean> hasDataGetter,
+                                                                          BiConsumer<T, Boolean> hasDataSetter,
+                                                                          SFunction<T, Integer> tenantIdGetter,
+                                                                          Supplier<T> patchFactory,
+                                                                          SFunction<T, String>... nameGetters) {
         boolean onlyNullFlag = (onlyNull == null) || Boolean.TRUE.equals(onlyNull);
 
         if (nameGetters == null || nameGetters.length == 0) {
@@ -211,6 +355,8 @@ public class BatchImportSupport {
             // 3.1) 查询当前租户下的 companyId 映射
             LinkedHashMap<String, Integer> companyIdByName = new LinkedHashMap<>();
             LinkedHashMap<String, Integer> ambiguousByName = new LinkedHashMap<>();
+            // For display: prefer matchName (normalized) then name.
+            HashMap<Integer, String> companyNameById = new HashMap<>();
             LinkedHashSet<String> nameSet = new LinkedHashSet<>();
             for (T row : tenantRows) {
                 if (row == null) {
@@ -240,6 +386,13 @@ public class BatchImportSupport {
                     if (c == null || c.getId() == null) {
                         continue;
                     }
+                    String displayName = c.getMatchName();
+                    if (displayName == null || displayName.trim().isEmpty()) {
+                        displayName = c.getName();
+                    }
+                    if (displayName != null && !displayName.trim().isEmpty()) {
+                        companyNameById.putIfAbsent(c.getId(), displayName.trim());
+                    }
                     addCompanyNameMapping(companyIdByName, ambiguousByName, normalizeCompanyName(c.getName()), c.getId());
                     addCompanyNameMapping(companyIdByName, ambiguousByName, normalizeCompanyName(c.getMatchName()), c.getId());
                 }
@@ -312,6 +465,12 @@ public class BatchImportSupport {
                 T patch = patchFactory.get();
                 idSetter.accept(patch, id);
                 companyIdSetter.accept(patch, companyId);
+                if (companyNameSetter != null) {
+                    String companyName = companyNameById.get(companyId);
+                    if (companyName != null && !companyName.trim().isEmpty()) {
+                        companyNameSetter.accept(patch, companyName.trim());
+                    }
+                }
                 hasDataSetter.accept(patch, Boolean.TRUE);
                 updates.add(patch);
                 if (updates.size() >= batchSize) {
@@ -336,6 +495,225 @@ public class BatchImportSupport {
         return new CompanyIdRefreshStats(true, updated, matched, notFound, ambiguous);
     }
 
+    /**
+     * 按“文本字段包含企业名称”的方式匹配 CreditCompany(name / matchName) 并回填 companyId。
+     *
+     * <p>适用场景：某些表的“当事人/第三人”字段会包含多个角色+姓名/企业，例如：
+     * 申请执行人 - 张三 被执行人 - 某某有限公司。此时无法按整格等值匹配。</p>
+     *
+     * <p>实现：按租户加载企业 name/matchName 构建多模式匹配（AC 自动机），在文本中查找出现的企业名。</p>
+     *
+     * <p>列优先级：按 textGetters 的顺序尝试；若某列匹配到唯一企业则采用，否则继续下一列。</p>
+     */
+    @SafeVarargs
+    public final <T> CompanyIdRefreshStats refreshCompanyIdByCompanyNameContainedInText(IService<T> service,
+                                                                                        CreditCompanyService creditCompanyService,
+                                                                                        Integer currentTenantId,
+                                                                                        Boolean onlyNull,
+                                                                                        Integer limit,
+                                                                                        SFunction<T, Integer> idGetter,
+                                                                                        BiConsumer<T, Integer> idSetter,
+                                                                                        SFunction<T, Integer> companyIdGetter,
+                                                                                        BiConsumer<T, Integer> companyIdSetter,
+                                                                                        SFunction<T, Boolean> hasDataGetter,
+                                                                                        BiConsumer<T, Boolean> hasDataSetter,
+                                                                                        SFunction<T, Integer> tenantIdGetter,
+                                                                                        Supplier<T> patchFactory,
+                                                                                        SFunction<T, String>... textGetters) {
+        return refreshCompanyIdByCompanyNameContainedInText(
+            service,
+            creditCompanyService,
+            currentTenantId,
+            onlyNull,
+            limit,
+            idGetter,
+            idSetter,
+            companyIdGetter,
+            companyIdSetter,
+            hasDataGetter,
+            hasDataSetter,
+            tenantIdGetter,
+            patchFactory,
+            null,
+            textGetters
+        );
+    }
+
+    /**
+     * refreshCompanyIdByCompanyNameContainedInText 的增强版：支持对 CreditCompany 查询追加条件（例如仅匹配一级企业）。
+     */
+    @SafeVarargs
+    public final <T> CompanyIdRefreshStats refreshCompanyIdByCompanyNameContainedInText(IService<T> service,
+                                                                                        CreditCompanyService creditCompanyService,
+                                                                                        Integer currentTenantId,
+                                                                                        Boolean onlyNull,
+                                                                                        Integer limit,
+                                                                                        SFunction<T, Integer> idGetter,
+                                                                                        BiConsumer<T, Integer> idSetter,
+                                                                                        SFunction<T, Integer> companyIdGetter,
+                                                                                        BiConsumer<T, Integer> companyIdSetter,
+                                                                                        SFunction<T, Boolean> hasDataGetter,
+                                                                                        BiConsumer<T, Boolean> hasDataSetter,
+                                                                                        SFunction<T, Integer> tenantIdGetter,
+                                                                                        Supplier<T> patchFactory,
+                                                                                        Consumer<LambdaQueryChainWrapper<CreditCompany>> companyQueryCustomizer,
+                                                                                        SFunction<T, String>... textGetters) {
+        boolean onlyNullFlag = (onlyNull == null) || Boolean.TRUE.equals(onlyNull);
+        if (textGetters == null || textGetters.length == 0) {
+            return new CompanyIdRefreshStats(false, 0, 0, 0, 0);
+        }
+
+        // 1) 读取待处理数据（仅取必要字段）
+        @SuppressWarnings({"rawtypes", "unchecked"})
+        SFunction<T, ?>[] selectColumns = (SFunction<T, ?>[]) new SFunction[4 + textGetters.length];
+        int colIdx = 0;
+        selectColumns[colIdx++] = idGetter;
+        selectColumns[colIdx++] = companyIdGetter;
+        selectColumns[colIdx++] = hasDataGetter;
+        selectColumns[colIdx++] = tenantIdGetter;
+        for (SFunction<T, String> tg : textGetters) {
+            selectColumns[colIdx++] = tg;
+        }
+
+        var query = service.lambdaQuery()
+            .select(selectColumns)
+            .eq(currentTenantId != null, tenantIdGetter, currentTenantId)
+            .and(w -> {
+                for (int i = 0; i < textGetters.length; i++) {
+                    if (i == 0) {
+                        w.isNotNull(textGetters[i]);
+                    } else {
+                        w.or().isNotNull(textGetters[i]);
+                    }
+                }
+            });
+        if (onlyNullFlag) {
+            query.and(w -> w.isNull(companyIdGetter).or().eq(companyIdGetter, 0));
+        }
+        if (limit != null && limit > 0) {
+            query.last("limit " + Math.min(limit, 200000));
+        }
+        List<T> rows = query.list();
+        if (CollectionUtils.isEmpty(rows)) {
+            return new CompanyIdRefreshStats(false, 0, 0, 0, 0);
+        }
+
+        // 2) 按租户分组（避免跨租户误匹配）
+        Map<Integer, List<T>> rowsByTenant = new LinkedHashMap<>();
+        int missingTenant = 0;
+        for (T row : rows) {
+            if (row == null) {
+                continue;
+            }
+            Integer tenantId = currentTenantId != null ? currentTenantId : tenantIdGetter.apply(row);
+            if (tenantId == null) {
+                missingTenant++;
+                continue;
+            }
+            rowsByTenant.computeIfAbsent(tenantId, k -> new ArrayList<>()).add(row);
+        }
+
+        int updated = 0;
+        int matched = 0;
+        int notFound = 0;
+        int ambiguous = 0;
+        final int batchSize = 500;
+        List<T> updates = new ArrayList<>(batchSize);
+
+        for (Map.Entry<Integer, List<T>> entry : rowsByTenant.entrySet()) {
+            Integer tenantId = entry.getKey();
+            List<T> tenantRows = entry.getValue();
+            if (tenantId == null || CollectionUtils.isEmpty(tenantRows)) {
+                continue;
+            }
+
+            // 2.1) 构建当前租户的企业名匹配器
+            LambdaQueryChainWrapper<CreditCompany> companyQuery = creditCompanyService.lambdaQuery()
+                .select(CreditCompany::getId, CreditCompany::getName, CreditCompany::getMatchName, CreditCompany::getTenantId)
+                .eq(CreditCompany::getTenantId, tenantId)
+                ;
+            if (companyQueryCustomizer != null) {
+                companyQueryCustomizer.accept(companyQuery);
+            }
+            List<CreditCompany> companies = companyQuery.list();
+            CompanyNameMatcher matcher = CompanyNameMatcher.build(companies);
+
+            // 2.2) 匹配并回填
+            for (T row : tenantRows) {
+                if (row == null) {
+                    continue;
+                }
+
+                Integer resolvedCompanyId = null;
+                boolean hasAmbiguous = false;
+                for (SFunction<T, String> tg : textGetters) {
+                    String text = tg.apply(row);
+                    CompanyNameMatcher.MatchResult r = matcher.match(text);
+                    if (r.ambiguous) {
+                        hasAmbiguous = true;
+                        continue;
+                    }
+                    if (r.companyId != null) {
+                        resolvedCompanyId = r.companyId;
+                        break;
+                    }
+                }
+
+                if (resolvedCompanyId == null) {
+                    if (hasAmbiguous) {
+                        ambiguous++;
+                    } else {
+                        notFound++;
+                    }
+                    continue;
+                }
+                matched++;
+
+                Integer oldCompanyId = companyIdGetter.apply(row);
+                Boolean oldHasData = hasDataGetter.apply(row);
+                boolean needUpdate;
+                if (onlyNullFlag) {
+                    needUpdate = (oldCompanyId == null) || oldCompanyId == 0;
+                } else {
+                    needUpdate = oldCompanyId == null || !resolvedCompanyId.equals(oldCompanyId);
+                }
+                if (!Boolean.TRUE.equals(oldHasData)) {
+                    needUpdate = true;
+                }
+                if (!needUpdate) {
+                    continue;
+                }
+
+                Integer id = idGetter.apply(row);
+                if (id == null) {
+                    continue;
+                }
+                T patch = patchFactory.get();
+                idSetter.accept(patch, id);
+                companyIdSetter.accept(patch, resolvedCompanyId);
+                hasDataSetter.accept(patch, Boolean.TRUE);
+                updates.add(patch);
+                if (updates.size() >= batchSize) {
+                    List<T> batch = new ArrayList<>(updates);
+                    updates.clear();
+                    updated += runInNewTx(() -> service.updateBatchById(batch, batchSize) ? batch.size() : 0);
+                }
+            }
+        }
+
+        if (currentTenantId == null && missingTenant > 0) {
+            notFound += missingTenant;
+        }
+
+        if (!updates.isEmpty()) {
+            List<T> batch = new ArrayList<>(updates);
+            updates.clear();
+            updated += runInNewTx(() -> service.updateBatchById(batch, batchSize) ? batch.size() : 0);
+        }
+
+        return new CompanyIdRefreshStats(true, updated, matched, notFound, ambiguous);
+    }
+
     /**
      * 批量 upsert：优先按 code 匹配；code 为空时按 name 匹配。
      */
@@ -751,6 +1129,95 @@ public class BatchImportSupport {
         }
     }
 
+    /**
+     * Insert-only batch persist with "unique index" duplicate handling:
+     * - try saveBatch
+     * - on failure, fallback to row-by-row save
+     * - if a row hits duplicate-key constraint, add a friendly error and continue
+     *
+     * <p>This intentionally does NOT query the database for dedup/upsert.</p>
+     */
+    public <T> int persistInsertOnlyChunk(IService<T> service,
+                                         List<T> items,
+                                         List<Integer> excelRowNumbers,
+                                         int batchSize,
+                                         Function<T, String> rowLabelGetter,
+                                         String messagePrefix,
+                                         List<String> errorMessages) {
+        String prefix = messagePrefix == null ? "" : messagePrefix;
+        return persistChunkWithFallback(
+            items,
+            excelRowNumbers,
+            () -> {
+                boolean ok = service.saveBatch(items, batchSize);
+                if (!ok) {
+                    throw new RuntimeException("批量保存失败");
+                }
+                return items.size();
+            },
+            (rowItem, rowNumber) -> {
+                try {
+                    boolean ok = service.save(rowItem);
+                    if (!ok) {
+                        if (errorMessages != null) {
+                            String p = (rowNumber != null && rowNumber > 0) ? (prefix + "第" + rowNumber + "行：") : prefix;
+                            errorMessages.add(p + "保存失败");
+                        }
+                        return false;
+                    }
+                    return true;
+                } catch (DataIntegrityViolationException e) {
+                    if (!isDuplicateKey(e)) {
+                        throw e;
+                    }
+                    if (errorMessages != null) {
+                        String label = null;
+                        if (rowLabelGetter != null && rowItem != null) {
+                            try {
+                                label = rowLabelGetter.apply(rowItem);
+                            } catch (Exception ignore) {
+                                // ignore label extraction failures
+                            }
+                        }
+                        if (label != null) {
+                            label = label.trim();
+                        }
+                        String what = (label == null || label.isEmpty()) ? "数据" : ("【" + label + "】");
+                        String p = (rowNumber != null && rowNumber > 0) ? (prefix + "第" + rowNumber + "行：") : prefix;
+                        errorMessages.add(p + what + "重复（唯一索引冲突）");
+                    }
+                    return false;
+                }
+            },
+            errorMessages
+        );
+    }
+
+    /**
+     * Best-effort duplicate-key detection across common drivers.
+     */
+    public static boolean isDuplicateKey(DataIntegrityViolationException e) {
+        for (Throwable t = e; t != null; t = t.getCause()) {
+            if (t instanceof SQLException) {
+                SQLException se = (SQLException) t;
+                // MySQL: 1062 Duplicate entry; PostgreSQL/H2: SQLState 23505 unique_violation
+                if (se.getErrorCode() == 1062) {
+                    return true;
+                }
+                if ("23505".equals(se.getSQLState())) {
+                    return true;
+                }
+            }
+        }
+        Throwable mostSpecificCause = e.getMostSpecificCause();
+        String message = mostSpecificCause != null ? mostSpecificCause.getMessage() : e.getMessage();
+        if (message == null) {
+            return false;
+        }
+        String lower = message.toLowerCase();
+        return lower.contains("duplicate") && lower.contains("key");
+    }
+
     /**
      * 批量失败时降级逐行：允许调用方自定义“成功条数”的计算口径（例如：仅统计 insert 入库条数）。
      *
@@ -852,4 +1319,211 @@ public class BatchImportSupport {
         // SFunction 是 getter method ref，直接调用即可
         return idColumn.apply(entity);
     }
+
+    /**
+     * Multi-pattern substring matcher for company names (CreditCompany.name / matchName).
+     * Uses an Aho–Corasick automaton to scan each text only once.
+     */
+    private static final class CompanyNameMatcher {
+        private static final int MIN_PATTERN_LEN = 4; // Avoid false positives in free text (e.g. person names)
+
+        private static final class Node {
+            final Map<Character, Integer> next = new HashMap<>();
+            final List<Integer> out = new ArrayList<>();
+            int fail = 0;
+        }
+
+        private final List<Node> nodes;
+        private final int[] patternCompanyId; // 0 means ambiguous
+        private final int[] patternLen;
+
+        private CompanyNameMatcher(List<Node> nodes, int[] patternCompanyId, int[] patternLen) {
+            this.nodes = nodes;
+            this.patternCompanyId = patternCompanyId;
+            this.patternLen = patternLen;
+        }
+
+        static CompanyNameMatcher build(List<CreditCompany> companies) {
+            List<Node> nodes = new ArrayList<>();
+            nodes.add(new Node()); // root
+
+            Map<String, Integer> patternIndex = new HashMap<>();
+            List<Integer> companyIds = new ArrayList<>();
+            List<Integer> patternLens = new ArrayList<>();
+
+            if (!CollectionUtils.isEmpty(companies)) {
+                for (CreditCompany c : companies) {
+                    if (c == null || c.getId() == null) {
+                        continue;
+                    }
+                    addPattern(nodes, patternIndex, companyIds, patternLens, normalizeCompanyName(c.getName()), c.getId());
+                    addPattern(nodes, patternIndex, companyIds, patternLens, normalizeCompanyName(c.getMatchName()), c.getId());
+                }
+            }
+
+            int[] patternCompanyId = new int[companyIds.size()];
+            for (int i = 0; i < companyIds.size(); i++) {
+                patternCompanyId[i] = companyIds.get(i) != null ? companyIds.get(i) : 0;
+            }
+            int[] patternLen = new int[patternLens.size()];
+            for (int i = 0; i < patternLens.size(); i++) {
+                patternLen[i] = patternLens.get(i) != null ? patternLens.get(i) : 0;
+            }
+
+            buildFailureLinks(nodes);
+            return new CompanyNameMatcher(nodes, patternCompanyId, patternLen);
+        }
+
+        private static void addPattern(List<Node> nodes,
+                                       Map<String, Integer> patternIndex,
+                                       List<Integer> companyIds,
+                                       List<Integer> patternLens,
+                                       String pattern,
+                                       Integer companyId) {
+            if (pattern == null || companyId == null) {
+                return;
+            }
+            if (pattern.length() < MIN_PATTERN_LEN) {
+                return;
+            }
+
+            Integer existingIndex = patternIndex.get(pattern);
+            if (existingIndex != null) {
+                // Same pattern maps to multiple companies -> mark ambiguous.
+                Integer oldCompanyId = companyIds.get(existingIndex);
+                if (oldCompanyId != null && !oldCompanyId.equals(companyId)) {
+                    companyIds.set(existingIndex, null);
+                }
+                return;
+            }
+
+            int state = 0;
+            for (int i = 0; i < pattern.length(); i++) {
+                char ch = pattern.charAt(i);
+                Integer next = nodes.get(state).next.get(ch);
+                if (next == null) {
+                    next = nodes.size();
+                    nodes.get(state).next.put(ch, next);
+                    nodes.add(new Node());
+                }
+                state = next;
+            }
+            int idx = companyIds.size();
+            companyIds.add(companyId);
+            patternLens.add(pattern.length());
+            nodes.get(state).out.add(idx);
+            patternIndex.put(pattern, idx);
+        }
+
+        private static void buildFailureLinks(List<Node> nodes) {
+            Queue<Integer> q = new ArrayDeque<>();
+            // Init depth-1 nodes
+            for (Map.Entry<Character, Integer> e : nodes.get(0).next.entrySet()) {
+                int s = e.getValue();
+                nodes.get(s).fail = 0;
+                q.add(s);
+            }
+            while (!q.isEmpty()) {
+                int r = q.poll();
+                for (Map.Entry<Character, Integer> e : nodes.get(r).next.entrySet()) {
+                    char a = e.getKey();
+                    int s = e.getValue();
+                    q.add(s);
+
+                    int state = nodes.get(r).fail;
+                    while (state != 0 && !nodes.get(state).next.containsKey(a)) {
+                        state = nodes.get(state).fail;
+                    }
+                    Integer fs = nodes.get(state).next.get(a);
+                    nodes.get(s).fail = (fs != null) ? fs : 0;
+                    // Merge outputs from fail state
+                    List<Integer> out = nodes.get(nodes.get(s).fail).out;
+                    if (!out.isEmpty()) {
+                        nodes.get(s).out.addAll(out);
+                    }
+                }
+            }
+        }
+
+        static final class MatchResult {
+            final Integer companyId; // unique match
+            final boolean ambiguous;
+
+            MatchResult(Integer companyId, boolean ambiguous) {
+                this.companyId = companyId;
+                this.ambiguous = ambiguous;
+            }
+        }
+
+        MatchResult match(String text) {
+            String v = normalizeCompanyName(text);
+            if (v == null) {
+                return new MatchResult(null, false);
+            }
+
+            int state = 0;
+            Integer bestCompanyId = null;
+            int bestStart = Integer.MAX_VALUE;
+            int bestLen = -1;
+            boolean ambiguous = false;
+            for (int i = 0; i < v.length(); i++) {
+                char ch = v.charAt(i);
+                while (state != 0 && !nodes.get(state).next.containsKey(ch)) {
+                    state = nodes.get(state).fail;
+                }
+                Integer next = nodes.get(state).next.get(ch);
+                state = next != null ? next : 0;
+
+                List<Integer> out = nodes.get(state).out;
+                if (out.isEmpty()) {
+                    continue;
+                }
+                for (Integer idx : out) {
+                    if (idx == null || idx < 0 || idx >= patternCompanyId.length) {
+                        continue;
+                    }
+                    int cid = patternCompanyId[idx];
+                    // Pattern exists but maps to multiple companies -> ignore this hit, keep looking for a unique one.
+                    if (cid == 0) {
+                        continue;
+                    }
+                    int len = (idx < patternLen.length) ? patternLen[idx] : 0;
+                    int start = len > 0 ? (i - len + 1) : i;
+                    if (bestCompanyId == null) {
+                        bestCompanyId = cid;
+                        bestStart = start;
+                        bestLen = len;
+                        continue;
+                    }
+                    if (start < bestStart) {
+                        bestCompanyId = cid;
+                        bestStart = start;
+                        bestLen = len;
+                        continue;
+                    }
+                    if (start == bestStart) {
+                        // Prefer the longer (more specific) match at the same position.
+                        if (len > bestLen) {
+                            bestCompanyId = cid;
+                            bestLen = len;
+                            continue;
+                        }
+                        // Same position + same length but different companyId -> truly ambiguous.
+                        if (len == bestLen && !bestCompanyId.equals(cid)) {
+                            ambiguous = true;
+                            break;
+                        }
+                    }
+                }
+                if (ambiguous) {
+                    break;
+                }
+            }
+
+            if (ambiguous) {
+                return new MatchResult(null, true);
+            }
+            return new MatchResult(bestCompanyId, false);
+        }
+    }
 }

src/main/java/com/gxwebsoft/credit/controller/CreditAdministrativeLicenseController.java

@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditAdministrativeLicense;
 import com.gxwebsoft.credit.param.CreditAdministrativeLicenseImportParam;
 import com.gxwebsoft.credit.param.CreditAdministrativeLicenseParam;
@@ -25,7 +26,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -105,7 +105,7 @@ public class CreditAdministrativeLicenseController extends BaseController {
     @Operation(summary = "删除行政许可")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditAdministrativeLicenseService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditAdministrativeLicense.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -138,7 +138,7 @@ public class CreditAdministrativeLicenseController extends BaseController {
     @Operation(summary = "批量删除行政许可")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditAdministrativeLicenseService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditAdministrativeLicense.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -171,6 +171,7 @@ public class CreditAdministrativeLicenseController extends BaseController {
             CreditAdministrativeLicense::getName,
             CreditAdministrativeLicense::getCompanyId,
             CreditAdministrativeLicense::setCompanyId,
+            CreditAdministrativeLicense::setCompanyName,
             CreditAdministrativeLicense::getHasData,
             CreditAdministrativeLicense::setHasData,
             CreditAdministrativeLicense::getTenantId,
@@ -212,6 +213,11 @@ public class CreditAdministrativeLicenseController extends BaseController {
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByCode = ExcelImportSupport.readHyperlinksByHeaderKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "决定文书/许可编号");
             Map<String, String> urlByName = ExcelImportSupport.readHyperlinksByHeaderKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "决定文书/许可证名称");
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             final int chunkSize = 500;
             final int mpBatchSize = 500;
@@ -235,6 +241,9 @@ public class CreditAdministrativeLicenseController extends BaseController {
 
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getCompanyId() != null && item.getCompanyId() > 0) {
                         touchedCompanyIds.add(item.getCompanyId());
@@ -268,48 +277,13 @@ public class CreditAdministrativeLicenseController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditAdministrativeLicenseService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertByCodeOrName(
+                            mpBatchSize,
-                                creditAdministrativeLicenseService,
+                            CreditAdministrativeLicense::getName,
-                                chunkItems,
+                            "",
-                                CreditAdministrativeLicense::getId,
-                                CreditAdministrativeLicense::setId,
-                                CreditAdministrativeLicense::getCode,
-                                CreditAdministrativeLicense::getCode,
-                                CreditAdministrativeLicense::getName,
-                                CreditAdministrativeLicense::getName,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditAdministrativeLicenseService.save(rowItem);
-                                if (!saved) {
-                                    CreditAdministrativeLicense existing = null;
-                                    if (!ImportHelper.isBlank(rowItem.getCode())) {
-                                        existing = creditAdministrativeLicenseService.lambdaQuery()
-                                            .eq(CreditAdministrativeLicense::getCode, rowItem.getCode())
-                                            .one();
-                                    }
-                                    if (existing == null) {
-                                        existing = creditAdministrativeLicenseService.lambdaQuery()
-                                            .eq(CreditAdministrativeLicense::getName, rowItem.getName())
-                                            .one();
-                                    }
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditAdministrativeLicenseService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -323,48 +297,13 @@ public class CreditAdministrativeLicenseController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditAdministrativeLicenseService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertByCodeOrName(
+                    mpBatchSize,
-                        creditAdministrativeLicenseService,
+                    CreditAdministrativeLicense::getName,
-                        chunkItems,
+                    "",
-                        CreditAdministrativeLicense::getId,
-                        CreditAdministrativeLicense::setId,
-                        CreditAdministrativeLicense::getCode,
-                        CreditAdministrativeLicense::getCode,
-                        CreditAdministrativeLicense::getName,
-                        CreditAdministrativeLicense::getName,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditAdministrativeLicenseService.save(rowItem);
-                        if (!saved) {
-                            CreditAdministrativeLicense existing = null;
-                            if (!ImportHelper.isBlank(rowItem.getCode())) {
-                                existing = creditAdministrativeLicenseService.lambdaQuery()
-                                    .eq(CreditAdministrativeLicense::getCode, rowItem.getCode())
-                                    .one();
-                            }
-                            if (existing == null) {
-                                existing = creditAdministrativeLicenseService.lambdaQuery()
-                                    .eq(CreditAdministrativeLicense::getName, rowItem.getName())
-                                    .one();
-                            }
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditAdministrativeLicenseService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -384,7 +323,7 @@ public class CreditAdministrativeLicenseController extends BaseController {
 
     /**
      * 批量导入历史行政许可（仅解析“历史行政许可”选项卡）
-     * 规则：优先按编号(code)匹配；code 为空时按名称(name)匹配；匹配到则覆盖更新（recommend++ 记录更新次数）。
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
      */
     @PreAuthorize("hasAuthority('credit:creditAdministrativeLicense:save')")
     @Operation(summary = "批量导入历史行政许可")
@@ -417,9 +356,16 @@ public class CreditAdministrativeLicenseController extends BaseController {
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByCode = ExcelImportSupport.readHyperlinksByHeaderKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "决定文书/许可编号");
             Map<String, String> urlByName = ExcelImportSupport.readHyperlinksByHeaderKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "决定文书/许可证名称");
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
-            LinkedHashMap<String, CreditAdministrativeLicense> latestByKey = new LinkedHashMap<>();
+            final int chunkSize = 500;
-            LinkedHashMap<String, Integer> latestRowByKey = new LinkedHashMap<>();
+            final int mpBatchSize = 500;
+            List<CreditAdministrativeLicense> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
 
             for (int i = 0; i < list.size(); i++) {
                 CreditAdministrativeLicenseImportParam param = list.get(i);
@@ -451,6 +397,9 @@ public class CreditAdministrativeLicenseController extends BaseController {
 
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getUserId() == null && currentUserId != null) {
                         item.setUserId(currentUserId);
@@ -467,144 +416,42 @@ public class CreditAdministrativeLicenseController extends BaseController {
                     // 历史导入的数据统一标记为“失效”
                     item.setDataStatus("失效");
 
-                    String dedupKey = !ImportHelper.isBlank(item.getCode()) ? ("CODE:" + item.getCode()) : ("NAME:" + item.getName());
+                    if (item.getRecommend() == null) {
-                    latestByKey.put(dedupKey, item);
+                        item.setRecommend(0);
-                    latestRowByKey.put(dedupKey, excelRowNumber);
+                    }
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditAdministrativeLicenseService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditAdministrativeLicense::getName,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
                 } catch (Exception e) {
                     errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
                     e.printStackTrace();
                 }
             }
 
-            if (latestByKey.isEmpty()) {
-                if (errorMessages.isEmpty()) {
-                    return fail("未读取到数据，请确认模板表头与示例格式一致", null);
-                }
-                return success("导入完成，成功0条，失败" + errorMessages.size() + "条", errorMessages);
-            }
-
-            final int chunkSize = 500;
-            final int mpBatchSize = 500;
-            List<CreditAdministrativeLicense> chunkItems = new ArrayList<>(chunkSize);
-            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
-
-            for (Map.Entry<String, CreditAdministrativeLicense> entry : latestByKey.entrySet()) {
-                String dedupKey = entry.getKey();
-                CreditAdministrativeLicense item = entry.getValue();
-                Integer rowNo = latestRowByKey.get(dedupKey);
-                chunkItems.add(item);
-                chunkRowNumbers.add(rowNo != null ? rowNo : -1);
-                if (chunkItems.size() >= chunkSize) {
-                    successCount += batchImportSupport.persistChunkWithFallback(
-                        chunkItems,
-                        chunkRowNumbers,
-                        () -> batchImportSupport.upsertByCodeOrNameAndIncrementCounterOnUpdate(
-                            creditAdministrativeLicenseService,
-                            chunkItems,
-                            CreditAdministrativeLicense::getId,
-                            CreditAdministrativeLicense::setId,
-                            CreditAdministrativeLicense::getCode,
-                            CreditAdministrativeLicense::getCode,
-                            CreditAdministrativeLicense::getName,
-                            CreditAdministrativeLicense::getName,
-                            CreditAdministrativeLicense::getRecommend,
-                            CreditAdministrativeLicense::setRecommend,
-                            null,
-                            mpBatchSize
-                        ),
-                        (rowItem, rowNumber) -> {
-                            if (rowItem.getRecommend() == null) {
-                                rowItem.setRecommend(0);
-                            }
-                            boolean saved = creditAdministrativeLicenseService.save(rowItem);
-                            if (!saved) {
-                                CreditAdministrativeLicense existing = null;
-                                if (!ImportHelper.isBlank(rowItem.getCode())) {
-                                    existing = creditAdministrativeLicenseService.lambdaQuery()
-                                        .eq(CreditAdministrativeLicense::getCode, rowItem.getCode())
-                                        .select(CreditAdministrativeLicense::getId, CreditAdministrativeLicense::getRecommend)
-                                        .one();
-                                }
-                                if (existing == null && !ImportHelper.isBlank(rowItem.getName())) {
-                                    existing = creditAdministrativeLicenseService.lambdaQuery()
-                                        .eq(CreditAdministrativeLicense::getName, rowItem.getName())
-                                        .select(CreditAdministrativeLicense::getId, CreditAdministrativeLicense::getRecommend)
-                                        .one();
-                                }
-                                if (existing != null) {
-                                    rowItem.setId(existing.getId());
-                                    Integer old = existing.getRecommend();
-                                    rowItem.setRecommend(old == null ? 1 : old + 1);
-                                    if (creditAdministrativeLicenseService.updateById(rowItem)) {
-                                        return true;
-                                    }
-                                }
-                            } else {
-                                return true;
-                            }
-                            String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                            errorMessages.add(prefix + "保存失败");
-                            return false;
-                        },
-                        errorMessages
-                    );
-                    chunkItems.clear();
-                    chunkRowNumbers.clear();
-                }
-            }
-
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditAdministrativeLicenseService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertByCodeOrNameAndIncrementCounterOnUpdate(
+                    mpBatchSize,
-                        creditAdministrativeLicenseService,
+                    CreditAdministrativeLicense::getName,
-                        chunkItems,
+                    "",
-                        CreditAdministrativeLicense::getId,
-                        CreditAdministrativeLicense::setId,
-                        CreditAdministrativeLicense::getCode,
-                        CreditAdministrativeLicense::getCode,
-                        CreditAdministrativeLicense::getName,
-                        CreditAdministrativeLicense::getName,
-                        CreditAdministrativeLicense::getRecommend,
-                        CreditAdministrativeLicense::setRecommend,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        if (rowItem.getRecommend() == null) {
-                            rowItem.setRecommend(0);
-                        }
-                        boolean saved = creditAdministrativeLicenseService.save(rowItem);
-                        if (!saved) {
-                            CreditAdministrativeLicense existing = null;
-                            if (!ImportHelper.isBlank(rowItem.getCode())) {
-                                existing = creditAdministrativeLicenseService.lambdaQuery()
-                                    .eq(CreditAdministrativeLicense::getCode, rowItem.getCode())
-                                    .select(CreditAdministrativeLicense::getId, CreditAdministrativeLicense::getRecommend)
-                                    .one();
-                            }
-                            if (existing == null && !ImportHelper.isBlank(rowItem.getName())) {
-                                existing = creditAdministrativeLicenseService.lambdaQuery()
-                                    .eq(CreditAdministrativeLicense::getName, rowItem.getName())
-                                    .select(CreditAdministrativeLicense::getId, CreditAdministrativeLicense::getRecommend)
-                                    .one();
-                            }
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                Integer old = existing.getRecommend();
-                                rowItem.setRecommend(old == null ? 1 : old + 1);
-                                if (creditAdministrativeLicenseService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditBankruptcyController.java

@@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -105,7 +104,7 @@ public class CreditBankruptcyController extends BaseController {
     @Operation(summary = "删除破产重整")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditBankruptcyService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditBankruptcy.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -138,7 +137,7 @@ public class CreditBankruptcyController extends BaseController {
     @Operation(summary = "批量删除破产重整")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditBankruptcyService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditBankruptcy.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -196,8 +195,16 @@ public class CreditBankruptcyController extends BaseController {
         Set<Integer> touchedCompanyIds = new HashSet<>();
 
         try {
-            ExcelImportSupport.ImportResult<CreditBankruptcyImportParam> importResult = ExcelImportSupport.readAnySheet(
+            // Prefer importing from the explicit tab name "破产重整" when present.
-                file, CreditBankruptcyImportParam.class, this::isEmptyImportRow);
+            // This avoids accidentally importing from other sheets (e.g. "历史破产重整") in multi-sheet workbooks.
+            int sheetIndex = ExcelImportSupport.findSheetIndex(file, "破产重整");
+            ExcelImportSupport.ImportResult<CreditBankruptcyImportParam> importResult;
+            if (sheetIndex >= 0) {
+                importResult = ExcelImportSupport.read(file, CreditBankruptcyImportParam.class, this::isEmptyImportRow, sheetIndex);
+            } else {
+                // Backward compatible: try any sheet for older templates without the expected tab name.
+                importResult = ExcelImportSupport.readAnySheet(file, CreditBankruptcyImportParam.class, this::isEmptyImportRow);
+            }
             List<CreditBankruptcyImportParam> list = importResult.getData();
             int usedTitleRows = importResult.getTitleRows();
             int usedHeadRows = importResult.getHeadRows();
@@ -263,38 +270,13 @@ public class CreditBankruptcyController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditBankruptcyService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditBankruptcyService,
+                            CreditBankruptcy::getCode,
-                                chunkItems,
+                            "",
-                                CreditBankruptcy::getId,
-                                CreditBankruptcy::setId,
-                                CreditBankruptcy::getCode,
-                                CreditBankruptcy::getCode,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditBankruptcyService.save(rowItem);
-                                if (!saved) {
-                                    CreditBankruptcy existing = creditBankruptcyService.lambdaQuery()
-                                        .eq(CreditBankruptcy::getCode, rowItem.getCode())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditBankruptcyService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -308,38 +290,13 @@ public class CreditBankruptcyController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditBankruptcyService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditBankruptcyService,
+                    CreditBankruptcy::getCode,
-                        chunkItems,
+                    "",
-                        CreditBankruptcy::getId,
-                        CreditBankruptcy::setId,
-                        CreditBankruptcy::getCode,
-                        CreditBankruptcy::getCode,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditBankruptcyService.save(rowItem);
-                        if (!saved) {
-                            CreditBankruptcy existing = creditBankruptcyService.lambdaQuery()
-                                .eq(CreditBankruptcy::getCode, rowItem.getCode())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditBankruptcyService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -359,7 +316,7 @@ public class CreditBankruptcyController extends BaseController {
 
     /**
      * 批量导入历史破产重整（仅解析“历史破产重整”选项卡）
-     * 规则：案号/唯一标识相同则覆盖更新（recommend++ 记录更新次数）；不存在则插入。
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
      */
     @PreAuthorize("hasAuthority('credit:creditBankruptcy:save')")
     @Operation(summary = "批量导入历史破产重整")
@@ -392,8 +349,10 @@ public class CreditBankruptcyController extends BaseController {
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByCode = ExcelImportSupport.readHyperlinksByHeaderKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "案号");
 
-            LinkedHashMap<String, CreditBankruptcy> latestByCode = new LinkedHashMap<>();
+            final int chunkSize = 500;
-            LinkedHashMap<String, Integer> latestRowByCode = new LinkedHashMap<>();
+            final int mpBatchSize = 500;
+            List<CreditBankruptcy> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
 
             for (int i = 0; i < list.size(); i++) {
                 CreditBankruptcyImportParam param = list.get(i);
@@ -429,121 +388,42 @@ public class CreditBankruptcyController extends BaseController {
                         item.setDeleted(0);
                     }
 
-                    latestByCode.put(item.getCode(), item);
+                    if (item.getRecommend() == null) {
-                    latestRowByCode.put(item.getCode(), excelRowNumber);
+                        item.setRecommend(0);
+                    }
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditBankruptcyService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditBankruptcy::getCode,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
                 } catch (Exception e) {
                     errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
                     e.printStackTrace();
                 }
             }
 
-            if (latestByCode.isEmpty()) {
-                if (errorMessages.isEmpty()) {
-                    return fail("未读取到数据，请确认模板表头与示例格式一致", null);
-                }
-                return success("导入完成，成功0条，失败" + errorMessages.size() + "条", errorMessages);
-            }
-
-            final int chunkSize = 500;
-            final int mpBatchSize = 500;
-            List<CreditBankruptcy> chunkItems = new ArrayList<>(chunkSize);
-            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
-
-            for (Map.Entry<String, CreditBankruptcy> entry : latestByCode.entrySet()) {
-                String code = entry.getKey();
-                CreditBankruptcy item = entry.getValue();
-                Integer rowNo = latestRowByCode.get(code);
-                chunkItems.add(item);
-                chunkRowNumbers.add(rowNo != null ? rowNo : -1);
-                if (chunkItems.size() >= chunkSize) {
-                    successCount += batchImportSupport.persistChunkWithFallback(
-                        chunkItems,
-                        chunkRowNumbers,
-                        () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
-                            creditBankruptcyService,
-                            chunkItems,
-                            CreditBankruptcy::getId,
-                            CreditBankruptcy::setId,
-                            CreditBankruptcy::getCode,
-                            CreditBankruptcy::getCode,
-                            CreditBankruptcy::getRecommend,
-                            CreditBankruptcy::setRecommend,
-                            null,
-                            mpBatchSize
-                        ),
-                        (rowItem, rowNumber) -> {
-                            if (rowItem.getRecommend() == null) {
-                                rowItem.setRecommend(0);
-                            }
-                            boolean saved = creditBankruptcyService.save(rowItem);
-                            if (!saved) {
-                                CreditBankruptcy existing = creditBankruptcyService.lambdaQuery()
-                                    .eq(CreditBankruptcy::getCode, rowItem.getCode())
-                                    .select(CreditBankruptcy::getId, CreditBankruptcy::getRecommend)
-                                    .one();
-                                if (existing != null) {
-                                    rowItem.setId(existing.getId());
-                                    Integer old = existing.getRecommend();
-                                    rowItem.setRecommend(old == null ? 1 : old + 1);
-                                    if (creditBankruptcyService.updateById(rowItem)) {
-                                        return true;
-                                    }
-                                }
-                            } else {
-                                return true;
-                            }
-                            String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                            errorMessages.add(prefix + "保存失败");
-                            return false;
-                        },
-                        errorMessages
-                    );
-                    chunkItems.clear();
-                    chunkRowNumbers.clear();
-                }
-            }
-
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditBankruptcyService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
+                    mpBatchSize,
-                        creditBankruptcyService,
+                    CreditBankruptcy::getCode,
-                        chunkItems,
+                    "",
-                        CreditBankruptcy::getId,
-                        CreditBankruptcy::setId,
-                        CreditBankruptcy::getCode,
-                        CreditBankruptcy::getCode,
-                        CreditBankruptcy::getRecommend,
-                        CreditBankruptcy::setRecommend,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        if (rowItem.getRecommend() == null) {
-                            rowItem.setRecommend(0);
-                        }
-                        boolean saved = creditBankruptcyService.save(rowItem);
-                        if (!saved) {
-                            CreditBankruptcy existing = creditBankruptcyService.lambdaQuery()
-                                .eq(CreditBankruptcy::getCode, rowItem.getCode())
-                                .select(CreditBankruptcy::getId, CreditBankruptcy::getRecommend)
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                Integer old = existing.getRecommend();
-                                rowItem.setRecommend(old == null ? 1 : old + 1);
-                                if (creditBankruptcyService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditBranchController.java

@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditBranch;
 import com.gxwebsoft.credit.param.CreditBranchImportParam;
 import com.gxwebsoft.credit.param.CreditBranchParam;
@@ -104,7 +105,7 @@ public class CreditBranchController extends BaseController {
     @Operation(summary = "删除分支机构")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditBranchService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditBranch.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +138,7 @@ public class CreditBranchController extends BaseController {
     @Operation(summary = "批量删除分支机构")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditBranchService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditBranch.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -170,6 +171,7 @@ public class CreditBranchController extends BaseController {
             CreditBranch::getName,
             CreditBranch::getCompanyId,
             CreditBranch::setCompanyId,
+            CreditBranch::setCompanyName,
             CreditBranch::getHasData,
             CreditBranch::setHasData,
             CreditBranch::getTenantId,
@@ -210,6 +212,11 @@ public class CreditBranchController extends BaseController {
             Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByName = ExcelImportSupport.readHyperlinksByHeaderKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "分支机构名称");
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             final int chunkSize = 500;
             final int mpBatchSize = 500;
@@ -229,6 +236,9 @@ public class CreditBranchController extends BaseController {
 
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getUserId() == null && currentUserId != null) {
                         item.setUserId(currentUserId);
@@ -259,38 +269,13 @@ public class CreditBranchController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditBranchService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditBranchService,
+                            CreditBranch::getName,
-                                chunkItems,
+                            "",
-                                CreditBranch::getId,
-                                CreditBranch::setId,
-                                CreditBranch::getName,
-                                CreditBranch::getName,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditBranchService.save(rowItem);
-                                if (!saved) {
-                                    CreditBranch existing = creditBranchService.lambdaQuery()
-                                        .eq(CreditBranch::getName, rowItem.getName())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditBranchService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -304,38 +289,13 @@ public class CreditBranchController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditBranchService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditBranchService,
+                    CreditBranch::getName,
-                        chunkItems,
+                    "",
-                        CreditBranch::getId,
-                        CreditBranch::setId,
-                        CreditBranch::getName,
-                        CreditBranch::getName,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditBranchService.save(rowItem);
-                        if (!saved) {
-                            CreditBranch existing = creditBranchService.lambdaQuery()
-                                .eq(CreditBranch::getName, rowItem.getName())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditBranchService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditBreachOfTrustController.java

@@ -23,10 +23,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -101,7 +99,7 @@ public class CreditBreachOfTrustController extends BaseController {
     @Operation(summary = "删除失信被执行人")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditBreachOfTrustService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditBreachOfTrust.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -134,7 +132,7 @@ public class CreditBreachOfTrustController extends BaseController {
     @Operation(summary = "批量删除失信被执行人")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditBreachOfTrustService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditBreachOfTrust.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -156,7 +154,9 @@ public class CreditBreachOfTrustController extends BaseController {
         User loginUser = getLoginUser();
         Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
 
-        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
+        // Party columns may contain multiple roles/names; match if any company name is contained in the text.
+        // Priority: 原告/上诉人 > 被告/被上诉人 > 其他当事人/第三人
+        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
             creditBreachOfTrustService,
             creditCompanyService,
             currentTenantId,
@@ -164,13 +164,15 @@ public class CreditBreachOfTrustController extends BaseController {
             limit,
             CreditBreachOfTrust::getId,
             CreditBreachOfTrust::setId,
-            CreditBreachOfTrust::getPlaintiffAppellant,
             CreditBreachOfTrust::getCompanyId,
             CreditBreachOfTrust::setCompanyId,
             CreditBreachOfTrust::getHasData,
             CreditBreachOfTrust::setHasData,
             CreditBreachOfTrust::getTenantId,
-            CreditBreachOfTrust::new
+            CreditBreachOfTrust::new,
+            CreditBreachOfTrust::getPlaintiffAppellant,
+            CreditBreachOfTrust::getAppellee,
+            CreditBreachOfTrust::getOtherPartiesThirdParty
         );
 
         if (!stats.anyDataRead) {
@@ -260,38 +262,13 @@ public class CreditBreachOfTrustController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditBreachOfTrustService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditBreachOfTrustService,
+                            CreditBreachOfTrust::getCaseNumber,
-                                chunkItems,
+                            "",
-                                CreditBreachOfTrust::getId,
-                                CreditBreachOfTrust::setId,
-                                CreditBreachOfTrust::getCaseNumber,
-                                CreditBreachOfTrust::getCaseNumber,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditBreachOfTrustService.save(rowItem);
-                                if (!saved) {
-                                    CreditBreachOfTrust existing = creditBreachOfTrustService.lambdaQuery()
-                                        .eq(CreditBreachOfTrust::getCaseNumber, rowItem.getCaseNumber())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditBreachOfTrustService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -305,38 +282,13 @@ public class CreditBreachOfTrustController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditBreachOfTrustService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditBreachOfTrustService,
+                    CreditBreachOfTrust::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditBreachOfTrust::getId,
-                        CreditBreachOfTrust::setId,
-                        CreditBreachOfTrust::getCaseNumber,
-                        CreditBreachOfTrust::getCaseNumber,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditBreachOfTrustService.save(rowItem);
-                        if (!saved) {
-                            CreditBreachOfTrust existing = creditBreachOfTrustService.lambdaQuery()
-                                .eq(CreditBreachOfTrust::getCaseNumber, rowItem.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditBreachOfTrustService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -356,7 +308,7 @@ public class CreditBreachOfTrustController extends BaseController {
 
     /**
      * 批量导入历史失信被执行人（仅解析“历史失信被执行人”选项卡）
-     * 规则：案号相同则覆盖更新（recommend++ 记录更新次数）；案号不存在则插入。
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
      */
     @PreAuthorize("hasAuthority('credit:creditBreachOfTrust:save')")
     @Operation(summary = "批量导入历史失信被执行人")
@@ -390,8 +342,10 @@ public class CreditBreachOfTrustController extends BaseController {
             Map<String, String> urlByCaseNumber = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "案号");
 
             // 同案号多条：以导入文件中“最后一条”为准（视为最新）
-            LinkedHashMap<String, CreditBreachOfTrust> latestByCaseNumber = new LinkedHashMap<>();
+            final int chunkSize = 500;
-            LinkedHashMap<String, Integer> latestRowByCaseNumber = new LinkedHashMap<>();
+            final int mpBatchSize = 500;
+            List<CreditBreachOfTrust> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
 
             for (int i = 0; i < list.size(); i++) {
                 CreditBreachOfTrustImportParam param = list.get(i);
@@ -429,121 +383,42 @@ public class CreditBreachOfTrustController extends BaseController {
                     // 历史导入的数据统一标记为“失效”
                     item.setDataStatus("失效");
 
-                    latestByCaseNumber.put(item.getCaseNumber(), item);
+                    if (item.getRecommend() == null) {
-                    latestRowByCaseNumber.put(item.getCaseNumber(), excelRowNumber);
+                        item.setRecommend(0);
+                    }
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditBreachOfTrustService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditBreachOfTrust::getCaseNumber,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
                 } catch (Exception e) {
                     errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
                     e.printStackTrace();
                 }
             }
 
-            if (latestByCaseNumber.isEmpty()) {
-                if (errorMessages.isEmpty()) {
-                    return fail("未读取到数据，请确认模板表头与示例格式一致", null);
-                }
-                return success("导入完成，成功0条，失败" + errorMessages.size() + "条", errorMessages);
-            }
-
-            final int chunkSize = 500;
-            final int mpBatchSize = 500;
-            List<CreditBreachOfTrust> chunkItems = new ArrayList<>(chunkSize);
-            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
-
-            for (Map.Entry<String, CreditBreachOfTrust> entry : latestByCaseNumber.entrySet()) {
-                String caseNumber = entry.getKey();
-                CreditBreachOfTrust item = entry.getValue();
-                Integer rowNo = latestRowByCaseNumber.get(caseNumber);
-                chunkItems.add(item);
-                chunkRowNumbers.add(rowNo != null ? rowNo : -1);
-                if (chunkItems.size() >= chunkSize) {
-                    successCount += batchImportSupport.persistChunkWithFallback(
-                        chunkItems,
-                        chunkRowNumbers,
-                        () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
-                            creditBreachOfTrustService,
-                            chunkItems,
-                            CreditBreachOfTrust::getId,
-                            CreditBreachOfTrust::setId,
-                            CreditBreachOfTrust::getCaseNumber,
-                            CreditBreachOfTrust::getCaseNumber,
-                            CreditBreachOfTrust::getRecommend,
-                            CreditBreachOfTrust::setRecommend,
-                            null,
-                            mpBatchSize
-                        ),
-                        (rowItem, rowNumber) -> {
-                            if (rowItem.getRecommend() == null) {
-                                rowItem.setRecommend(0);
-                            }
-                            boolean saved = creditBreachOfTrustService.save(rowItem);
-                            if (!saved) {
-                                CreditBreachOfTrust existing = creditBreachOfTrustService.lambdaQuery()
-                                    .eq(CreditBreachOfTrust::getCaseNumber, rowItem.getCaseNumber())
-                                    .select(CreditBreachOfTrust::getId, CreditBreachOfTrust::getRecommend)
-                                    .one();
-                                if (existing != null) {
-                                    rowItem.setId(existing.getId());
-                                    Integer old = existing.getRecommend();
-                                    rowItem.setRecommend(old == null ? 1 : old + 1);
-                                    if (creditBreachOfTrustService.updateById(rowItem)) {
-                                        return true;
-                                    }
-                                }
-                            } else {
-                                return true;
-                            }
-                            String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                            errorMessages.add(prefix + "保存失败");
-                            return false;
-                        },
-                        errorMessages
-                    );
-                    chunkItems.clear();
-                    chunkRowNumbers.clear();
-                }
-            }
-
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditBreachOfTrustService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
+                    mpBatchSize,
-                        creditBreachOfTrustService,
+                    CreditBreachOfTrust::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditBreachOfTrust::getId,
-                        CreditBreachOfTrust::setId,
-                        CreditBreachOfTrust::getCaseNumber,
-                        CreditBreachOfTrust::getCaseNumber,
-                        CreditBreachOfTrust::getRecommend,
-                        CreditBreachOfTrust::setRecommend,
-                        null,
-                        mpBatchSize
-                        ),
-                        (rowItem, rowNumber) -> {
-                            if (rowItem.getRecommend() == null) {
-                                rowItem.setRecommend(0);
-                            }
-                            boolean saved = creditBreachOfTrustService.save(rowItem);
-                            if (!saved) {
-                                CreditBreachOfTrust existing = creditBreachOfTrustService.lambdaQuery()
-                                    .eq(CreditBreachOfTrust::getCaseNumber, rowItem.getCaseNumber())
-                                    .select(CreditBreachOfTrust::getId, CreditBreachOfTrust::getRecommend)
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                Integer old = existing.getRecommend();
-                                rowItem.setRecommend(old == null ? 1 : old + 1);
-                                if (creditBreachOfTrustService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditCaseFilingController.java

@@ -104,7 +104,7 @@ public class CreditCaseFilingController extends BaseController {
     @Operation(summary = "删除司法大数据")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditCaseFilingService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditCaseFiling.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +137,7 @@ public class CreditCaseFilingController extends BaseController {
     @Operation(summary = "批量删除司法大数据")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditCaseFilingService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditCaseFiling.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -159,7 +159,9 @@ public class CreditCaseFilingController extends BaseController {
         User loginUser = getLoginUser();
         Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
 
-        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
+        // Special: party columns may contain multiple roles/names; match if any company name is contained in the text.
+        // Priority: 原告/上诉人 > 被告/被上诉人 > 其他当事人/第三人
+        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
             creditCaseFilingService,
             creditCompanyService,
             currentTenantId,
@@ -167,13 +169,15 @@ public class CreditCaseFilingController extends BaseController {
             limit,
             CreditCaseFiling::getId,
             CreditCaseFiling::setId,
-            CreditCaseFiling::getAppellee,
             CreditCaseFiling::getCompanyId,
             CreditCaseFiling::setCompanyId,
             CreditCaseFiling::getHasData,
             CreditCaseFiling::setHasData,
             CreditCaseFiling::getTenantId,
-            CreditCaseFiling::new
+            CreditCaseFiling::new,
+            CreditCaseFiling::getPlaintiffAppellant,
+            CreditCaseFiling::getAppellee,
+            CreditCaseFiling::getOtherPartiesThirdParty
         );
 
         if (!stats.anyDataRead) {
@@ -261,38 +265,13 @@ public class CreditCaseFilingController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditCaseFilingService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditCaseFilingService,
+                            CreditCaseFiling::getCaseNumber,
-                                chunkItems,
+                            "",
-                                CreditCaseFiling::getId,
-                                CreditCaseFiling::setId,
-                                CreditCaseFiling::getCaseNumber,
-                                CreditCaseFiling::getCaseNumber,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditCaseFilingService.save(rowItem);
-                                if (!saved) {
-                                    CreditCaseFiling existing = creditCaseFilingService.lambdaQuery()
-                                        .eq(CreditCaseFiling::getCaseNumber, rowItem.getCaseNumber())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditCaseFilingService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -306,38 +285,13 @@ public class CreditCaseFilingController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditCaseFilingService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditCaseFilingService,
+                    CreditCaseFiling::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditCaseFiling::getId,
-                        CreditCaseFiling::setId,
-                        CreditCaseFiling::getCaseNumber,
-                        CreditCaseFiling::getCaseNumber,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditCaseFilingService.save(rowItem);
-                        if (!saved) {
-                            CreditCaseFiling existing = creditCaseFilingService.lambdaQuery()
-                                .eq(CreditCaseFiling::getCaseNumber, rowItem.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditCaseFilingService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -355,6 +309,134 @@ public class CreditCaseFilingController extends BaseController {
         }
     }
 
+    /**
+     * 批量导入历史立案信息（仅解析“历史立案信息”选项卡）
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
+     */
+    @PreAuthorize("hasAuthority('credit:creditCaseFiling:save')")
+    @Operation(summary = "批量导入历史立案信息")
+    @PostMapping("/import/history")
+    public ApiResult<List<String>> importHistoryBatch(@RequestParam("file") MultipartFile file,
+                                                      @RequestParam(value = "companyId", required = false) Integer companyId) {
+        List<String> errorMessages = new ArrayList<>();
+        int successCount = 0;
+        Set<Integer> touchedCompanyIds = new HashSet<>();
+
+        try {
+            int sheetIndex = ExcelImportSupport.findSheetIndex(file, "历史立案信息");
+            if (sheetIndex < 0) {
+                return fail("未读取到数据，请确认文件中存在“历史立案信息”选项卡且表头与示例格式一致", null);
+            }
+
+            ExcelImportSupport.ImportResult<CreditCaseFilingImportParam> importResult = ExcelImportSupport.read(
+                file, CreditCaseFilingImportParam.class, this::isEmptyImportRow, sheetIndex);
+            List<CreditCaseFilingImportParam> list = importResult.getData();
+            int usedTitleRows = importResult.getTitleRows();
+            int usedHeadRows = importResult.getHeadRows();
+            int usedSheetIndex = importResult.getSheetIndex();
+
+            if (CollectionUtils.isEmpty(list)) {
+                return fail("未读取到数据，请确认模板表头与示例格式一致", null);
+            }
+
+            User loginUser = getLoginUser();
+            Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
+            Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
+            Map<String, String> urlByCaseNumber = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "案号");
+
+            final int chunkSize = 500;
+            final int mpBatchSize = 500;
+            List<CreditCaseFiling> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
+
+            for (int i = 0; i < list.size(); i++) {
+                CreditCaseFilingImportParam param = list.get(i);
+                int excelRowNumber = i + 1 + usedTitleRows + usedHeadRows;
+                try {
+                    CreditCaseFiling item = convertImportParamToEntity(param);
+                    if (item.getCaseNumber() != null) {
+                        item.setCaseNumber(item.getCaseNumber().trim());
+                    }
+                    if (ImportHelper.isBlank(item.getCaseNumber())) {
+                        errorMessages.add("第" + excelRowNumber + "行：案号不能为空");
+                        continue;
+                    }
+
+                    String link = urlByCaseNumber.get(item.getCaseNumber());
+                    if (!ImportHelper.isBlank(link)) {
+                        item.setUrl(link.trim());
+                    }
+
+                    if (item.getCompanyId() == null && companyId != null) {
+                        item.setCompanyId(companyId);
+                    }
+                    if (item.getUserId() == null && currentUserId != null) {
+                        item.setUserId(currentUserId);
+                    }
+                    if (item.getTenantId() == null && currentTenantId != null) {
+                        item.setTenantId(currentTenantId);
+                    }
+                    if (item.getStatus() == null) {
+                        item.setStatus(0);
+                    }
+                    if (item.getDeleted() == null) {
+                        item.setDeleted(0);
+                    }
+                    if (item.getRecommend() == null) {
+                        item.setRecommend(0);
+                    }
+                    // 历史导入的数据统一标记为“失效”
+                    item.setDataStatus("失效");
+
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditCaseFilingService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditCaseFiling::getCaseNumber,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
+                } catch (Exception e) {
+                    errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+
+            if (!chunkItems.isEmpty()) {
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditCaseFilingService,
+                    chunkItems,
+                    chunkRowNumbers,
+                    mpBatchSize,
+                    CreditCaseFiling::getCaseNumber,
+                    "",
+                    errorMessages
+                );
+            }
+
+            creditCompanyRecordCountService.refresh(CreditCompanyRecordCountService.CountType.CASE_FILING, touchedCompanyIds);
+
+            if (errorMessages.isEmpty()) {
+                return success("成功导入" + successCount + "条数据", null);
+            }
+            return success("导入完成，成功" + successCount + "条，失败" + errorMessages.size() + "条", errorMessages);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return fail("导入失败：" + e.getMessage(), null);
+        }
+    }
+
     /**
      * 下载立案信息导入模板
      */

src/main/java/com/gxwebsoft/credit/controller/CreditCompanyController.java

@@ -99,7 +99,7 @@ public class CreditCompanyController extends BaseController {
     @Operation(summary = "删除企业")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditCompanyService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditCompany.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -132,7 +132,7 @@ public class CreditCompanyController extends BaseController {
     @Operation(summary = "批量删除企业")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditCompanyService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditCompany.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -149,6 +149,7 @@ public class CreditCompanyController extends BaseController {
     List<String> errorMessages = new ArrayList<>();
     int insertedCount = 0;
     Set<String> touchedMatchNames = new HashSet<>();
+    String refreshWarning = null;
 
     try {
       List<CreditCompanyImportParam> list = null;
@@ -324,13 +325,31 @@ public class CreditCompanyController extends BaseController {
             }
           }
         }
-        creditCompanyRecordCountService.refreshAll(touchedCompanyIds);
+        try {
+          creditCompanyRecordCountService.refreshAll(touchedCompanyIds);
+        } catch (Exception ex) {
+          // 导入本身已经成功写入，回填计数字段失败不应导致整个导入失败（可后续单独重试刷新）。
+          String msg = ex.getMessage();
+          if (msg != null && msg.length() > 300) {
+            msg = msg.substring(0, 300) + "...";
+          }
+          refreshWarning = "关联记录数回填失败：" + (msg != null ? msg : ex.getClass().getSimpleName());
+          ex.printStackTrace();
+        }
       }
 
       if (errorMessages.isEmpty()) {
-        return success("成功入库" + insertedCount + "条数据", null);
+        String msg = "成功入库" + insertedCount + "条数据";
+        if (refreshWarning != null) {
+          msg = msg + "；" + refreshWarning;
+        }
+        return success(msg, null);
       } else {
-        return success("导入完成，入库" + insertedCount + "条，失败" + errorMessages.size() + "条", errorMessages);
+        String msg = "导入完成，入库" + insertedCount + "条，失败" + errorMessages.size() + "条";
+        if (refreshWarning != null) {
+          msg = msg + "；" + refreshWarning;
+        }
+        return success(msg, errorMessages);
       }
 
     } catch (Exception e) {

src/main/java/com/gxwebsoft/credit/controller/CreditCompetitorController.java

@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditCompetitor;
 import com.gxwebsoft.credit.param.CreditCompetitorImportParam;
 import com.gxwebsoft.credit.param.CreditCompetitorParam;
@@ -104,7 +105,7 @@ public class CreditCompetitorController extends BaseController {
     @Operation(summary = "删除竞争对手")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditCompetitorService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditCompetitor.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +138,7 @@ public class CreditCompetitorController extends BaseController {
     @Operation(summary = "批量删除竞争对手")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditCompetitorService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditCompetitor.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -170,6 +171,7 @@ public class CreditCompetitorController extends BaseController {
             CreditCompetitor::getName,
             CreditCompetitor::getCompanyId,
             CreditCompetitor::setCompanyId,
+            CreditCompetitor::setCompanyName,
             CreditCompetitor::getHasData,
             CreditCompetitor::setHasData,
             CreditCompetitor::getTenantId,
@@ -212,6 +214,11 @@ public class CreditCompetitorController extends BaseController {
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByName = ExcelImportSupport.readUrlByKey(
                 file, usedSheetIndex, usedTitleRows, usedHeadRows, "企业名称");
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             final int chunkSize = 500;
             final int mpBatchSize = 500;
@@ -222,7 +229,7 @@ public class CreditCompetitorController extends BaseController {
                 CreditCompetitorImportParam param = list.get(i);
                 try {
                     CreditCompetitor item = convertImportParamToEntity(param);
-                    // name 才是持久化字段；companyName 为关联查询的临时字段（exist=false），导入时不应使用。
+                    // name 为竞争对手企业名称；companyName 为主体企业名称。
                     if (!ImportHelper.isBlank(item.getName())) {
                         String link = urlByName.get(item.getName().trim());
                         if (!ImportHelper.isBlank(link)) {
@@ -232,6 +239,9 @@ public class CreditCompetitorController extends BaseController {
 
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getUserId() == null && currentUserId != null) {
                         item.setUserId(currentUserId);
@@ -262,38 +272,13 @@ public class CreditCompetitorController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditCompetitorService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditCompetitorService,
+                            CreditCompetitor::getName,
-                                chunkItems,
+                            "",
-                                CreditCompetitor::getId,
-                                CreditCompetitor::setId,
-                                CreditCompetitor::getName,
-                                CreditCompetitor::getName,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditCompetitorService.save(rowItem);
-                                if (!saved) {
-                                    CreditCompetitor existing = creditCompetitorService.lambdaQuery()
-                                        .eq(CreditCompetitor::getName, rowItem.getName())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditCompetitorService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -307,38 +292,13 @@ public class CreditCompetitorController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditCompetitorService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditCompetitorService,
+                    CreditCompetitor::getName,
-                        chunkItems,
+                    "",
-                        CreditCompetitor::getId,
-                        CreditCompetitor::setId,
-                        CreditCompetitor::getName,
-                        CreditCompetitor::getName,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditCompetitorService.save(rowItem);
-                        if (!saved) {
-                            CreditCompetitor existing = creditCompetitorService.lambdaQuery()
-                                .eq(CreditCompetitor::getName, rowItem.getName())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditCompetitorService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditCourtAnnouncementController.java

@@ -104,7 +104,7 @@ public class CreditCourtAnnouncementController extends BaseController {
     @Operation(summary = "删除法院公告司法大数据")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditCourtAnnouncementService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditCourtAnnouncement.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +137,7 @@ public class CreditCourtAnnouncementController extends BaseController {
     @Operation(summary = "批量删除法院公告司法大数据")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditCourtAnnouncementService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditCourtAnnouncement.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -159,7 +159,9 @@ public class CreditCourtAnnouncementController extends BaseController {
         User loginUser = getLoginUser();
         Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
 
-        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
+        // Party columns may contain multiple roles/names; match if any company name is contained in the text.
+        // Priority: 原告/上诉人 > 被告/被上诉人 > 其他当事人/第三人
+        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
             creditCourtAnnouncementService,
             creditCompanyService,
             currentTenantId,
@@ -167,13 +169,15 @@ public class CreditCourtAnnouncementController extends BaseController {
             limit,
             CreditCourtAnnouncement::getId,
             CreditCourtAnnouncement::setId,
-            CreditCourtAnnouncement::getAppellee,
             CreditCourtAnnouncement::getCompanyId,
             CreditCourtAnnouncement::setCompanyId,
             CreditCourtAnnouncement::getHasData,
             CreditCourtAnnouncement::setHasData,
             CreditCourtAnnouncement::getTenantId,
-            CreditCourtAnnouncement::new
+            CreditCourtAnnouncement::new,
+            CreditCourtAnnouncement::getPlaintiffAppellant,
+            CreditCourtAnnouncement::getAppellee,
+            CreditCourtAnnouncement::getOtherPartiesThirdParty
         );
 
         if (!stats.anyDataRead) {
@@ -261,38 +265,13 @@ public class CreditCourtAnnouncementController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditCourtAnnouncementService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditCourtAnnouncementService,
+                            CreditCourtAnnouncement::getCaseNumber,
-                                chunkItems,
+                            "",
-                                CreditCourtAnnouncement::getId,
-                                CreditCourtAnnouncement::setId,
-                                CreditCourtAnnouncement::getCaseNumber,
-                                CreditCourtAnnouncement::getCaseNumber,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditCourtAnnouncementService.save(rowItem);
-                                if (!saved) {
-                                    CreditCourtAnnouncement existing = creditCourtAnnouncementService.lambdaQuery()
-                                        .eq(CreditCourtAnnouncement::getCaseNumber, rowItem.getCaseNumber())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditCourtAnnouncementService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -306,38 +285,13 @@ public class CreditCourtAnnouncementController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditCourtAnnouncementService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditCourtAnnouncementService,
+                    CreditCourtAnnouncement::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditCourtAnnouncement::getId,
-                        CreditCourtAnnouncement::setId,
-                        CreditCourtAnnouncement::getCaseNumber,
-                        CreditCourtAnnouncement::getCaseNumber,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditCourtAnnouncementService.save(rowItem);
-                        if (!saved) {
-                            CreditCourtAnnouncement existing = creditCourtAnnouncementService.lambdaQuery()
-                                .eq(CreditCourtAnnouncement::getCaseNumber, rowItem.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditCourtAnnouncementService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -355,6 +309,137 @@ public class CreditCourtAnnouncementController extends BaseController {
         }
     }
 
+    /**
+     * 批量导入历史法院公告（仅解析“历史法院公告”选项卡；兼容“历史法庭公告”）
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
+     */
+    @PreAuthorize("hasAuthority('credit:creditCourtAnnouncement:save')")
+    @Operation(summary = "批量导入历史法院公告司法大数据")
+    @PostMapping("/import/history")
+    public ApiResult<List<String>> importHistoryBatch(@RequestParam("file") MultipartFile file,
+                                                      @RequestParam(value = "companyId", required = false) Integer companyId) {
+        List<String> errorMessages = new ArrayList<>();
+        int successCount = 0;
+        Set<Integer> touchedCompanyIds = new HashSet<>();
+
+        try {
+            int sheetIndex = ExcelImportSupport.findSheetIndex(file, "历史法院公告");
+            if (sheetIndex < 0) {
+                // 兼容旧命名
+                sheetIndex = ExcelImportSupport.findSheetIndex(file, "历史法庭公告");
+            }
+            if (sheetIndex < 0) {
+                return fail("未读取到数据，请确认文件中存在“历史法院公告”选项卡且表头与示例格式一致", null);
+            }
+
+            ExcelImportSupport.ImportResult<CreditCourtAnnouncementImportParam> importResult = ExcelImportSupport.read(
+                file, CreditCourtAnnouncementImportParam.class, this::isEmptyImportRow, sheetIndex);
+            List<CreditCourtAnnouncementImportParam> list = importResult.getData();
+            int usedTitleRows = importResult.getTitleRows();
+            int usedHeadRows = importResult.getHeadRows();
+            int usedSheetIndex = importResult.getSheetIndex();
+
+            if (CollectionUtils.isEmpty(list)) {
+                return fail("未读取到数据，请确认模板表头与示例格式一致", null);
+            }
+
+            User loginUser = getLoginUser();
+            Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
+            Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
+            Map<String, String> urlByCaseNumber = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "案号");
+
+            final int chunkSize = 500;
+            final int mpBatchSize = 500;
+            List<CreditCourtAnnouncement> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
+
+            for (int i = 0; i < list.size(); i++) {
+                CreditCourtAnnouncementImportParam param = list.get(i);
+                int excelRowNumber = i + 1 + usedTitleRows + usedHeadRows;
+                try {
+                    CreditCourtAnnouncement item = convertImportParamToEntity(param);
+                    if (item.getCaseNumber() != null) {
+                        item.setCaseNumber(item.getCaseNumber().trim());
+                    }
+                    if (ImportHelper.isBlank(item.getCaseNumber())) {
+                        errorMessages.add("第" + excelRowNumber + "行：案号不能为空");
+                        continue;
+                    }
+
+                    String link = urlByCaseNumber.get(item.getCaseNumber());
+                    if (!ImportHelper.isBlank(link)) {
+                        item.setUrl(link.trim());
+                    }
+
+                    if (item.getCompanyId() == null && companyId != null) {
+                        item.setCompanyId(companyId);
+                    }
+                    if (item.getUserId() == null && currentUserId != null) {
+                        item.setUserId(currentUserId);
+                    }
+                    if (item.getTenantId() == null && currentTenantId != null) {
+                        item.setTenantId(currentTenantId);
+                    }
+                    if (item.getStatus() == null) {
+                        item.setStatus(0);
+                    }
+                    if (item.getDeleted() == null) {
+                        item.setDeleted(0);
+                    }
+                    // 历史导入的数据统一标记为“失效”
+                    item.setDataStatus("失效");
+                    if (item.getRecommend() == null) {
+                        item.setRecommend(0);
+                    }
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditCourtAnnouncementService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditCourtAnnouncement::getCaseNumber,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
+                } catch (Exception e) {
+                    errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+
+            if (!chunkItems.isEmpty()) {
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditCourtAnnouncementService,
+                    chunkItems,
+                    chunkRowNumbers,
+                    mpBatchSize,
+                    CreditCourtAnnouncement::getCaseNumber,
+                    "",
+                    errorMessages
+                );
+            }
+
+            creditCompanyRecordCountService.refresh(CreditCompanyRecordCountService.CountType.COURT_ANNOUNCEMENT, touchedCompanyIds);
+
+            if (errorMessages.isEmpty()) {
+                return success("成功导入" + successCount + "条数据", null);
+            }
+            return success("导入完成，成功" + successCount + "条，失败" + errorMessages.size() + "条", errorMessages);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return fail("导入失败：" + e.getMessage(), null);
+        }
+    }
+
     /**
      * 下载法院公告司法大数据导入模板
      */

src/main/java/com/gxwebsoft/credit/controller/CreditCourtSessionController.java

@@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -105,7 +104,7 @@ public class CreditCourtSessionController extends BaseController {
     @Operation(summary = "删除开庭公告司法大数据")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditCourtSessionService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditCourtSession.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -138,7 +137,7 @@ public class CreditCourtSessionController extends BaseController {
     @Operation(summary = "批量删除开庭公告司法大数据")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditCourtSessionService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditCourtSession.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -160,7 +159,9 @@ public class CreditCourtSessionController extends BaseController {
         User loginUser = getLoginUser();
         Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
 
-        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
+        // Party columns may contain multiple roles/names; match if any company name is contained in the text.
+        // Priority: 原告/上诉人 > 被告/被上诉人 > 其他当事人/第三人
+        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
             creditCourtSessionService,
             creditCompanyService,
             currentTenantId,
@@ -168,13 +169,15 @@ public class CreditCourtSessionController extends BaseController {
             limit,
             CreditCourtSession::getId,
             CreditCourtSession::setId,
-            CreditCourtSession::getAppellee,
             CreditCourtSession::getCompanyId,
             CreditCourtSession::setCompanyId,
             CreditCourtSession::getHasData,
             CreditCourtSession::setHasData,
             CreditCourtSession::getTenantId,
-            CreditCourtSession::new
+            CreditCourtSession::new,
+            CreditCourtSession::getPlaintiffAppellant,
+            CreditCourtSession::getAppellee,
+            CreditCourtSession::getOtherPartiesThirdParty
         );
 
         if (!stats.anyDataRead) {
@@ -265,38 +268,13 @@ public class CreditCourtSessionController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditCourtSessionService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditCourtSessionService,
+                            CreditCourtSession::getCaseNumber,
-                                chunkItems,
+                            "",
-                                CreditCourtSession::getId,
-                                CreditCourtSession::setId,
-                                CreditCourtSession::getCaseNumber,
-                                CreditCourtSession::getCaseNumber,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditCourtSessionService.save(rowItem);
-                                if (!saved) {
-                                    CreditCourtSession existing = creditCourtSessionService.lambdaQuery()
-                                        .eq(CreditCourtSession::getCaseNumber, rowItem.getCaseNumber())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditCourtSessionService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -310,38 +288,13 @@ public class CreditCourtSessionController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditCourtSessionService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditCourtSessionService,
+                    CreditCourtSession::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditCourtSession::getId,
-                        CreditCourtSession::setId,
-                        CreditCourtSession::getCaseNumber,
-                        CreditCourtSession::getCaseNumber,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditCourtSessionService.save(rowItem);
-                        if (!saved) {
-                            CreditCourtSession existing = creditCourtSessionService.lambdaQuery()
-                                .eq(CreditCourtSession::getCaseNumber, rowItem.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditCourtSessionService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -361,7 +314,7 @@ public class CreditCourtSessionController extends BaseController {
 
     /**
      * 批量导入历史开庭公告（仅解析“历史开庭公告”选项卡）
-     * 规则：案号相同则覆盖更新（recommend++ 记录更新次数）；案号不存在则插入。
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
      */
     @PreAuthorize("hasAuthority('credit:creditCourtSession:save')")
     @Operation(summary = "批量导入历史开庭公告司法大数据")
@@ -394,8 +347,10 @@ public class CreditCourtSessionController extends BaseController {
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByCaseNumber = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "案号");
 
-            LinkedHashMap<String, CreditCourtSession> latestByCaseNumber = new LinkedHashMap<>();
+            final int chunkSize = 500;
-            LinkedHashMap<String, Integer> latestRowByCaseNumber = new LinkedHashMap<>();
+            final int mpBatchSize = 500;
+            List<CreditCourtSession> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
 
             for (int i = 0; i < list.size(); i++) {
                 CreditCourtSessionImportParam param = list.get(i);
@@ -433,121 +388,42 @@ public class CreditCourtSessionController extends BaseController {
                     // 历史导入的数据统一标记为“失效”
                     item.setDataStatus("失效");
 
-                    latestByCaseNumber.put(item.getCaseNumber(), item);
+                    if (item.getRecommend() == null) {
-                    latestRowByCaseNumber.put(item.getCaseNumber(), excelRowNumber);
+                        item.setRecommend(0);
+                    }
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditCourtSessionService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditCourtSession::getCaseNumber,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
                 } catch (Exception e) {
                     errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
                     e.printStackTrace();
                 }
             }
 
-            if (latestByCaseNumber.isEmpty()) {
-                if (errorMessages.isEmpty()) {
-                    return fail("未读取到数据，请确认模板表头与示例格式一致", null);
-                }
-                return success("导入完成，成功0条，失败" + errorMessages.size() + "条", errorMessages);
-            }
-
-            final int chunkSize = 500;
-            final int mpBatchSize = 500;
-            List<CreditCourtSession> chunkItems = new ArrayList<>(chunkSize);
-            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
-
-            for (Map.Entry<String, CreditCourtSession> entry : latestByCaseNumber.entrySet()) {
-                String caseNumber = entry.getKey();
-                CreditCourtSession item = entry.getValue();
-                Integer rowNo = latestRowByCaseNumber.get(caseNumber);
-                chunkItems.add(item);
-                chunkRowNumbers.add(rowNo != null ? rowNo : -1);
-                if (chunkItems.size() >= chunkSize) {
-                    successCount += batchImportSupport.persistChunkWithFallback(
-                        chunkItems,
-                        chunkRowNumbers,
-                        () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
-                            creditCourtSessionService,
-                            chunkItems,
-                            CreditCourtSession::getId,
-                            CreditCourtSession::setId,
-                            CreditCourtSession::getCaseNumber,
-                            CreditCourtSession::getCaseNumber,
-                            CreditCourtSession::getRecommend,
-                            CreditCourtSession::setRecommend,
-                            null,
-                            mpBatchSize
-                        ),
-                        (rowItem, rowNumber) -> {
-                            if (rowItem.getRecommend() == null) {
-                                rowItem.setRecommend(0);
-                            }
-                            boolean saved = creditCourtSessionService.save(rowItem);
-                            if (!saved) {
-                                CreditCourtSession existing = creditCourtSessionService.lambdaQuery()
-                                    .eq(CreditCourtSession::getCaseNumber, rowItem.getCaseNumber())
-                                    .select(CreditCourtSession::getId, CreditCourtSession::getRecommend)
-                                    .one();
-                                if (existing != null) {
-                                    rowItem.setId(existing.getId());
-                                    Integer old = existing.getRecommend();
-                                    rowItem.setRecommend(old == null ? 1 : old + 1);
-                                    if (creditCourtSessionService.updateById(rowItem)) {
-                                        return true;
-                                    }
-                                }
-                            } else {
-                                return true;
-                            }
-                            String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                            errorMessages.add(prefix + "保存失败");
-                            return false;
-                        },
-                        errorMessages
-                    );
-                    chunkItems.clear();
-                    chunkRowNumbers.clear();
-                }
-            }
-
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditCourtSessionService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
+                    mpBatchSize,
-                        creditCourtSessionService,
+                    CreditCourtSession::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditCourtSession::getId,
-                        CreditCourtSession::setId,
-                        CreditCourtSession::getCaseNumber,
-                        CreditCourtSession::getCaseNumber,
-                        CreditCourtSession::getRecommend,
-                        CreditCourtSession::setRecommend,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        if (rowItem.getRecommend() == null) {
-                            rowItem.setRecommend(0);
-                        }
-                        boolean saved = creditCourtSessionService.save(rowItem);
-                        if (!saved) {
-                            CreditCourtSession existing = creditCourtSessionService.lambdaQuery()
-                                .eq(CreditCourtSession::getCaseNumber, rowItem.getCaseNumber())
-                                .select(CreditCourtSession::getId, CreditCourtSession::getRecommend)
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                Integer old = existing.getRecommend();
-                                rowItem.setRecommend(old == null ? 1 : old + 1);
-                                if (creditCourtSessionService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditCustomerController.java

@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditCustomer;
 import com.gxwebsoft.credit.param.CreditCustomerImportParam;
 import com.gxwebsoft.credit.param.CreditCustomerParam;
@@ -24,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -100,7 +102,7 @@ public class CreditCustomerController extends BaseController {
     @Operation(summary = "删除客户")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditCustomerService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditCustomer.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -133,7 +135,7 @@ public class CreditCustomerController extends BaseController {
     @Operation(summary = "批量删除客户")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditCustomerService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditCustomer.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -166,6 +168,7 @@ public class CreditCustomerController extends BaseController {
             CreditCustomer::getName,
             CreditCustomer::getCompanyId,
             CreditCustomer::setCompanyId,
+            CreditCustomer::setCompanyName,
             CreditCustomer::getHasData,
             CreditCustomer::setHasData,
             CreditCustomer::getTenantId,
@@ -207,6 +210,11 @@ public class CreditCustomerController extends BaseController {
             Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByName = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "客户");
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             final int chunkSize = 500;
             final int mpBatchSize = 500;
@@ -219,7 +227,8 @@ public class CreditCustomerController extends BaseController {
                 try {
                     CreditCustomer item = convertImportParamToEntity(param);
                     if (!ImportHelper.isBlank(item.getName())) {
-                        String link = urlByName.get(item.getName().trim());
+                        item.setName(item.getName().trim());
+                        String link = urlByName.get(item.getName());
                         if (!ImportHelper.isBlank(link)) {
                             item.setUrl(link.trim());
                         }
@@ -227,6 +236,9 @@ public class CreditCustomerController extends BaseController {
 
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getUserId() == null && currentUserId != null) {
                         item.setUserId(currentUserId);
@@ -256,116 +268,7 @@ public class CreditCustomerController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += persistImportChunk(chunkItems, chunkRowNumbers, mpBatchSize, errorMessages);
-                            chunkItems,
-                            chunkRowNumbers,
-                            () -> {
-                                // 批内一次查库，避免逐行查/写导致数据库压力过大
-                                List<String> names = new ArrayList<>(chunkItems.size());
-                                for (CreditCustomer it : chunkItems) {
-                                    if (it != null && !ImportHelper.isBlank(it.getName())) {
-                                        names.add(it.getName().trim());
-                                    }
-                                }
-                                List<CreditCustomer> existingList = names.isEmpty()
-                                    ? new ArrayList<>()
-                                    : creditCustomerService.lambdaQuery()
-                                    .in(CreditCustomer::getName, names)
-                                    .list();
-                                java.util.Map<String, CreditCustomer> existingByName = new java.util.HashMap<>();
-                                for (CreditCustomer existing : existingList) {
-                                    if (existing != null && !ImportHelper.isBlank(existing.getName())) {
-                                        existingByName.putIfAbsent(existing.getName().trim(), existing);
-                                    }
-                                }
-
-                                java.util.Map<String, CreditCustomer> latestByName = new java.util.HashMap<>();
-                                int acceptedRows = 0;
-                                for (int idx = 0; idx < chunkItems.size(); idx++) {
-                                    CreditCustomer it = chunkItems.get(idx);
-                                    int rowNo = (idx < chunkRowNumbers.size()) ? chunkRowNumbers.get(idx) : -1;
-                                    if (it == null || ImportHelper.isBlank(it.getName())) {
-                                        continue;
-                                    }
-                                    String name = it.getName().trim();
-                                    CreditCustomer existing = existingByName.get(name);
-                                    if (existing != null) {
-                                        Integer existingTenantId = existing.getTenantId();
-                                        if (it.getTenantId() != null
-                                            && existingTenantId != null
-                                            && !it.getTenantId().equals(existingTenantId)) {
-                                            errorMessages.add("第" + rowNo + "行：客户名称已存在且归属其他租户，无法导入");
-                                            continue;
-                                        }
-                                        it.setId(existing.getId());
-                                        if (existingTenantId != null) {
-                                            it.setTenantId(existingTenantId);
-                                        }
-                                    }
-                                    // 同名多行：保留最后一行的值（等价于“先插入/更新，再被后续行更新”）
-                                    latestByName.put(name, it);
-                                    acceptedRows++;
-                                }
-
-                                List<CreditCustomer> updates = new ArrayList<>();
-                                List<CreditCustomer> inserts = new ArrayList<>();
-                                for (CreditCustomer it : latestByName.values()) {
-                                    if (it.getId() != null) {
-                                        updates.add(it);
-                                    } else {
-                                        inserts.add(it);
-                                    }
-                                }
-                                if (!updates.isEmpty()) {
-                                    creditCustomerService.updateBatchById(updates, mpBatchSize);
-                                }
-                                if (!inserts.isEmpty()) {
-                                    creditCustomerService.saveBatch(inserts, mpBatchSize);
-                                }
-                                return acceptedRows;
-                            },
-                            (rowItem, rowNumber) -> {
-                                CreditCustomer existing = creditCustomerService.lambdaQuery()
-                                    .eq(CreditCustomer::getName, rowItem.getName())
-                                    .one();
-                                if (existing != null) {
-                                    Integer existingTenantId = existing.getTenantId();
-                                    if (rowItem.getTenantId() != null
-                                        && existingTenantId != null
-                                        && !rowItem.getTenantId().equals(existingTenantId)) {
-                                        errorMessages.add("第" + rowNumber + "行：客户名称已存在且归属其他租户，无法导入");
-                                        return false;
-                                    }
-                                    rowItem.setId(existing.getId());
-                                    if (existingTenantId != null) {
-                                        rowItem.setTenantId(existingTenantId);
-                                    }
-                                    return creditCustomerService.updateById(rowItem);
-                                }
-
-                                try {
-                                    return creditCustomerService.save(rowItem);
-                                } catch (DataIntegrityViolationException e) {
-                                    if (!isDuplicateCustomerName(e)) {
-                                        throw e;
-                                    }
-                                    CreditCustomer dbExisting = creditCustomerService.lambdaQuery()
-                                        .eq(CreditCustomer::getName, rowItem.getName())
-                                        .one();
-                                    if (dbExisting != null) {
-                                        Integer existingTenantId = dbExisting.getTenantId();
-                                        rowItem.setId(dbExisting.getId());
-                                        if (existingTenantId != null) {
-                                            rowItem.setTenantId(existingTenantId);
-                                        }
-                                        return creditCustomerService.updateById(rowItem);
-                                    }
-                                }
-                                errorMessages.add("第" + rowNumber + "行：保存失败");
-                                return false;
-                            },
-                            errorMessages
-                        );
                         chunkItems.clear();
                         chunkRowNumbers.clear();
                     }
@@ -376,114 +279,7 @@ public class CreditCustomerController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += persistImportChunk(chunkItems, chunkRowNumbers, mpBatchSize, errorMessages);
-                    chunkItems,
-                    chunkRowNumbers,
-                    () -> {
-                        List<String> names = new ArrayList<>(chunkItems.size());
-                        for (CreditCustomer it : chunkItems) {
-                            if (it != null && !ImportHelper.isBlank(it.getName())) {
-                                names.add(it.getName().trim());
-                            }
-                        }
-                        List<CreditCustomer> existingList = names.isEmpty()
-                            ? new ArrayList<>()
-                            : creditCustomerService.lambdaQuery()
-                            .in(CreditCustomer::getName, names)
-                            .list();
-                        java.util.Map<String, CreditCustomer> existingByName = new java.util.HashMap<>();
-                        for (CreditCustomer existing : existingList) {
-                            if (existing != null && !ImportHelper.isBlank(existing.getName())) {
-                                existingByName.putIfAbsent(existing.getName().trim(), existing);
-                            }
-                        }
-
-                        java.util.Map<String, CreditCustomer> latestByName = new java.util.HashMap<>();
-                        int acceptedRows = 0;
-                        for (int idx = 0; idx < chunkItems.size(); idx++) {
-                            CreditCustomer it = chunkItems.get(idx);
-                            int rowNo = (idx < chunkRowNumbers.size()) ? chunkRowNumbers.get(idx) : -1;
-                            if (it == null || ImportHelper.isBlank(it.getName())) {
-                                continue;
-                            }
-                            String name = it.getName().trim();
-                            CreditCustomer existing = existingByName.get(name);
-                            if (existing != null) {
-                                Integer existingTenantId = existing.getTenantId();
-                                if (it.getTenantId() != null
-                                    && existingTenantId != null
-                                    && !it.getTenantId().equals(existingTenantId)) {
-                                    errorMessages.add("第" + rowNo + "行：客户名称已存在且归属其他租户，无法导入");
-                                    continue;
-                                }
-                                it.setId(existing.getId());
-                                if (existingTenantId != null) {
-                                    it.setTenantId(existingTenantId);
-                                }
-                            }
-                            latestByName.put(name, it);
-                            acceptedRows++;
-                        }
-
-                        List<CreditCustomer> updates = new ArrayList<>();
-                        List<CreditCustomer> inserts = new ArrayList<>();
-                        for (CreditCustomer it : latestByName.values()) {
-                            if (it.getId() != null) {
-                                updates.add(it);
-                            } else {
-                                inserts.add(it);
-                            }
-                        }
-                        if (!updates.isEmpty()) {
-                            creditCustomerService.updateBatchById(updates, mpBatchSize);
-                        }
-                        if (!inserts.isEmpty()) {
-                            creditCustomerService.saveBatch(inserts, mpBatchSize);
-                        }
-                        return acceptedRows;
-                    },
-                    (rowItem, rowNumber) -> {
-                        CreditCustomer existing = creditCustomerService.lambdaQuery()
-                            .eq(CreditCustomer::getName, rowItem.getName())
-                            .one();
-                        if (existing != null) {
-                            Integer existingTenantId = existing.getTenantId();
-                            if (rowItem.getTenantId() != null
-                                && existingTenantId != null
-                                && !rowItem.getTenantId().equals(existingTenantId)) {
-                                errorMessages.add("第" + rowNumber + "行：客户名称已存在且归属其他租户，无法导入");
-                                return false;
-                            }
-                            rowItem.setId(existing.getId());
-                            if (existingTenantId != null) {
-                                rowItem.setTenantId(existingTenantId);
-                            }
-                            return creditCustomerService.updateById(rowItem);
-                        }
-
-                        try {
-                            return creditCustomerService.save(rowItem);
-                        } catch (DataIntegrityViolationException e) {
-                            if (!isDuplicateCustomerName(e)) {
-                                throw e;
-                            }
-                            CreditCustomer dbExisting = creditCustomerService.lambdaQuery()
-                                .eq(CreditCustomer::getName, rowItem.getName())
-                                .one();
-                            if (dbExisting != null) {
-                                Integer existingTenantId = dbExisting.getTenantId();
-                                rowItem.setId(dbExisting.getId());
-                                if (existingTenantId != null) {
-                                    rowItem.setTenantId(existingTenantId);
-                                }
-                                return creditCustomerService.updateById(rowItem);
-                            }
-                        }
-                        errorMessages.add("第" + rowNumber + "行：保存失败");
-                        return false;
-                    },
-                    errorMessages
-                );
             }
 
             creditCompanyRecordCountService.refresh(CreditCompanyRecordCountService.CountType.CUSTOMER, touchedCompanyIds);
@@ -554,19 +350,71 @@ public class CreditCustomerController extends BaseController {
         return value.trim();
     }
 
-    private boolean isDuplicateCustomerName(DataIntegrityViolationException e) {
+    private int persistImportChunk(List<CreditCustomer> items,
+                                   List<Integer> excelRowNumbers,
+                                   int mpBatchSize,
+                                   List<String> errorMessages) {
+        return batchImportSupport.persistChunkWithFallback(
+            items,
+            excelRowNumbers,
+            () -> {
+                boolean ok = creditCustomerService.saveBatch(items, mpBatchSize);
+                if (!ok) {
+                    throw new RuntimeException("批量保存失败");
+                }
+                return items.size();
+            },
+            (rowItem, rowNumber) -> {
+                try {
+                    boolean saved = creditCustomerService.save(rowItem);
+                    if (saved) {
+                        return true;
+                    }
+                    if (rowNumber != null && rowNumber > 0) {
+                        errorMessages.add("第" + rowNumber + "行：保存失败");
+                    } else {
+                        errorMessages.add("保存失败");
+                    }
+                    return false;
+                } catch (DataIntegrityViolationException e) {
+                    if (isDuplicateKey(e)) {
+                        String name = rowItem != null ? rowItem.getName() : null;
+                        String label = ImportHelper.isBlank(name) ? "数据" : ("客户【" + name.trim() + "】");
+                        if (rowNumber != null && rowNumber > 0) {
+                            errorMessages.add("第" + rowNumber + "行：" + label + "重复（唯一索引冲突）");
+                        } else {
+                            errorMessages.add(label + "重复（唯一索引冲突）");
+                        }
+                        return false;
+                    }
+                    throw e;
+                }
+            },
+            errorMessages
+        );
+    }
+
+    private static boolean isDuplicateKey(DataIntegrityViolationException e) {
+        // Prefer structured detection (SQLState / vendor error code), fall back to message contains.
+        for (Throwable t = e; t != null; t = t.getCause()) {
+            if (t instanceof SQLException) {
+                SQLException se = (SQLException) t;
+                // MySQL: 1062 Duplicate entry; PostgreSQL/H2: SQLState 23505 unique_violation
+                if (se.getErrorCode() == 1062) {
+                    return true;
+                }
+                if ("23505".equals(se.getSQLState())) {
+                    return true;
+                }
+            }
+        }
         Throwable mostSpecificCause = e.getMostSpecificCause();
         String message = mostSpecificCause != null ? mostSpecificCause.getMessage() : e.getMessage();
         if (message == null) {
             return false;
         }
         String lower = message.toLowerCase();
-        if (!lower.contains("duplicate")) {
+        return lower.contains("duplicate") && lower.contains("key");
-            return false;
-        }
-        return lower.contains("credit_customer.name")
-            || lower.contains("for key 'name'")
-            || lower.contains("for key `name`");
     }
 
 }

src/main/java/com/gxwebsoft/credit/controller/CreditDeliveryNoticeController.java

@@ -104,7 +104,7 @@ public class CreditDeliveryNoticeController extends BaseController {
     @Operation(summary = "删除送达公告司法大数据")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditDeliveryNoticeService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditDeliveryNotice.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +137,7 @@ public class CreditDeliveryNoticeController extends BaseController {
     @Operation(summary = "批量删除送达公告司法大数据")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditDeliveryNoticeService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditDeliveryNotice.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -159,7 +159,9 @@ public class CreditDeliveryNoticeController extends BaseController {
         User loginUser = getLoginUser();
         Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
 
-        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
+        // Party columns may contain multiple roles/names; match if any company name is contained in the text.
+        // Priority: 原告/上诉人 > 被告/被上诉人 > 其他当事人/第三人
+        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
             creditDeliveryNoticeService,
             creditCompanyService,
             currentTenantId,
@@ -167,13 +169,15 @@ public class CreditDeliveryNoticeController extends BaseController {
             limit,
             CreditDeliveryNotice::getId,
             CreditDeliveryNotice::setId,
-            CreditDeliveryNotice::getOtherPartiesThirdParty,
             CreditDeliveryNotice::getCompanyId,
             CreditDeliveryNotice::setCompanyId,
             CreditDeliveryNotice::getHasData,
             CreditDeliveryNotice::setHasData,
             CreditDeliveryNotice::getTenantId,
-            CreditDeliveryNotice::new
+            CreditDeliveryNotice::new,
+            CreditDeliveryNotice::getPlaintiffAppellant,
+            CreditDeliveryNotice::getAppellee,
+            CreditDeliveryNotice::getOtherPartiesThirdParty
         );
 
         if (!stats.anyDataRead) {
@@ -262,38 +266,13 @@ public class CreditDeliveryNoticeController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditDeliveryNoticeService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditDeliveryNoticeService,
+                            CreditDeliveryNotice::getCaseNumber,
-                                chunkItems,
+                            "",
-                                CreditDeliveryNotice::getId,
-                                CreditDeliveryNotice::setId,
-                                CreditDeliveryNotice::getCaseNumber,
-                                CreditDeliveryNotice::getCaseNumber,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditDeliveryNoticeService.save(rowItem);
-                                if (!saved) {
-                                    CreditDeliveryNotice existing = creditDeliveryNoticeService.lambdaQuery()
-                                        .eq(CreditDeliveryNotice::getCaseNumber, rowItem.getCaseNumber())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditDeliveryNoticeService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -307,38 +286,13 @@ public class CreditDeliveryNoticeController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditDeliveryNoticeService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditDeliveryNoticeService,
+                    CreditDeliveryNotice::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditDeliveryNotice::getId,
-                        CreditDeliveryNotice::setId,
-                        CreditDeliveryNotice::getCaseNumber,
-                        CreditDeliveryNotice::getCaseNumber,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditDeliveryNoticeService.save(rowItem);
-                        if (!saved) {
-                            CreditDeliveryNotice existing = creditDeliveryNoticeService.lambdaQuery()
-                                .eq(CreditDeliveryNotice::getCaseNumber, rowItem.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditDeliveryNoticeService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -356,6 +310,134 @@ public class CreditDeliveryNoticeController extends BaseController {
         }
     }
 
+    /**
+     * 批量导入历史送达公告（仅解析“历史送达公告”选项卡）
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
+     */
+    @PreAuthorize("hasAuthority('credit:creditDeliveryNotice:save')")
+    @Operation(summary = "批量导入历史送达公告司法大数据")
+    @PostMapping("/import/history")
+    public ApiResult<List<String>> importHistoryBatch(@RequestParam("file") MultipartFile file,
+                                                      @RequestParam(value = "companyId", required = false) Integer companyId) {
+        List<String> errorMessages = new ArrayList<>();
+        int successCount = 0;
+        Set<Integer> touchedCompanyIds = new HashSet<>();
+
+        try {
+            int sheetIndex = ExcelImportSupport.findSheetIndex(file, "历史送达公告");
+            if (sheetIndex < 0) {
+                return fail("未读取到数据，请确认文件中存在“历史送达公告”选项卡且表头与示例格式一致", null);
+            }
+
+            ExcelImportSupport.ImportResult<CreditDeliveryNoticeImportParam> importResult = ExcelImportSupport.read(
+                file, CreditDeliveryNoticeImportParam.class, this::isEmptyImportRow, sheetIndex);
+            List<CreditDeliveryNoticeImportParam> list = importResult.getData();
+            int usedTitleRows = importResult.getTitleRows();
+            int usedHeadRows = importResult.getHeadRows();
+            int usedSheetIndex = importResult.getSheetIndex();
+
+            if (CollectionUtils.isEmpty(list)) {
+                return fail("未读取到数据，请确认模板表头与示例格式一致", null);
+            }
+
+            User loginUser = getLoginUser();
+            Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
+            Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
+            Map<String, String> urlByCaseNumber = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "案号");
+
+            final int chunkSize = 500;
+            final int mpBatchSize = 500;
+            List<CreditDeliveryNotice> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
+
+            for (int i = 0; i < list.size(); i++) {
+                CreditDeliveryNoticeImportParam param = list.get(i);
+                int excelRowNumber = i + 1 + usedTitleRows + usedHeadRows;
+                try {
+                    CreditDeliveryNotice item = convertImportParamToEntity(param);
+                    if (item.getCaseNumber() != null) {
+                        item.setCaseNumber(item.getCaseNumber().trim());
+                    }
+                    if (ImportHelper.isBlank(item.getCaseNumber())) {
+                        errorMessages.add("第" + excelRowNumber + "行：案号不能为空");
+                        continue;
+                    }
+
+                    String link = urlByCaseNumber.get(item.getCaseNumber());
+                    if (!ImportHelper.isBlank(link)) {
+                        item.setUrl(link.trim());
+                    }
+
+                    if (item.getCompanyId() == null && companyId != null) {
+                        item.setCompanyId(companyId);
+                    }
+                    if (item.getUserId() == null && currentUserId != null) {
+                        item.setUserId(currentUserId);
+                    }
+                    if (item.getTenantId() == null && currentTenantId != null) {
+                        item.setTenantId(currentTenantId);
+                    }
+                    if (item.getStatus() == null) {
+                        item.setStatus(0);
+                    }
+                    if (item.getDeleted() == null) {
+                        item.setDeleted(0);
+                    }
+                    if (item.getRecommend() == null) {
+                        item.setRecommend(0);
+                    }
+                    // 历史导入的数据统一标记为“失效”
+                    item.setDataStatus("失效");
+
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditDeliveryNoticeService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditDeliveryNotice::getCaseNumber,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
+                } catch (Exception e) {
+                    errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+
+            if (!chunkItems.isEmpty()) {
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditDeliveryNoticeService,
+                    chunkItems,
+                    chunkRowNumbers,
+                    mpBatchSize,
+                    CreditDeliveryNotice::getCaseNumber,
+                    "",
+                    errorMessages
+                );
+            }
+
+            creditCompanyRecordCountService.refresh(CreditCompanyRecordCountService.CountType.DELIVERY_NOTICE, touchedCompanyIds);
+
+            if (errorMessages.isEmpty()) {
+                return success("成功导入" + successCount + "条数据", null);
+            }
+            return success("导入完成，成功" + successCount + "条，失败" + errorMessages.size() + "条", errorMessages);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return fail("导入失败：" + e.getMessage(), null);
+        }
+    }
+
     /**
      * 下载送达公告导入模板
      */

src/main/java/com/gxwebsoft/credit/controller/CreditExternalController.java

@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditExternal;
 import com.gxwebsoft.credit.param.CreditExternalImportParam;
 import com.gxwebsoft.credit.param.CreditExternalParam;
@@ -104,7 +105,7 @@ public class CreditExternalController extends BaseController {
     @Operation(summary = "删除对外投资")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditExternalService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditExternal.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +138,7 @@ public class CreditExternalController extends BaseController {
     @Operation(summary = "批量删除对外投资")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditExternalService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditExternal.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -170,6 +171,7 @@ public class CreditExternalController extends BaseController {
             CreditExternal::getName,
             CreditExternal::getCompanyId,
             CreditExternal::setCompanyId,
+            CreditExternal::setCompanyName,
             CreditExternal::getHasData,
             CreditExternal::setHasData,
             CreditExternal::getTenantId,
@@ -211,6 +213,11 @@ public class CreditExternalController extends BaseController {
             Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByName = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "被投资企业名称");
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             final int chunkSize = 500;
             final int mpBatchSize = 500;
@@ -230,6 +237,9 @@ public class CreditExternalController extends BaseController {
 
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getUserId() == null && currentUserId != null) {
                         item.setUserId(currentUserId);
@@ -260,38 +270,13 @@ public class CreditExternalController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditExternalService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditExternalService,
+                            CreditExternal::getName,
-                                chunkItems,
+                            "",
-                                CreditExternal::getId,
-                                CreditExternal::setId,
-                                CreditExternal::getName,
-                                CreditExternal::getName,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditExternalService.save(rowItem);
-                                if (!saved) {
-                                    CreditExternal existing = creditExternalService.lambdaQuery()
-                                        .eq(CreditExternal::getName, rowItem.getName())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditExternalService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -305,38 +290,13 @@ public class CreditExternalController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditExternalService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditExternalService,
+                    CreditExternal::getName,
-                        chunkItems,
+                    "",
-                        CreditExternal::getId,
-                        CreditExternal::setId,
-                        CreditExternal::getName,
-                        CreditExternal::getName,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditExternalService.save(rowItem);
-                        if (!saved) {
-                            CreditExternal existing = creditExternalService.lambdaQuery()
-                                .eq(CreditExternal::getName, rowItem.getName())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditExternalService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditFinalVersionController.java

@@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -105,7 +104,7 @@ public class CreditFinalVersionController extends BaseController {
     @Operation(summary = "删除终本案件")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditFinalVersionService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditFinalVersion.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -138,7 +137,7 @@ public class CreditFinalVersionController extends BaseController {
     @Operation(summary = "批量删除终本案件")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditFinalVersionService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditFinalVersion.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -160,7 +159,9 @@ public class CreditFinalVersionController extends BaseController {
         User loginUser = getLoginUser();
         Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
 
-        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
+        // Party columns may contain multiple roles/names; match if any company name is contained in the text.
+        // Priority: 原告/上诉人 > 被告/被上诉人 > 其他当事人/第三人
+        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
             creditFinalVersionService,
             creditCompanyService,
             currentTenantId,
@@ -168,13 +169,15 @@ public class CreditFinalVersionController extends BaseController {
             limit,
             CreditFinalVersion::getId,
             CreditFinalVersion::setId,
-            CreditFinalVersion::getAppellee,
             CreditFinalVersion::getCompanyId,
             CreditFinalVersion::setCompanyId,
             CreditFinalVersion::getHasData,
             CreditFinalVersion::setHasData,
             CreditFinalVersion::getTenantId,
-            CreditFinalVersion::new
+            CreditFinalVersion::new,
+            CreditFinalVersion::getPlaintiffAppellant,
+            CreditFinalVersion::getAppellee,
+            CreditFinalVersion::getOtherPartiesThirdParty
         );
 
         if (!stats.anyDataRead) {
@@ -265,38 +268,13 @@ public class CreditFinalVersionController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditFinalVersionService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditFinalVersionService,
+                            CreditFinalVersion::getCaseNumber,
-                                chunkItems,
+                            "",
-                                CreditFinalVersion::getId,
-                                CreditFinalVersion::setId,
-                                CreditFinalVersion::getCaseNumber,
-                                CreditFinalVersion::getCaseNumber,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditFinalVersionService.save(rowItem);
-                                if (!saved) {
-                                    CreditFinalVersion existing = creditFinalVersionService.lambdaQuery()
-                                        .eq(CreditFinalVersion::getCaseNumber, rowItem.getCaseNumber())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditFinalVersionService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -310,38 +288,13 @@ public class CreditFinalVersionController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditFinalVersionService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditFinalVersionService,
+                    CreditFinalVersion::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditFinalVersion::getId,
-                        CreditFinalVersion::setId,
-                        CreditFinalVersion::getCaseNumber,
-                        CreditFinalVersion::getCaseNumber,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditFinalVersionService.save(rowItem);
-                        if (!saved) {
-                            CreditFinalVersion existing = creditFinalVersionService.lambdaQuery()
-                                .eq(CreditFinalVersion::getCaseNumber, rowItem.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditFinalVersionService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -361,7 +314,7 @@ public class CreditFinalVersionController extends BaseController {
 
     /**
      * 批量导入历史终本案件（仅解析“历史终本案件”选项卡）
-     * 规则：案号相同则覆盖更新（recommend++ 记录更新次数）；案号不存在则插入。
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
      */
     @PreAuthorize("hasAuthority('credit:creditFinalVersion:save')")
     @Operation(summary = "批量导入历史终本案件")
@@ -394,8 +347,10 @@ public class CreditFinalVersionController extends BaseController {
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByCaseNumber = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "案号");
 
-            LinkedHashMap<String, CreditFinalVersion> latestByCaseNumber = new LinkedHashMap<>();
+            final int chunkSize = 500;
-            LinkedHashMap<String, Integer> latestRowByCaseNumber = new LinkedHashMap<>();
+            final int mpBatchSize = 500;
+            List<CreditFinalVersion> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
 
             for (int i = 0; i < list.size(); i++) {
                 CreditFinalVersionImportParam param = list.get(i);
@@ -433,121 +388,42 @@ public class CreditFinalVersionController extends BaseController {
                     // 历史导入的数据统一标记为“失效”
                     item.setDataStatus("失效");
 
-                    latestByCaseNumber.put(item.getCaseNumber(), item);
+                    if (item.getRecommend() == null) {
-                    latestRowByCaseNumber.put(item.getCaseNumber(), excelRowNumber);
+                        item.setRecommend(0);
+                    }
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditFinalVersionService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditFinalVersion::getCaseNumber,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
                 } catch (Exception e) {
                     errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
                     e.printStackTrace();
                 }
             }
 
-            if (latestByCaseNumber.isEmpty()) {
-                if (errorMessages.isEmpty()) {
-                    return fail("未读取到数据，请确认模板表头与示例格式一致", null);
-                }
-                return success("导入完成，成功0条，失败" + errorMessages.size() + "条", errorMessages);
-            }
-
-            final int chunkSize = 500;
-            final int mpBatchSize = 500;
-            List<CreditFinalVersion> chunkItems = new ArrayList<>(chunkSize);
-            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
-
-            for (Map.Entry<String, CreditFinalVersion> entry : latestByCaseNumber.entrySet()) {
-                String caseNumber = entry.getKey();
-                CreditFinalVersion item = entry.getValue();
-                Integer rowNo = latestRowByCaseNumber.get(caseNumber);
-                chunkItems.add(item);
-                chunkRowNumbers.add(rowNo != null ? rowNo : -1);
-                if (chunkItems.size() >= chunkSize) {
-                    successCount += batchImportSupport.persistChunkWithFallback(
-                        chunkItems,
-                        chunkRowNumbers,
-                        () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
-                            creditFinalVersionService,
-                            chunkItems,
-                            CreditFinalVersion::getId,
-                            CreditFinalVersion::setId,
-                            CreditFinalVersion::getCaseNumber,
-                            CreditFinalVersion::getCaseNumber,
-                            CreditFinalVersion::getRecommend,
-                            CreditFinalVersion::setRecommend,
-                            null,
-                            mpBatchSize
-                        ),
-                        (rowItem, rowNumber) -> {
-                            if (rowItem.getRecommend() == null) {
-                                rowItem.setRecommend(0);
-                            }
-                            boolean saved = creditFinalVersionService.save(rowItem);
-                            if (!saved) {
-                                CreditFinalVersion existing = creditFinalVersionService.lambdaQuery()
-                                    .eq(CreditFinalVersion::getCaseNumber, rowItem.getCaseNumber())
-                                    .select(CreditFinalVersion::getId, CreditFinalVersion::getRecommend)
-                                    .one();
-                                if (existing != null) {
-                                    rowItem.setId(existing.getId());
-                                    Integer old = existing.getRecommend();
-                                    rowItem.setRecommend(old == null ? 1 : old + 1);
-                                    if (creditFinalVersionService.updateById(rowItem)) {
-                                        return true;
-                                    }
-                                }
-                            } else {
-                                return true;
-                            }
-                            String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                            errorMessages.add(prefix + "保存失败");
-                            return false;
-                        },
-                        errorMessages
-                    );
-                    chunkItems.clear();
-                    chunkRowNumbers.clear();
-                }
-            }
-
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditFinalVersionService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
+                    mpBatchSize,
-                        creditFinalVersionService,
+                    CreditFinalVersion::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditFinalVersion::getId,
-                        CreditFinalVersion::setId,
-                        CreditFinalVersion::getCaseNumber,
-                        CreditFinalVersion::getCaseNumber,
-                        CreditFinalVersion::getRecommend,
-                        CreditFinalVersion::setRecommend,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        if (rowItem.getRecommend() == null) {
-                            rowItem.setRecommend(0);
-                        }
-                        boolean saved = creditFinalVersionService.save(rowItem);
-                        if (!saved) {
-                            CreditFinalVersion existing = creditFinalVersionService.lambdaQuery()
-                                .eq(CreditFinalVersion::getCaseNumber, rowItem.getCaseNumber())
-                                .select(CreditFinalVersion::getId, CreditFinalVersion::getRecommend)
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                Integer old = existing.getRecommend();
-                                rowItem.setRecommend(old == null ? 1 : old + 1);
-                                if (creditFinalVersionService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditGqdjController.java

@@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -105,7 +104,7 @@ public class CreditGqdjController extends BaseController {
     @Operation(summary = "删除股权冻结")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditGqdjService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditGqdj.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -138,7 +137,7 @@ public class CreditGqdjController extends BaseController {
     @Operation(summary = "批量删除股权冻结")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditGqdjService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditGqdj.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -356,38 +355,13 @@ public class CreditGqdjController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditGqdjService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditGqdjService,
+                            CreditGqdj::getCaseNumber,
-                                chunkItems,
+                            "",
-                                CreditGqdj::getId,
-                                CreditGqdj::setId,
-                                CreditGqdj::getCaseNumber,
-                                CreditGqdj::getCaseNumber,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditGqdjService.save(rowItem);
-                                if (!saved) {
-                                    CreditGqdj existing = creditGqdjService.lambdaQuery()
-                                        .eq(CreditGqdj::getCaseNumber, rowItem.getCaseNumber())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditGqdjService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -401,38 +375,13 @@ public class CreditGqdjController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditGqdjService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditGqdjService,
+                    CreditGqdj::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditGqdj::getId,
-                        CreditGqdj::setId,
-                        CreditGqdj::getCaseNumber,
-                        CreditGqdj::getCaseNumber,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditGqdjService.save(rowItem);
-                        if (!saved) {
-                            CreditGqdj existing = creditGqdjService.lambdaQuery()
-                                .eq(CreditGqdj::getCaseNumber, rowItem.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditGqdjService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -452,7 +401,7 @@ public class CreditGqdjController extends BaseController {
 
     /**
      * 批量导入历史股权冻结（仅解析“历史股权冻结”选项卡）
-     * 规则：执行通知文书号/案号相同则覆盖更新（recommend++ 记录更新次数）；不存在则插入。
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
      */
     @PreAuthorize("hasAuthority('credit:creditGqdj:save')")
     @Operation(summary = "批量导入历史股权冻结司法大数据")
@@ -547,8 +496,10 @@ public class CreditGqdjController extends BaseController {
             }
             }
 
-            LinkedHashMap<String, CreditGqdj> latestByCaseNumber = new LinkedHashMap<>();
+            final int chunkSize = 500;
-            LinkedHashMap<String, Integer> latestRowByCaseNumber = new LinkedHashMap<>();
+            final int mpBatchSize = 500;
+            List<CreditGqdj> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
 
             for (int i = 0; i < list.size(); i++) {
                 CreditGqdjImportParam param = list.get(i);
@@ -588,123 +539,44 @@ public class CreditGqdjController extends BaseController {
                         item.setDeleted(0);
                     }
                     // 历史导入的数据统一标记为“失效”
-                    item.setDataStatus("失效");
+                    item.setDataType("失效");
 
-                    latestByCaseNumber.put(item.getCaseNumber(), item);
+                    if (item.getRecommend() == null) {
-                    latestRowByCaseNumber.put(item.getCaseNumber(), excelRowNumber);
+                        item.setRecommend(0);
+                    }
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditGqdjService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditGqdj::getCaseNumber,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
                 } catch (Exception e) {
                     errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
                     e.printStackTrace();
                 }
             }
 
-            if (latestByCaseNumber.isEmpty()) {
-                if (errorMessages.isEmpty()) {
-                    return fail("未读取到数据，请确认模板表头与示例格式一致", null);
-                }
-                return success("导入完成，成功0条，失败" + errorMessages.size() + "条", errorMessages);
-            }
-
-            final int chunkSize = 500;
-            final int mpBatchSize = 500;
-            List<CreditGqdj> chunkItems = new ArrayList<>(chunkSize);
-            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
-
-            for (Map.Entry<String, CreditGqdj> entry : latestByCaseNumber.entrySet()) {
-                String caseNumber = entry.getKey();
-                CreditGqdj item = entry.getValue();
-                Integer rowNo = latestRowByCaseNumber.get(caseNumber);
-                chunkItems.add(item);
-                chunkRowNumbers.add(rowNo != null ? rowNo : -1);
-                if (chunkItems.size() >= chunkSize) {
-                    successCount += batchImportSupport.persistChunkWithFallback(
-                        chunkItems,
-                        chunkRowNumbers,
-                        () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
-                            creditGqdjService,
-                            chunkItems,
-                            CreditGqdj::getId,
-                            CreditGqdj::setId,
-                            CreditGqdj::getCaseNumber,
-                            CreditGqdj::getCaseNumber,
-                            CreditGqdj::getRecommend,
-                            CreditGqdj::setRecommend,
-                            null,
-                            mpBatchSize
-                        ),
-                        (rowItem, rowNumber) -> {
-                            if (rowItem.getRecommend() == null) {
-                                rowItem.setRecommend(0);
-                            }
-                            boolean saved = creditGqdjService.save(rowItem);
-                            if (!saved) {
-                                CreditGqdj existing = creditGqdjService.lambdaQuery()
-                                    .eq(CreditGqdj::getCaseNumber, rowItem.getCaseNumber())
-                                    .select(CreditGqdj::getId, CreditGqdj::getRecommend)
-                                    .one();
-                                if (existing != null) {
-                                    rowItem.setId(existing.getId());
-                                    Integer old = existing.getRecommend();
-                                    rowItem.setRecommend(old == null ? 1 : old + 1);
-                                    if (creditGqdjService.updateById(rowItem)) {
-                                        return true;
-                                    }
-                                }
-                            } else {
-                                return true;
-                            }
-                            String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                            errorMessages.add(prefix + "保存失败");
-                            return false;
-                        },
-                        errorMessages
-                    );
-                    chunkItems.clear();
-                    chunkRowNumbers.clear();
-                }
-            }
-
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditGqdjService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
+                    mpBatchSize,
-                        creditGqdjService,
+                    CreditGqdj::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditGqdj::getId,
-                        CreditGqdj::setId,
-                        CreditGqdj::getCaseNumber,
-                        CreditGqdj::getCaseNumber,
-                        CreditGqdj::getRecommend,
-                        CreditGqdj::setRecommend,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        if (rowItem.getRecommend() == null) {
-                            rowItem.setRecommend(0);
-                        }
-                        boolean saved = creditGqdjService.save(rowItem);
-                        if (!saved) {
-                            CreditGqdj existing = creditGqdjService.lambdaQuery()
-                                .eq(CreditGqdj::getCaseNumber, rowItem.getCaseNumber())
-                                .select(CreditGqdj::getId, CreditGqdj::getRecommend)
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                Integer old = existing.getRecommend();
-                                rowItem.setRecommend(old == null ? 1 : old + 1);
-                                if (creditGqdjService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -795,7 +667,7 @@ public class CreditGqdjController extends BaseController {
         } else {
             entity.setDataStatus(param.getDataStatus());
         }
-        entity.setDataType("股权冻结");
+        entity.setDataType(param.getDataType());
         entity.setPublicDate(param.getPublicDate());
         if (!ImportHelper.isBlank(param.getFreezeDateStart2())) {
             entity.setFreezeDateStart(param.getFreezeDateStart2());

src/main/java/com/gxwebsoft/credit/controller/CreditHistoricalLegalPersonController.java

@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditHistoricalLegalPerson;
 import com.gxwebsoft.credit.param.CreditHistoricalLegalPersonImportParam;
 import com.gxwebsoft.credit.param.CreditHistoricalLegalPersonParam;
@@ -104,7 +105,7 @@ public class CreditHistoricalLegalPersonController extends BaseController {
     @Operation(summary = "删除历史法定代表人")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditHistoricalLegalPersonService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditHistoricalLegalPerson.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +138,7 @@ public class CreditHistoricalLegalPersonController extends BaseController {
     @Operation(summary = "批量删除历史法定代表人")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditHistoricalLegalPersonService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditHistoricalLegalPerson.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -170,6 +171,7 @@ public class CreditHistoricalLegalPersonController extends BaseController {
             CreditHistoricalLegalPerson::getName,
             CreditHistoricalLegalPerson::getCompanyId,
             CreditHistoricalLegalPerson::setCompanyId,
+            CreditHistoricalLegalPerson::setCompanyName,
             CreditHistoricalLegalPerson::getHasData,
             CreditHistoricalLegalPerson::setHasData,
             CreditHistoricalLegalPerson::getTenantId,
@@ -210,6 +212,11 @@ public class CreditHistoricalLegalPersonController extends BaseController {
             Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByName = ExcelImportSupport.readHyperlinksByHeaderKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "名称");
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             final int chunkSize = 500;
             final int mpBatchSize = 500;
@@ -229,6 +236,9 @@ public class CreditHistoricalLegalPersonController extends BaseController {
 
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getUserId() == null && currentUserId != null) {
                         item.setUserId(currentUserId);
@@ -259,86 +269,13 @@ public class CreditHistoricalLegalPersonController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditHistoricalLegalPersonService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> {
+                            mpBatchSize,
-                                // 批内一次查库：按 name in (...) 拉取，再按 registerDate 做内存匹配
+                            CreditHistoricalLegalPerson::getName,
-                                List<String> names = new ArrayList<>(chunkItems.size());
+                            "",
-                                for (CreditHistoricalLegalPerson it : chunkItems) {
-                                    if (it != null && !ImportHelper.isBlank(it.getName())) {
-                                        names.add(it.getName().trim());
-                                    }
-                                }
-                                List<CreditHistoricalLegalPerson> existingList = names.isEmpty()
-                                    ? new ArrayList<>()
-                                    : creditHistoricalLegalPersonService.lambdaQuery()
-                                    .in(CreditHistoricalLegalPerson::getName, names)
-                                    .list();
-
-                                java.util.Map<String, CreditHistoricalLegalPerson> byName = new java.util.HashMap<>();
-                                java.util.Map<String, CreditHistoricalLegalPerson> byNameDate = new java.util.HashMap<>();
-                                for (CreditHistoricalLegalPerson existing : existingList) {
-                                    if (existing == null || ImportHelper.isBlank(existing.getName())) {
-                                        continue;
-                                    }
-                                    String n = existing.getName().trim();
-                                    byName.putIfAbsent(n, existing);
-                                    String d = ImportHelper.isBlank(existing.getRegisterDate()) ? null : existing.getRegisterDate().trim();
-                                    if (d != null) {
-                                        byNameDate.putIfAbsent(n + "|" + d, existing);
-                                    }
-                                }
-
-                                List<CreditHistoricalLegalPerson> updates = new ArrayList<>();
-                                List<CreditHistoricalLegalPerson> inserts = new ArrayList<>();
-                                for (CreditHistoricalLegalPerson it : chunkItems) {
-                                    if (it == null || ImportHelper.isBlank(it.getName())) {
-                                        continue;
-                                    }
-                                    String n = it.getName().trim();
-                                    CreditHistoricalLegalPerson existing;
-                                    if (!ImportHelper.isBlank(it.getRegisterDate())) {
-                                        String d = it.getRegisterDate().trim();
-                                        existing = byNameDate.get(n + "|" + d);
-                                    } else {
-                                        existing = byName.get(n);
-                                    }
-                                    if (existing != null) {
-                                        it.setId(existing.getId());
-                                        updates.add(it);
-                                    } else {
-                                        inserts.add(it);
-                                    }
-                                }
-                                if (!updates.isEmpty()) {
-                                    creditHistoricalLegalPersonService.updateBatchById(updates, mpBatchSize);
-                                }
-                                if (!inserts.isEmpty()) {
-                                    creditHistoricalLegalPersonService.saveBatch(inserts, mpBatchSize);
-                                }
-                                return updates.size() + inserts.size();
-                            },
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditHistoricalLegalPersonService.save(rowItem);
-                                if (!saved) {
-                                    CreditHistoricalLegalPerson existing = creditHistoricalLegalPersonService.lambdaQuery()
-                                        .eq(CreditHistoricalLegalPerson::getName, rowItem.getName())
-                                        .eq(!ImportHelper.isBlank(rowItem.getRegisterDate()), CreditHistoricalLegalPerson::getRegisterDate, rowItem.getRegisterDate())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditHistoricalLegalPersonService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -352,85 +289,13 @@ public class CreditHistoricalLegalPersonController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditHistoricalLegalPersonService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> {
+                    mpBatchSize,
-                        List<String> names = new ArrayList<>(chunkItems.size());
+                    CreditHistoricalLegalPerson::getName,
-                        for (CreditHistoricalLegalPerson it : chunkItems) {
+                    "",
-                            if (it != null && !ImportHelper.isBlank(it.getName())) {
-                                names.add(it.getName().trim());
-                            }
-                        }
-                        List<CreditHistoricalLegalPerson> existingList = names.isEmpty()
-                            ? new ArrayList<>()
-                            : creditHistoricalLegalPersonService.lambdaQuery()
-                            .in(CreditHistoricalLegalPerson::getName, names)
-                            .list();
-
-                        java.util.Map<String, CreditHistoricalLegalPerson> byName = new java.util.HashMap<>();
-                        java.util.Map<String, CreditHistoricalLegalPerson> byNameDate = new java.util.HashMap<>();
-                        for (CreditHistoricalLegalPerson existing : existingList) {
-                            if (existing == null || ImportHelper.isBlank(existing.getName())) {
-                                continue;
-                            }
-                            String n = existing.getName().trim();
-                            byName.putIfAbsent(n, existing);
-                            String d = ImportHelper.isBlank(existing.getRegisterDate()) ? null : existing.getRegisterDate().trim();
-                            if (d != null) {
-                                byNameDate.putIfAbsent(n + "|" + d, existing);
-                            }
-                        }
-
-                        List<CreditHistoricalLegalPerson> updates = new ArrayList<>();
-                        List<CreditHistoricalLegalPerson> inserts = new ArrayList<>();
-                        for (CreditHistoricalLegalPerson it : chunkItems) {
-                            if (it == null || ImportHelper.isBlank(it.getName())) {
-                                continue;
-                            }
-                            String n = it.getName().trim();
-                            CreditHistoricalLegalPerson existing;
-                            if (!ImportHelper.isBlank(it.getRegisterDate())) {
-                                String d = it.getRegisterDate().trim();
-                                existing = byNameDate.get(n + "|" + d);
-                            } else {
-                                existing = byName.get(n);
-                            }
-                            if (existing != null) {
-                                it.setId(existing.getId());
-                                updates.add(it);
-                            } else {
-                                inserts.add(it);
-                            }
-                        }
-                        if (!updates.isEmpty()) {
-                            creditHistoricalLegalPersonService.updateBatchById(updates, mpBatchSize);
-                        }
-                        if (!inserts.isEmpty()) {
-                            creditHistoricalLegalPersonService.saveBatch(inserts, mpBatchSize);
-                        }
-                        return updates.size() + inserts.size();
-                    },
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditHistoricalLegalPersonService.save(rowItem);
-                        if (!saved) {
-                            CreditHistoricalLegalPerson existing = creditHistoricalLegalPersonService.lambdaQuery()
-                                .eq(CreditHistoricalLegalPerson::getName, rowItem.getName())
-                                .eq(!ImportHelper.isBlank(rowItem.getRegisterDate()), CreditHistoricalLegalPerson::getRegisterDate, rowItem.getRegisterDate())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditHistoricalLegalPersonService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditJudgmentDebtorController.java

@@ -32,7 +32,6 @@ import java.nio.file.Files;
 import java.util.Locale;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -114,7 +113,7 @@ public class CreditJudgmentDebtorController extends BaseController {
     @Operation(summary = "删除被执行人")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditJudgmentDebtorService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditJudgmentDebtor.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -147,7 +146,7 @@ public class CreditJudgmentDebtorController extends BaseController {
     @Operation(summary = "批量删除被执行人")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditJudgmentDebtorService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditJudgmentDebtor.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -164,12 +163,14 @@ public class CreditJudgmentDebtorController extends BaseController {
     @PostMapping("/company-id/refresh")
     public ApiResult<Map<String, Object>> refreshCompanyIdByCompanyName(
         @RequestParam(value = "onlyNull", required = false, defaultValue = "true") Boolean onlyNull,
-        @RequestParam(value = "limit", required = false) Integer limit
+        @RequestParam(value = "limit", required = false) Integer limit,
+        @RequestParam(value = "topLevelOnly", required = false, defaultValue = "true") Boolean topLevelOnly
     ) {
         User loginUser = getLoginUser();
         Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
 
-        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
+        // Match only on "name" column: debtor.name contains a (top-level) CreditCompany name/matchName.
+        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
             creditJudgmentDebtorService,
             creditCompanyService,
             currentTenantId,
@@ -177,13 +178,22 @@ public class CreditJudgmentDebtorController extends BaseController {
             limit,
             CreditJudgmentDebtor::getId,
             CreditJudgmentDebtor::setId,
-            CreditJudgmentDebtor::getName,
             CreditJudgmentDebtor::getCompanyId,
             CreditJudgmentDebtor::setCompanyId,
             CreditJudgmentDebtor::getHasData,
             CreditJudgmentDebtor::setHasData,
             CreditJudgmentDebtor::getTenantId,
-            CreditJudgmentDebtor::new
+            CreditJudgmentDebtor::new,
+            q -> {
+                if (!Boolean.TRUE.equals(topLevelOnly)) {
+                    return;
+                }
+                // "一级企业"：parentId=0（部分历史数据可能为 NULL，兼容处理）
+                q.and(w -> w.eq(com.gxwebsoft.credit.entity.CreditCompany::getParentId, 0)
+                    .or()
+                    .isNull(com.gxwebsoft.credit.entity.CreditCompany::getParentId));
+            },
+            CreditJudgmentDebtor::getName
         );
 
         if (!stats.anyDataRead) {
@@ -230,7 +240,7 @@ public class CreditJudgmentDebtorController extends BaseController {
 
     /**
      * 批量导入历史被执行人（写入被执行人表 credit_judgment_debtor，仅解析“历史被执行人”选项卡）
-     * 规则：案号相同则更新；案号不存在则插入；导入文件内案号重复时取最后一条覆盖。
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
      */
     @PreAuthorize("hasAuthority('credit:creditJudgmentDebtor:save')")
     @Operation(summary = "批量导入历史被执行人")
@@ -278,7 +288,6 @@ public class CreditJudgmentDebtorController extends BaseController {
         example.setName("某某公司");
         example.setCode("1234567890");
         example.setOccurrenceTime("2024-01-10");
-        example.setAmount("100000");
         example.setDataStatus("已公开");
         example.setComments("备注信息");
         templateList.add(example);
@@ -311,7 +320,9 @@ public class CreditJudgmentDebtorController extends BaseController {
             || isHeaderValue(param.getCode(), "证件号/组织机构代码")
             || isHeaderValue(param.getOccurrenceTime(), "立案日期")
             || isHeaderValue(param.getCourtName(), "法院")
-            || isHeaderValue(param.getAmount(), "执行标的(元)")
+            || isHeaderValue(param.getCourtNameQcc(), "执行法院")
+            || isHeaderValue(param.getInvolvedAmount(), "涉案金额")
+            || isHeaderValue(param.getInvolvedAmountQcc(), "执行标的(元)")
             || isHeaderValue(param.getDataStatus(), "数据状态");
     }
 
@@ -322,17 +333,56 @@ public class CreditJudgmentDebtorController extends BaseController {
         return headerText.equals(value.trim());
     }
 
+    private static boolean hasMeaningfulPartyValue(String value) {
+        if (ImportHelper.isBlank(value)) {
+            return false;
+        }
+        return !"-".equals(value.trim());
+    }
+
     private CreditJudgmentDebtor convertImportParamToEntity(CreditJudgmentDebtorImportParam param) {
         CreditJudgmentDebtor entity = new CreditJudgmentDebtor();
 
         entity.setCaseNumber(param.getCaseNumber());
         entity.setName1(param.getName1());
         String debtorName = ImportHelper.isBlank(param.getName()) ? param.getName1() : param.getName();
+        if (debtorName != null) {
+            debtorName = debtorName.trim();
+        }
+        entity.setPlaintiffAppellant(param.getPlaintiffAppellant());
+        entity.setAppellee(param.getAppellee());
+        entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty());
+        // Some upstream XLS templates store party/company name in "原告/上诉人/被告/第三人" columns.
+        // When present, use them to populate the debtor "name" for compatibility.
+        if (hasMeaningfulPartyValue(param.getPlaintiffAppellant())) {
+            debtorName = param.getPlaintiffAppellant().trim();
+        } else if (hasMeaningfulPartyValue(param.getAppellee())) {
+            debtorName = param.getAppellee().trim();
+        } else if (hasMeaningfulPartyValue(param.getOtherPartiesThirdParty())) {
+            debtorName = param.getOtherPartiesThirdParty().trim();
+        }
         entity.setName(debtorName);
         entity.setCode(param.getCode());
-        entity.setOccurrenceTime(param.getOccurrenceTime());
+        String occurrenceTime = !ImportHelper.isBlank(param.getOccurrenceTime2())
-        entity.setAmount(param.getAmount());
+            ? param.getOccurrenceTime2().trim()
-        entity.setCourtName(param.getCourtName());
+            : (param.getOccurrenceTime() != null ? param.getOccurrenceTime().trim() : null);
+        entity.setOccurrenceTime(occurrenceTime);
+        // 兼容企查查历史被执行人：执行标的(元) / 执行法院
+        String amount = !ImportHelper.isBlank(param.getInvolvedAmountQcc())
+            ? param.getInvolvedAmountQcc()
+            : param.getInvolvedAmount();
+        if (amount != null) {
+            amount = amount.trim();
+        }
+        entity.setAmount(amount);
+
+        String courtName = !ImportHelper.isBlank(param.getCourtName())
+            ? param.getCourtName()
+            : param.getCourtNameQcc();
+        if (courtName != null) {
+            courtName = courtName.trim();
+        }
+        entity.setCourtName(courtName);
         entity.setDataStatus(param.getDataStatus());
         entity.setComments(param.getComments());
 
@@ -477,10 +527,10 @@ public class CreditJudgmentDebtorController extends BaseController {
         Map<String, String> urlByName1 = ExcelImportSupport.readHyperlinksByHeaderKey(excelFile, usedSheetIndex, usedTitleRows, usedHeadRows, "被执行人");
 
         String prefix = ImportHelper.isBlank(fileLabel) ? "" : "【" + fileLabel + "】";
-
+        final int chunkSize = 500;
-        // 同案号多条：以导入文件中“最后一条”为准（视为最新），避免批处理中重复 upsert。
+        final int mpBatchSize = 500;
-        LinkedHashMap<String, CreditJudgmentDebtor> latestByCaseNumber = new LinkedHashMap<>();
+        List<CreditJudgmentDebtor> chunkItems = new ArrayList<>(chunkSize);
-        LinkedHashMap<String, Integer> latestRowByCaseNumber = new LinkedHashMap<>();
+        List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
 
         for (int i = 0; i < list.size(); i++) {
             CreditJudgmentDebtorImportParam param = list.get(i);
@@ -510,6 +560,9 @@ public class CreditJudgmentDebtorController extends BaseController {
                 if (item.getCompanyId() == null && companyId != null) {
                     item.setCompanyId(companyId);
                 }
+                if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                    touchedCompanyIds.add(item.getCompanyId());
+                }
                 if (item.getUserId() == null && currentUserId != null) {
                     item.setUserId(currentUserId);
                 }
@@ -528,35 +581,19 @@ public class CreditJudgmentDebtorController extends BaseController {
                 // 历史导入的数据统一标记为“失效”
                 item.setDataStatus("失效");
 
-                latestByCaseNumber.put(item.getCaseNumber(), item);
+                chunkItems.add(item);
-                latestRowByCaseNumber.put(item.getCaseNumber(), excelRowNumber);
+                chunkRowNumbers.add(excelRowNumber);
+                if (chunkItems.size() >= chunkSize) {
+                    successCount += persistHistoryImportChunk(chunkItems, chunkRowNumbers, prefix, mpBatchSize, errorMessages);
+                    chunkItems.clear();
+                    chunkRowNumbers.clear();
+                }
             } catch (Exception e) {
                 errorMessages.add(prefix + "第" + excelRowNumber + "行：" + e.getMessage());
                 e.printStackTrace();
             }
         }
 
-        if (latestByCaseNumber.isEmpty()) {
-            return new ImportOutcome(true, 0, errorMessages, touchedCompanyIds);
-        }
-
-        final int chunkSize = 500;
-        final int mpBatchSize = 500;
-        List<CreditJudgmentDebtor> chunkItems = new ArrayList<>(chunkSize);
-        List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
-
-        for (Map.Entry<String, CreditJudgmentDebtor> entry : latestByCaseNumber.entrySet()) {
-            String caseNumber = entry.getKey();
-            CreditJudgmentDebtor item = entry.getValue();
-            Integer rowNo = latestRowByCaseNumber.get(caseNumber);
-            chunkItems.add(item);
-            chunkRowNumbers.add(rowNo != null ? rowNo : -1);
-            if (chunkItems.size() >= chunkSize) {
-                successCount += persistHistoryImportChunk(chunkItems, chunkRowNumbers, prefix, mpBatchSize, errorMessages);
-                chunkItems.clear();
-                chunkRowNumbers.clear();
-            }
-        }
         if (!chunkItems.isEmpty()) {
             successCount += persistHistoryImportChunk(chunkItems, chunkRowNumbers, prefix, mpBatchSize, errorMessages);
         }
@@ -569,101 +606,15 @@ public class CreditJudgmentDebtorController extends BaseController {
                                           String prefix,
                                           int mpBatchSize,
                                           List<String> errorMessages) {
-        if (CollectionUtils.isEmpty(items)) {
+        return batchImportSupport.persistInsertOnlyChunk(
-            return 0;
+            creditJudgmentDebtorService,
-        }
+            items,
-
+            excelRowNumbers,
-        try {
+            mpBatchSize,
-            return batchImportSupport.runInNewTx(() -> {
+            CreditJudgmentDebtor::getCaseNumber,
-                List<String> keys = new ArrayList<>(items.size());
+            prefix,
-                for (CreditJudgmentDebtor item : items) {
+            errorMessages
-                    if (item == null || ImportHelper.isBlank(item.getCaseNumber())) {
+        );
-                        continue;
-                    }
-                    keys.add(item.getCaseNumber().trim());
-                }
-
-                Map<String, CreditJudgmentDebtor> existingByCaseNumber = new java.util.HashMap<>();
-                if (!keys.isEmpty()) {
-                    List<CreditJudgmentDebtor> existingList = creditJudgmentDebtorService.lambdaQuery()
-                        .in(CreditJudgmentDebtor::getCaseNumber, keys)
-                        .select(CreditJudgmentDebtor::getId, CreditJudgmentDebtor::getCaseNumber, CreditJudgmentDebtor::getRecommend)
-                        .list();
-                    for (CreditJudgmentDebtor existing : existingList) {
-                        if (existing == null || ImportHelper.isBlank(existing.getCaseNumber())) {
-                            continue;
-                        }
-                        existingByCaseNumber.putIfAbsent(existing.getCaseNumber().trim(), existing);
-                    }
-                }
-
-                List<CreditJudgmentDebtor> updates = new ArrayList<>();
-                List<CreditJudgmentDebtor> inserts = new ArrayList<>();
-                for (CreditJudgmentDebtor item : items) {
-                    if (item == null || ImportHelper.isBlank(item.getCaseNumber())) {
-                        continue;
-                    }
-                    String caseNumber = item.getCaseNumber().trim();
-                    CreditJudgmentDebtor existing = existingByCaseNumber.get(caseNumber);
-                    if (existing != null && existing.getId() != null) {
-                        // 覆盖更新：recommend 记录“被更新次数”，每次更新 +1
-                        item.setId(existing.getId());
-                        Integer old = existing.getRecommend();
-                        item.setRecommend(old == null ? 1 : old + 1);
-                        updates.add(item);
-                    } else {
-                        if (item.getRecommend() == null) {
-                            item.setRecommend(0);
-                        }
-                        inserts.add(item);
-                    }
-                }
-
-                if (!updates.isEmpty()) {
-                    creditJudgmentDebtorService.updateBatchById(updates, mpBatchSize);
-                }
-                if (!inserts.isEmpty()) {
-                    creditJudgmentDebtorService.saveBatch(inserts, mpBatchSize);
-                }
-                return updates.size() + inserts.size();
-            });
-        } catch (Exception batchException) {
-            int successCount = 0;
-            for (int i = 0; i < items.size(); i++) {
-                CreditJudgmentDebtor item = items.get(i);
-                int excelRowNumber = (excelRowNumbers != null && i < excelRowNumbers.size()) ? excelRowNumbers.get(i) : -1;
-                try {
-                    int delta = batchImportSupport.runInNewTx(() -> {
-                        if (item == null || ImportHelper.isBlank(item.getCaseNumber())) {
-                            return 0;
-                        }
-                        String caseNumber = item.getCaseNumber().trim();
-                        CreditJudgmentDebtor existing = creditJudgmentDebtorService.lambdaQuery()
-                            .eq(CreditJudgmentDebtor::getCaseNumber, caseNumber)
-                            .select(CreditJudgmentDebtor::getId, CreditJudgmentDebtor::getRecommend)
-                            .one();
-                        if (existing != null && existing.getId() != null) {
-                            item.setId(existing.getId());
-                            Integer old = existing.getRecommend();
-                            item.setRecommend(old == null ? 1 : old + 1);
-                            return creditJudgmentDebtorService.updateById(item) ? 1 : 0;
-                        }
-                        if (item.getRecommend() == null) {
-                            item.setRecommend(0);
-                        }
-                        return creditJudgmentDebtorService.save(item) ? 1 : 0;
-                    });
-                    if (delta > 0) {
-                        successCount += delta;
-                    } else {
-                        errorMessages.add(prefix + "第" + excelRowNumber + "行：保存失败");
-                    }
-                } catch (Exception e) {
-                    errorMessages.add(prefix + "第" + excelRowNumber + "行：" + e.getMessage());
-                }
-            }
-            return successCount;
-        }
     }
 
     private int persistImportChunk(List<CreditJudgmentDebtor> items,
@@ -671,54 +622,15 @@ public class CreditJudgmentDebtorController extends BaseController {
                                    String prefix,
                                    int mpBatchSize,
                                    List<String> errorMessages) {
-        if (CollectionUtils.isEmpty(items)) {
+        return batchImportSupport.persistInsertOnlyChunk(
-            return 0;
+            creditJudgmentDebtorService,
-        }
+            items,
-        try {
+            excelRowNumbers,
-            return batchImportSupport.runInNewTx(() -> batchImportSupport.upsertBySingleKey(
+            mpBatchSize,
-                creditJudgmentDebtorService,
+            CreditJudgmentDebtor::getCaseNumber,
-                items,
+            prefix,
-                CreditJudgmentDebtor::getId,
+            errorMessages
-                CreditJudgmentDebtor::setId,
+        );
-                CreditJudgmentDebtor::getCaseNumber,
-                CreditJudgmentDebtor::getCaseNumber,
-                null,
-                mpBatchSize
-            ));
-        } catch (Exception batchException) {
-            int successCount = 0;
-            for (int i = 0; i < items.size(); i++) {
-                CreditJudgmentDebtor item = items.get(i);
-                int excelRowNumber = (excelRowNumbers != null && i < excelRowNumbers.size()) ? excelRowNumbers.get(i) : -1;
-                try {
-                    int delta = batchImportSupport.runInNewTx(() -> {
-                        boolean saved = creditJudgmentDebtorService.save(item);
-                        if (!saved) {
-                            CreditJudgmentDebtor existing = creditJudgmentDebtorService.lambdaQuery()
-                                .eq(CreditJudgmentDebtor::getCaseNumber, item.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                item.setId(existing.getId());
-                                if (creditJudgmentDebtorService.updateById(item)) {
-                                    return 1;
-                                }
-                            }
-                        } else {
-                            return 1;
-                        }
-                        return 0;
-                    });
-                    if (delta > 0) {
-                        successCount += delta;
-                    } else {
-                        errorMessages.add(prefix + "第" + excelRowNumber + "行：保存失败");
-                    }
-                } catch (Exception e) {
-                    errorMessages.add(prefix + "第" + excelRowNumber + "行：" + e.getMessage());
-                }
-            }
-            return successCount;
-        }
     }
 
     private ImportOutcome importFromZip(MultipartFile zipFile, Integer currentUserId, Integer currentTenantId, Integer companyId) throws Exception {

src/main/java/com/gxwebsoft/credit/controller/CreditJudicialDocumentController.java

@@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -105,7 +104,7 @@ public class CreditJudicialDocumentController extends BaseController {
     @Operation(summary = "删除裁判文书司法大数据")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditJudicialDocumentService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditJudicialDocument.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -138,20 +137,20 @@ public class CreditJudicialDocumentController extends BaseController {
     @Operation(summary = "批量删除裁判文书司法大数据")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditJudicialDocumentService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditJudicialDocument.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
     }
 
     /**
-     * 根据企业名称匹配企业并更新 companyId（匹配 CreditCompany.name / CreditCompany.matchName）
+     * 根据“当事人/第三人”文本中包含的企业名称匹配企业并更新 companyId（匹配 CreditCompany.name / CreditCompany.matchName）
      *
      * <p>默认仅更新 companyId=0 的记录；如需覆盖更新，传 onlyNull=false。</p>
      */
     @PreAuthorize("hasAuthority('credit:creditJudicialDocument:update')")
     @OperationLog
-    @Operation(summary = "根据企业名称匹配并更新companyId")
+    @Operation(summary = "根据当事人字段包含企业名称匹配并更新companyId")
     @PostMapping("/company-id/refresh")
     public ApiResult<Map<String, Object>> refreshCompanyIdByCompanyName(
         @RequestParam(value = "onlyNull", required = false, defaultValue = "true") Boolean onlyNull,
@@ -160,7 +159,7 @@ public class CreditJudicialDocumentController extends BaseController {
         User loginUser = getLoginUser();
         Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
 
-        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
+        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
             creditJudicialDocumentService,
             creditCompanyService,
             currentTenantId,
@@ -168,13 +167,14 @@ public class CreditJudicialDocumentController extends BaseController {
             limit,
             CreditJudicialDocument::getId,
             CreditJudicialDocument::setId,
-            CreditJudicialDocument::getAppellee,
             CreditJudicialDocument::getCompanyId,
             CreditJudicialDocument::setCompanyId,
             CreditJudicialDocument::getHasData,
             CreditJudicialDocument::setHasData,
             CreditJudicialDocument::getTenantId,
-            CreditJudicialDocument::new
+            CreditJudicialDocument::new,
+            // 需求：otherPartiesThirdParty 字段包含企业名称时，回填 companyId
+            CreditJudicialDocument::getOtherPartiesThirdParty
         );
 
         if (!stats.anyDataRead) {
@@ -270,38 +270,13 @@ public class CreditJudicialDocumentController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditJudicialDocumentService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditJudicialDocumentService,
+                            CreditJudicialDocument::getCaseNumber,
-                                chunkItems,
+                            "",
-                                CreditJudicialDocument::getId,
-                                CreditJudicialDocument::setId,
-                                CreditJudicialDocument::getCaseNumber,
-                                CreditJudicialDocument::getCaseNumber,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditJudicialDocumentService.save(rowItem);
-                                if (!saved) {
-                                    CreditJudicialDocument existing = creditJudicialDocumentService.lambdaQuery()
-                                        .eq(CreditJudicialDocument::getCaseNumber, rowItem.getCaseNumber())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditJudicialDocumentService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -315,38 +290,13 @@ public class CreditJudicialDocumentController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditJudicialDocumentService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditJudicialDocumentService,
+                    CreditJudicialDocument::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditJudicialDocument::getId,
-                        CreditJudicialDocument::setId,
-                        CreditJudicialDocument::getCaseNumber,
-                        CreditJudicialDocument::getCaseNumber,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditJudicialDocumentService.save(rowItem);
-                        if (!saved) {
-                            CreditJudicialDocument existing = creditJudicialDocumentService.lambdaQuery()
-                                .eq(CreditJudicialDocument::getCaseNumber, rowItem.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditJudicialDocumentService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -366,7 +316,7 @@ public class CreditJudicialDocumentController extends BaseController {
 
     /**
      * 批量导入历史裁判文书（仅解析“历史裁判文书”选项卡）
-     * 规则：案号相同则覆盖更新（recommend++ 记录更新次数）；案号不存在则插入。
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
      */
     @PreAuthorize("hasAuthority('credit:creditJudicialDocument:save')")
     @Operation(summary = "批量导入历史裁判文书司法大数据")
@@ -400,8 +350,10 @@ public class CreditJudicialDocumentController extends BaseController {
             Map<String, String> urlByCaseNumber = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "案号");
             Map<String, String> urlByTitle = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "文书标题");
 
-            LinkedHashMap<String, CreditJudicialDocument> latestByCaseNumber = new LinkedHashMap<>();
+            final int chunkSize = 500;
-            LinkedHashMap<String, Integer> latestRowByCaseNumber = new LinkedHashMap<>();
+            final int mpBatchSize = 500;
+            List<CreditJudicialDocument> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
 
             for (int i = 0; i < list.size(); i++) {
                 CreditJudicialDocumentImportParam param = list.get(i);
@@ -445,121 +397,42 @@ public class CreditJudicialDocumentController extends BaseController {
                     // 历史导入的数据统一标记为“失效”
                     item.setDataStatus("失效");
 
-                    latestByCaseNumber.put(item.getCaseNumber(), item);
+                    if (item.getRecommend() == null) {
-                    latestRowByCaseNumber.put(item.getCaseNumber(), excelRowNumber);
+                        item.setRecommend(0);
+                    }
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditJudicialDocumentService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditJudicialDocument::getCaseNumber,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
                 } catch (Exception e) {
                     errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
                     e.printStackTrace();
                 }
             }
 
-            if (latestByCaseNumber.isEmpty()) {
-                if (errorMessages.isEmpty()) {
-                    return fail("未读取到数据，请确认模板表头与示例格式一致", null);
-                }
-                return success("导入完成，成功0条，失败" + errorMessages.size() + "条", errorMessages);
-            }
-
-            final int chunkSize = 500;
-            final int mpBatchSize = 500;
-            List<CreditJudicialDocument> chunkItems = new ArrayList<>(chunkSize);
-            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
-
-            for (Map.Entry<String, CreditJudicialDocument> entry : latestByCaseNumber.entrySet()) {
-                String caseNumber = entry.getKey();
-                CreditJudicialDocument item = entry.getValue();
-                Integer rowNo = latestRowByCaseNumber.get(caseNumber);
-                chunkItems.add(item);
-                chunkRowNumbers.add(rowNo != null ? rowNo : -1);
-                if (chunkItems.size() >= chunkSize) {
-                    successCount += batchImportSupport.persistChunkWithFallback(
-                        chunkItems,
-                        chunkRowNumbers,
-                        () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
-                            creditJudicialDocumentService,
-                            chunkItems,
-                            CreditJudicialDocument::getId,
-                            CreditJudicialDocument::setId,
-                            CreditJudicialDocument::getCaseNumber,
-                            CreditJudicialDocument::getCaseNumber,
-                            CreditJudicialDocument::getRecommend,
-                            CreditJudicialDocument::setRecommend,
-                            null,
-                            mpBatchSize
-                        ),
-                        (rowItem, rowNumber) -> {
-                            if (rowItem.getRecommend() == null) {
-                                rowItem.setRecommend(0);
-                            }
-                            boolean saved = creditJudicialDocumentService.save(rowItem);
-                            if (!saved) {
-                                CreditJudicialDocument existing = creditJudicialDocumentService.lambdaQuery()
-                                    .eq(CreditJudicialDocument::getCaseNumber, rowItem.getCaseNumber())
-                                    .select(CreditJudicialDocument::getId, CreditJudicialDocument::getRecommend)
-                                    .one();
-                                if (existing != null) {
-                                    rowItem.setId(existing.getId());
-                                    Integer old = existing.getRecommend();
-                                    rowItem.setRecommend(old == null ? 1 : old + 1);
-                                    if (creditJudicialDocumentService.updateById(rowItem)) {
-                                        return true;
-                                    }
-                                }
-                            } else {
-                                return true;
-                            }
-                            String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                            errorMessages.add(prefix + "保存失败");
-                            return false;
-                        },
-                        errorMessages
-                    );
-                    chunkItems.clear();
-                    chunkRowNumbers.clear();
-                }
-            }
-
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditJudicialDocumentService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
+                    mpBatchSize,
-                        creditJudicialDocumentService,
+                    CreditJudicialDocument::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditJudicialDocument::getId,
-                        CreditJudicialDocument::setId,
-                        CreditJudicialDocument::getCaseNumber,
-                        CreditJudicialDocument::getCaseNumber,
-                        CreditJudicialDocument::getRecommend,
-                        CreditJudicialDocument::setRecommend,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        if (rowItem.getRecommend() == null) {
-                            rowItem.setRecommend(0);
-                        }
-                        boolean saved = creditJudicialDocumentService.save(rowItem);
-                        if (!saved) {
-                            CreditJudicialDocument existing = creditJudicialDocumentService.lambdaQuery()
-                                .eq(CreditJudicialDocument::getCaseNumber, rowItem.getCaseNumber())
-                                .select(CreditJudicialDocument::getId, CreditJudicialDocument::getRecommend)
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                Integer old = existing.getRecommend();
-                                rowItem.setRecommend(old == null ? 1 : old + 1);
-                                if (creditJudicialDocumentService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -621,7 +494,7 @@ public class CreditJudicialDocumentController extends BaseController {
         : param.getInvolvedAmount();
 
         entity.setTitle(param.getTitle());
-        entity.setType(param.getType());
+        entity.setDocumentType(param.getDocumentType());
         entity.setDataStatus(param.getDataStatus());
         entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty());
         entity.setOccurrenceTime(param.getOccurrenceTime());

src/main/java/com/gxwebsoft/credit/controller/CreditJudiciaryController.java

@@ -103,7 +103,7 @@ public class CreditJudiciaryController extends BaseController {
     @Operation(summary = "删除司法案件")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditJudiciaryService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditJudiciary.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -136,7 +136,7 @@ public class CreditJudiciaryController extends BaseController {
     @Operation(summary = "批量删除司法案件")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditJudiciaryService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditJudiciary.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -294,83 +294,39 @@ public class CreditJudiciaryController extends BaseController {
             touchedCompanyIds.add(item.getCompanyId());
           }
 
-          chunkItems.add(item);
+	          chunkItems.add(item);
-          chunkRowNumbers.add(excelRowNumber);
+	          chunkRowNumbers.add(excelRowNumber);
-          if (chunkItems.size() >= chunkSize) {
+	          if (chunkItems.size() >= chunkSize) {
-            successCount += batchImportSupport.persistChunkWithFallback(
+	            successCount += batchImportSupport.persistInsertOnlyChunk(
-              chunkItems,
+	              creditJudiciaryService,
-              chunkRowNumbers,
+	              chunkItems,
-              () -> batchImportSupport.upsertBySingleKey(
+	              chunkRowNumbers,
-                creditJudiciaryService,
+	              mpBatchSize,
-                chunkItems,
+	              CreditJudiciary::getCode,
-                CreditJudiciary::getId,
+	              "",
-                CreditJudiciary::setId,
+	              errorMessages
-                CreditJudiciary::getName,
+	            );
-                CreditJudiciary::getName,
+	            chunkItems.clear();
-                null,
+	            chunkRowNumbers.clear();
-                mpBatchSize
+	          }
-              ),
+	        } catch (Exception e) {
-              (rowItem, rowNumber) -> {
-                boolean saved = creditJudiciaryService.save(rowItem);
-                if (!saved) {
-                  CreditJudiciary existing = creditJudiciaryService.getByName(rowItem.getName());
-                  if (existing != null) {
-                    rowItem.setId(existing.getId());
-                    if (creditJudiciaryService.updateById(rowItem)) {
-                      return true;
-                    }
-                  }
-                } else {
-                  return true;
-                }
-                errorMessages.add("第" + rowNumber + "行：保存失败");
-                return false;
-              },
-              errorMessages
-            );
-            chunkItems.clear();
-            chunkRowNumbers.clear();
-          }
-        } catch (Exception e) {
           int excelRowNumber = i + 1 + usedTitleRows + usedHeadRows;
           errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
           e.printStackTrace();
         }
-      }
+	      }
-
+	
-      if (!chunkItems.isEmpty()) {
+	      if (!chunkItems.isEmpty()) {
-        successCount += batchImportSupport.persistChunkWithFallback(
+	        successCount += batchImportSupport.persistInsertOnlyChunk(
-          chunkItems,
+	          creditJudiciaryService,
-          chunkRowNumbers,
+	          chunkItems,
-          () -> batchImportSupport.upsertBySingleKey(
+	          chunkRowNumbers,
-            creditJudiciaryService,
+	          mpBatchSize,
-            chunkItems,
+	          CreditJudiciary::getCode,
-            CreditJudiciary::getId,
+	          "",
-            CreditJudiciary::setId,
+	          errorMessages
-            CreditJudiciary::getName,
+	        );
-            CreditJudiciary::getName,
+	      }
-            null,
-            mpBatchSize
-          ),
-          (rowItem, rowNumber) -> {
-            boolean saved = creditJudiciaryService.save(rowItem);
-            if (!saved) {
-              CreditJudiciary existing = creditJudiciaryService.getByName(rowItem.getName());
-              if (existing != null) {
-                rowItem.setId(existing.getId());
-                if (creditJudiciaryService.updateById(rowItem)) {
-                  return true;
-                }
-              }
-            } else {
-              return true;
-            }
-            errorMessages.add("第" + rowNumber + "行：保存失败");
-            return false;
-          },
-          errorMessages
-        );
-      }
 
       creditCompanyRecordCountService.refresh(CreditCompanyRecordCountService.CountType.JUDICIARY, touchedCompanyIds);
 

src/main/java/com/gxwebsoft/credit/controller/CreditMediationController.java

@@ -104,7 +104,7 @@ public class CreditMediationController extends BaseController {
     @Operation(summary = "删除诉前调解司法大数据")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditMediationService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditMediation.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +137,7 @@ public class CreditMediationController extends BaseController {
     @Operation(summary = "批量删除诉前调解司法大数据")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditMediationService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditMediation.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -159,7 +159,9 @@ public class CreditMediationController extends BaseController {
         User loginUser = getLoginUser();
         Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
 
-        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
+        // Party columns may contain multiple roles/names; match if any company name is contained in the text.
+        // Priority: 原告/上诉人 > 被告/被上诉人 > 其他当事人/第三人
+        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
             creditMediationService,
             creditCompanyService,
             currentTenantId,
@@ -167,13 +169,15 @@ public class CreditMediationController extends BaseController {
             limit,
             CreditMediation::getId,
             CreditMediation::setId,
-            CreditMediation::getAppellee,
             CreditMediation::getCompanyId,
             CreditMediation::setCompanyId,
             CreditMediation::getHasData,
             CreditMediation::setHasData,
             CreditMediation::getTenantId,
-            CreditMediation::new
+            CreditMediation::new,
+            CreditMediation::getPlaintiffAppellant,
+            CreditMediation::getAppellee,
+            CreditMediation::getOtherPartiesThirdParty
         );
 
         if (!stats.anyDataRead) {
@@ -260,38 +264,13 @@ public class CreditMediationController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditMediationService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditMediationService,
+                            CreditMediation::getCaseNumber,
-                                chunkItems,
+                            "",
-                                CreditMediation::getId,
-                                CreditMediation::setId,
-                                CreditMediation::getCaseNumber,
-                                CreditMediation::getCaseNumber,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditMediationService.save(rowItem);
-                                if (!saved) {
-                                    CreditMediation existing = creditMediationService.lambdaQuery()
-                                        .eq(CreditMediation::getCaseNumber, rowItem.getCaseNumber())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditMediationService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -305,38 +284,13 @@ public class CreditMediationController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditMediationService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditMediationService,
+                    CreditMediation::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditMediation::getId,
-                        CreditMediation::setId,
-                        CreditMediation::getCaseNumber,
-                        CreditMediation::getCaseNumber,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditMediationService.save(rowItem);
-                        if (!saved) {
-                            CreditMediation existing = creditMediationService.lambdaQuery()
-                                .eq(CreditMediation::getCaseNumber, rowItem.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditMediationService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -354,6 +308,134 @@ public class CreditMediationController extends BaseController {
         }
     }
 
+    /**
+     * 批量导入历史诉前调解（仅解析“历史诉前调解”选项卡）
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
+     */
+    @PreAuthorize("hasAuthority('credit:creditMediation:save')")
+    @Operation(summary = "批量导入历史诉前调解")
+    @PostMapping("/import/history")
+    public ApiResult<List<String>> importHistoryBatch(@RequestParam("file") MultipartFile file,
+                                                      @RequestParam(value = "companyId", required = false) Integer companyId) {
+        List<String> errorMessages = new ArrayList<>();
+        int successCount = 0;
+        Set<Integer> touchedCompanyIds = new HashSet<>();
+
+        try {
+            int sheetIndex = ExcelImportSupport.findSheetIndex(file, "历史诉前调解");
+            if (sheetIndex < 0) {
+                return fail("未读取到数据，请确认文件中存在“历史诉前调解”选项卡且表头与示例格式一致", null);
+            }
+
+            ExcelImportSupport.ImportResult<CreditMediationImportParam> importResult = ExcelImportSupport.read(
+                file, CreditMediationImportParam.class, this::isEmptyImportRow, sheetIndex);
+            List<CreditMediationImportParam> list = importResult.getData();
+            int usedTitleRows = importResult.getTitleRows();
+            int usedHeadRows = importResult.getHeadRows();
+            int usedSheetIndex = importResult.getSheetIndex();
+
+            if (CollectionUtils.isEmpty(list)) {
+                return fail("未读取到数据，请确认模板表头与示例格式一致", null);
+            }
+
+            User loginUser = getLoginUser();
+            Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
+            Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
+            Map<String, String> urlByCaseNumber = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "案号");
+
+            final int chunkSize = 500;
+            final int mpBatchSize = 500;
+            List<CreditMediation> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
+
+            for (int i = 0; i < list.size(); i++) {
+                CreditMediationImportParam param = list.get(i);
+                int excelRowNumber = i + 1 + usedTitleRows + usedHeadRows;
+                try {
+                    CreditMediation item = convertImportParamToEntity(param);
+                    if (item.getCaseNumber() != null) {
+                        item.setCaseNumber(item.getCaseNumber().trim());
+                    }
+                    if (ImportHelper.isBlank(item.getCaseNumber())) {
+                        errorMessages.add("第" + excelRowNumber + "行：案号不能为空");
+                        continue;
+                    }
+
+                    String link = urlByCaseNumber.get(item.getCaseNumber());
+                    if (!ImportHelper.isBlank(link)) {
+                        item.setUrl(link.trim());
+                    }
+
+                    if (item.getCompanyId() == null && companyId != null) {
+                        item.setCompanyId(companyId);
+                    }
+                    if (item.getUserId() == null && currentUserId != null) {
+                        item.setUserId(currentUserId);
+                    }
+                    if (item.getTenantId() == null && currentTenantId != null) {
+                        item.setTenantId(currentTenantId);
+                    }
+                    if (item.getStatus() == null) {
+                        item.setStatus(0);
+                    }
+                    if (item.getDeleted() == null) {
+                        item.setDeleted(0);
+                    }
+                    if (item.getRecommend() == null) {
+                        item.setRecommend(0);
+                    }
+                    // 历史导入的数据统一标记为“失效”
+                    item.setDataStatus("失效");
+
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditMediationService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditMediation::getCaseNumber,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
+                } catch (Exception e) {
+                    errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+
+            if (!chunkItems.isEmpty()) {
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditMediationService,
+                    chunkItems,
+                    chunkRowNumbers,
+                    mpBatchSize,
+                    CreditMediation::getCaseNumber,
+                    "",
+                    errorMessages
+                );
+            }
+
+            creditCompanyRecordCountService.refresh(CreditCompanyRecordCountService.CountType.MEDIATION, touchedCompanyIds);
+
+            if (errorMessages.isEmpty()) {
+                return success("成功导入" + successCount + "条数据", null);
+            }
+            return success("导入完成，成功" + successCount + "条，失败" + errorMessages.size() + "条", errorMessages);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return fail("导入失败：" + e.getMessage(), null);
+        }
+    }
+
     /**
      * 下载诉前调解导入模板
      */

src/main/java/com/gxwebsoft/credit/controller/CreditMpCustomerController.java

@@ -0,0 +1,178 @@
+package com.gxwebsoft.credit.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.credit.service.CreditMpCustomerService;
+import com.gxwebsoft.credit.entity.CreditMpCustomer;
+import com.gxwebsoft.credit.param.CreditMpCustomerParam;
+import com.gxwebsoft.credit.param.BatchFollowStepApprovalDTO;
+import com.gxwebsoft.credit.param.EndFollowProcessDTO;
+import com.gxwebsoft.credit.param.FollowStepApprovalDTO;
+import com.gxwebsoft.credit.param.FollowStepQueryDTO;
+import com.gxwebsoft.credit.vo.FollowStatisticsDTO;
+import com.gxwebsoft.credit.vo.PendingApprovalStepVO;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.system.entity.User;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 小程序端客户控制器
+ *
+ * @author 科技小王子
+ * @since 2026-03-16 20:59:17
+ */
+@Tag(name = "小程序端客户管理")
+@RestController
+@RequestMapping("/api/credit/credit-mp-customer")
+public class CreditMpCustomerController extends BaseController {
+    @Resource
+    private CreditMpCustomerService creditMpCustomerService;
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:list')")
+    @Operation(summary = "分页查询小程序端客户")
+    @GetMapping("/page")
+    public ApiResult<PageResult<CreditMpCustomer>> page(CreditMpCustomerParam param) {
+        // 使用关联查询
+        return success(creditMpCustomerService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:list')")
+    @Operation(summary = "查询全部小程序端客户")
+    @GetMapping()
+    public ApiResult<List<CreditMpCustomer>> list(CreditMpCustomerParam param) {
+        // 使用关联查询
+        return success(creditMpCustomerService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:list')")
+    @Operation(summary = "根据id查询小程序端客户")
+    @GetMapping("/{id}")
+    public ApiResult<CreditMpCustomer> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(creditMpCustomerService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:save')")
+    @OperationLog
+    @Operation(summary = "添加小程序端客户")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody CreditMpCustomer creditMpCustomer) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+         creditMpCustomer.setUserId(loginUser.getUserId());
+        }
+        if (creditMpCustomerService.save(creditMpCustomer)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:update')")
+    @OperationLog
+    @Operation(summary = "修改小程序端客户")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody CreditMpCustomer creditMpCustomer) {
+        if (creditMpCustomerService.updateById(creditMpCustomer)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:remove')")
+    @OperationLog
+    @Operation(summary = "删除小程序端客户")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (creditMpCustomerService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:save')")
+    @OperationLog
+    @Operation(summary = "批量添加小程序端客户")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<CreditMpCustomer> list) {
+        if (creditMpCustomerService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:update')")
+    @OperationLog
+    @Operation(summary = "批量修改小程序端客户")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<CreditMpCustomer> batchParam) {
+        if (batchParam.update(creditMpCustomerService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:remove')")
+    @OperationLog
+    @Operation(summary = "批量删除小程序端客户")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (creditMpCustomerService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:update')")
+    @OperationLog
+    @Operation(summary = "审核跟进步骤")
+    @PostMapping("/approve-follow-step")
+    public ApiResult<?> approveFollowStep(@RequestBody FollowStepApprovalDTO dto) {
+        creditMpCustomerService.approveFollowStep(dto);
+        return success("审核成功");
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:update')")
+    @OperationLog
+    @Operation(summary = "批量审核跟进步骤")
+    @PostMapping("/batch-approve-follow-steps")
+    public ApiResult<?> batchApproveFollowSteps(@RequestBody BatchFollowStepApprovalDTO dto) {
+        creditMpCustomerService.batchApproveFollowSteps(dto);
+        return success("批量审核成功");
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:list')")
+    @Operation(summary = "获取待审核的跟进步骤")
+    @GetMapping("/pending-approval-steps")
+    public ApiResult<List<PendingApprovalStepVO>> getPendingApprovalSteps(FollowStepQueryDTO query) {
+        List<PendingApprovalStepVO> list = creditMpCustomerService.getPendingApprovalSteps(query);
+        return success(list);
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:list')")
+    @Operation(summary = "获取客户跟进统计")
+    @GetMapping("/follow-statistics/{customerId}")
+    public ApiResult<FollowStatisticsDTO> getFollowStatistics(@PathVariable Long customerId) {
+        FollowStatisticsDTO statistics = creditMpCustomerService.getFollowStatistics(customerId);
+        return success(statistics);
+    }
+
+    @PreAuthorize("hasAuthority('credit:creditMpCustomer:update')")
+    @OperationLog
+    @Operation(summary = "结束客户跟进流程")
+    @PostMapping("/end-follow-process")
+    public ApiResult<?> endFollowProcess(@RequestBody EndFollowProcessDTO dto) {
+        creditMpCustomerService.endFollowProcess(dto);
+        return success("流程结束成功");
+    }
+
+}

src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java

@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditNearbyCompany;
 import com.gxwebsoft.credit.param.CreditNearbyCompanyImportParam;
 import com.gxwebsoft.credit.param.CreditNearbyCompanyParam;
@@ -104,7 +105,7 @@ public class CreditNearbyCompanyController extends BaseController {
     @Operation(summary = "删除附近企业")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditNearbyCompanyService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditNearbyCompany.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +138,7 @@ public class CreditNearbyCompanyController extends BaseController {
     @Operation(summary = "批量删除附近企业")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditNearbyCompanyService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditNearbyCompany.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -170,6 +171,7 @@ public class CreditNearbyCompanyController extends BaseController {
             CreditNearbyCompany::getName,
             CreditNearbyCompany::getCompanyId,
             CreditNearbyCompany::setCompanyId,
+            CreditNearbyCompany::setCompanyName,
             CreditNearbyCompany::getHasData,
             CreditNearbyCompany::setHasData,
             CreditNearbyCompany::getTenantId,
@@ -213,6 +215,11 @@ public class CreditNearbyCompanyController extends BaseController {
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByCode = ExcelImportSupport.readHyperlinksByHeaderKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "统一社会信用代码");
             Map<String, String> urlByName = ExcelImportSupport.readHyperlinksByHeaderKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "企业名称");
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             // 避免逐行写库：按批处理，显著降低 SQL 次数与事务开销
             final int chunkSize = 500;
@@ -243,6 +250,9 @@ public class CreditNearbyCompanyController extends BaseController {
                     }
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getCompanyId() != null && item.getCompanyId() > 0) {
                         touchedCompanyIds.add(item.getCompanyId());
@@ -308,58 +318,22 @@ public class CreditNearbyCompanyController extends BaseController {
                                    Integer tenantId,
                                    int mpBatchSize,
                                    List<String> errorMessages) {
-        return batchImportSupport.persistChunkWithFallback(
+        return batchImportSupport.persistInsertOnlyChunk(
+            creditNearbyCompanyService,
             items,
             excelRowNumbers,
-            () -> batchImportSupport.upsertByCodeOrName(
+            mpBatchSize,
-                creditNearbyCompanyService,
+            it -> {
-                items,
+                if (it == null) {
-                CreditNearbyCompany::getId,
+                    return null;
-                CreditNearbyCompany::setId,
-                CreditNearbyCompany::getCode,
-                CreditNearbyCompany::getCode,
-                CreditNearbyCompany::getName,
-                CreditNearbyCompany::getName,
-                wrapper -> {
-                    if (companyId != null) {
-                        wrapper.eq(CreditNearbyCompany::getCompanyId, companyId);
-                    }
-                    if (parentId != null) {
-                        wrapper.eq(CreditNearbyCompany::getParentId, parentId);
-                    }
-                    if (type != null) {
-                        wrapper.eq(CreditNearbyCompany::getType, type);
-                    }
-                    if (tenantId != null) {
-                        wrapper.eq(CreditNearbyCompany::getTenantId, tenantId);
-                    }
-                },
-                mpBatchSize
-            ),
-            (item, excelRowNumber) -> {
-                boolean saved = creditNearbyCompanyService.save(item);
-                if (!saved) {
-                    CreditNearbyCompany existing = creditNearbyCompanyService.lambdaQuery()
-                        .eq(!ImportHelper.isBlank(item.getCode()), CreditNearbyCompany::getCode, item.getCode())
-                        .eq(ImportHelper.isBlank(item.getCode()), CreditNearbyCompany::getName, item.getName())
-                        .eq(item.getCompanyId() != null, CreditNearbyCompany::getCompanyId, item.getCompanyId())
-                        .eq(item.getParentId() != null, CreditNearbyCompany::getParentId, item.getParentId())
-                        .eq(item.getType() != null, CreditNearbyCompany::getType, item.getType())
-                        .eq(item.getTenantId() != null, CreditNearbyCompany::getTenantId, item.getTenantId())
-                        .one();
-                    if (existing != null) {
-                        item.setId(existing.getId());
-                        if (creditNearbyCompanyService.updateById(item)) {
-                            return true;
-                        }
-                    }
-                } else {
-                    return true;
                 }
-                String prefix = excelRowNumber > 0 ? ("第" + excelRowNumber + "行：") : "";
+                String code = it.getCode();
-                errorMessages.add(prefix + "保存失败");
+                if (code != null && !code.trim().isEmpty()) {
-                return false;
+                    return code;
+                }
+                return it.getName();
             },
+            "",
             errorMessages
         );
     }
@@ -444,7 +418,6 @@ public class CreditNearbyCompanyController extends BaseController {
         entity.setRegistrationStatus(param.getRegistrationStatus());
         entity.setLegalPerson(param.getLegalPerson());
         entity.setRegisteredCapital(param.getRegisteredCapital());
-        entity.setPaidinCapital(param.getPaidinCapital());
         entity.setEstablishDate(param.getEstablishDate());
         entity.setCode(param.getCode());
         entity.setAddress(param.getAddress());
@@ -453,21 +426,35 @@ public class CreditNearbyCompanyController extends BaseController {
         entity.setProvince(param.getProvince());
         entity.setCity(param.getCity());
         entity.setRegion(param.getRegion());
+        entity.setTaxpayerCode(param.getTaxpayerCode());
+        entity.setRegistrationNumber(param.getRegistrationNumber());
+        entity.setOrganizationalCode(param.getOrganizationalCode());
+        entity.setNumberOfInsuredPersons(param.getNumberOfInsuredPersons());
+        entity.setAnnualReport(param.getAnnualReport());
         entity.setDomain(param.getDomain());
+        entity.setBusinessTerm(param.getBusinessTerm());
+        entity.setNationalStandardIndustryCategories(param.getNationalStandardIndustryCategories());
+        entity.setNationalStandardIndustryCategories2(param.getNationalStandardIndustryCategories2());
+        entity.setNationalStandardIndustryCategories3(param.getNationalStandardIndustryCategories3());
+        entity.setNationalStandardIndustryCategories4(param.getNationalStandardIndustryCategories4());
+        entity.setFormerName(param.getFormerName());
+        entity.setEnglishName(param.getEnglishName());
+        entity.setMailingAddress(param.getMailingAddress());
+        entity.setMailingEmail(param.getMailingEmail());
+        entity.setTel(param.getTel());
+        entity.setPostalCode(param.getPostalCode());
+        entity.setNationalStandardIndustryCategories5(param.getNationalStandardIndustryCategories5());
+        entity.setNationalStandardIndustryCategories6(param.getNationalStandardIndustryCategories6());
+        entity.setNationalStandardIndustryCategories7(param.getNationalStandardIndustryCategories7());
+        entity.setNationalStandardIndustryCategories8(param.getNationalStandardIndustryCategories8());
+        entity.setType(param.getType());
         entity.setInstitutionType(param.getInstitutionType());
         entity.setCompanySize(param.getCompanySize());
-        entity.setRegistrationAuthority(param.getRegistrationAuthority());
-        entity.setTaxpayerQualification(param.getTaxpayerQualification());
-        entity.setLatestAnnualReportYear(param.getLatestAnnualReportYear());
-        entity.setLatestAnnualReportOnOperatingRevenue(param.getLatestAnnualReportOnOperatingRevenue());
-        entity.setEnterpriseScoreCheck(param.getEnterpriseScoreCheck());
-        entity.setCreditRating(param.getCreditRating());
-        entity.setCechnologyScore(param.getCechnologyScore());
-        entity.setCechnologyLevel(param.getCechnologyLevel());
-        entity.setSmallEnterprise(param.getSmallEnterprise());
         entity.setCompanyProfile(param.getCompanyProfile());
         entity.setNatureOfBusiness(param.getNatureOfBusiness());
         entity.setComments(param.getComments());
+        entity.setMoreEmail(param.getMoreEmail());
+        entity.setMoreTel(param.getMoreTel());
 
         return entity;
     }

src/main/java/com/gxwebsoft/credit/controller/CreditPatentController.java

@@ -104,7 +104,7 @@ public class CreditPatentController extends BaseController {
     @Operation(summary = "删除专利")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditPatentService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditPatent.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +137,7 @@ public class CreditPatentController extends BaseController {
     @Operation(summary = "批量删除专利")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditPatentService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditPatent.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -195,8 +195,13 @@ public class CreditPatentController extends BaseController {
         Set<Integer> touchedCompanyIds = new HashSet<>();
 
         try {
-            ExcelImportSupport.ImportResult<CreditPatentImportParam> importResult = ExcelImportSupport.readAnySheet(
+            // 单企业表通常是多 sheet，专利页签名一般为“专利”
-                file, CreditPatentImportParam.class, this::isEmptyImportRow);
+            int preferredSheetIndex = ExcelImportSupport.findSheetIndex(file, "专利", 0);
+            ExcelImportSupport.ImportResult<CreditPatentImportParam> importResult = ExcelImportSupport.read(
+                file, CreditPatentImportParam.class, this::isEmptyImportRow, preferredSheetIndex);
+            if (CollectionUtils.isEmpty(importResult.getData())) {
+                importResult = ExcelImportSupport.readAnySheet(file, CreditPatentImportParam.class, this::isEmptyImportRow);
+            }
             List<CreditPatentImportParam> list = importResult.getData();
             int usedTitleRows = importResult.getTitleRows();
             int usedHeadRows = importResult.getHeadRows();
@@ -264,38 +269,13 @@ public class CreditPatentController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditPatentService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditPatentService,
+                            CreditPatent::getRegisterNo,
-                                chunkItems,
+                            "",
-                                CreditPatent::getId,
-                                CreditPatent::setId,
-                                CreditPatent::getRegisterNo,
-                                CreditPatent::getRegisterNo,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditPatentService.save(rowItem);
-                                if (!saved) {
-                                    CreditPatent existing = creditPatentService.lambdaQuery()
-                                        .eq(CreditPatent::getRegisterNo, rowItem.getRegisterNo())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditPatentService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -309,38 +289,13 @@ public class CreditPatentController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditPatentService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditPatentService,
+                    CreditPatent::getRegisterNo,
-                        chunkItems,
+                    "",
-                        CreditPatent::getId,
-                        CreditPatent::setId,
-                        CreditPatent::getRegisterNo,
-                        CreditPatent::getRegisterNo,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditPatentService.save(rowItem);
-                        if (!saved) {
-                            CreditPatent existing = creditPatentService.lambdaQuery()
-                                .eq(CreditPatent::getRegisterNo, rowItem.getRegisterNo())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditPatentService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -395,7 +350,16 @@ public class CreditPatentController extends BaseController {
         if (isImportHeaderRow(param)) {
             return true;
         }
-        return ImportHelper.isBlank(param.getPublicNo());
+        return ImportHelper.isBlank(param.getName())
+            && ImportHelper.isBlank(param.getType())
+            && ImportHelper.isBlank(param.getStatusText())
+            && ImportHelper.isBlank(param.getRegisterNo())
+            && ImportHelper.isBlank(param.getRegisterDate())
+            && ImportHelper.isBlank(param.getPublicNo())
+            && ImportHelper.isBlank(param.getPublicDate())
+            && ImportHelper.isBlank(param.getInventor())
+            && ImportHelper.isBlank(param.getPatentApplicant())
+            && ImportHelper.isBlank(param.getComments());
     }
 
     private boolean isImportHeaderRow(CreditPatentImportParam param) {

src/main/java/com/gxwebsoft/credit/controller/CreditRiskRelationController.java

@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditRiskRelation;
 import com.gxwebsoft.credit.param.CreditRiskRelationImportParam;
 import com.gxwebsoft.credit.param.CreditRiskRelationParam;
@@ -104,7 +105,7 @@ public class CreditRiskRelationController extends BaseController {
     @Operation(summary = "删除风险关系表")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditRiskRelationService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditRiskRelation.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +138,7 @@ public class CreditRiskRelationController extends BaseController {
     @Operation(summary = "批量删除风险关系表")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditRiskRelationService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditRiskRelation.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -170,6 +171,7 @@ public class CreditRiskRelationController extends BaseController {
             CreditRiskRelation::getMainBodyName,
             CreditRiskRelation::getCompanyId,
             CreditRiskRelation::setCompanyId,
+            CreditRiskRelation::setCompanyName,
             CreditRiskRelation::getHasData,
             CreditRiskRelation::setHasData,
             CreditRiskRelation::getTenantId,
@@ -209,6 +211,11 @@ public class CreditRiskRelationController extends BaseController {
             User loginUser = getLoginUser();
             Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             final int chunkSize = 500;
             final int mpBatchSize = 500;
@@ -222,6 +229,9 @@ public class CreditRiskRelationController extends BaseController {
 
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getUserId() == null && currentUserId != null) {
                         item.setUserId(currentUserId);
@@ -252,38 +262,13 @@ public class CreditRiskRelationController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditRiskRelationService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditRiskRelationService,
+                            CreditRiskRelation::getMainBodyName,
-                                chunkItems,
+                            "",
-                                CreditRiskRelation::getId,
-                                CreditRiskRelation::setId,
-                                CreditRiskRelation::getMainBodyName,
-                                CreditRiskRelation::getMainBodyName,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditRiskRelationService.save(rowItem);
-                                if (!saved) {
-                                    CreditRiskRelation existing = creditRiskRelationService.lambdaQuery()
-                                        .eq(CreditRiskRelation::getMainBodyName, rowItem.getMainBodyName())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditRiskRelationService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -297,38 +282,13 @@ public class CreditRiskRelationController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditRiskRelationService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditRiskRelationService,
+                    CreditRiskRelation::getMainBodyName,
-                        chunkItems,
+                    "",
-                        CreditRiskRelation::getId,
-                        CreditRiskRelation::setId,
-                        CreditRiskRelation::getMainBodyName,
-                        CreditRiskRelation::getMainBodyName,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditRiskRelationService.save(rowItem);
-                        if (!saved) {
-                            CreditRiskRelation existing = creditRiskRelationService.lambdaQuery()
-                                .eq(CreditRiskRelation::getMainBodyName, rowItem.getMainBodyName())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditRiskRelationService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditSupplierController.java

@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditSupplier;
 import com.gxwebsoft.credit.param.CreditSupplierImportParam;
 import com.gxwebsoft.credit.param.CreditSupplierParam;
@@ -104,7 +105,7 @@ public class CreditSupplierController extends BaseController {
     @Operation(summary = "删除供应商")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditSupplierService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditSupplier.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +138,7 @@ public class CreditSupplierController extends BaseController {
     @Operation(summary = "批量删除供应商")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditSupplierService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditSupplier.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -170,6 +171,7 @@ public class CreditSupplierController extends BaseController {
             CreditSupplier::getSupplier,
             CreditSupplier::getCompanyId,
             CreditSupplier::setCompanyId,
+            CreditSupplier::setCompanyName,
             CreditSupplier::getHasData,
             CreditSupplier::setHasData,
             CreditSupplier::getTenantId,
@@ -211,6 +213,11 @@ public class CreditSupplierController extends BaseController {
             Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlBySupplier = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "供应商");
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             final int chunkSize = 500;
             final int mpBatchSize = 500;
@@ -230,6 +237,9 @@ public class CreditSupplierController extends BaseController {
 
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getUserId() == null && currentUserId != null) {
                         item.setUserId(currentUserId);
@@ -260,38 +270,13 @@ public class CreditSupplierController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditSupplierService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditSupplierService,
+                            CreditSupplier::getSupplier,
-                                chunkItems,
+                            "",
-                                CreditSupplier::getId,
-                                CreditSupplier::setId,
-                                CreditSupplier::getSupplier,
-                                CreditSupplier::getSupplier,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditSupplierService.save(rowItem);
-                                if (!saved) {
-                                    CreditSupplier existing = creditSupplierService.lambdaQuery()
-                                        .eq(CreditSupplier::getSupplier, rowItem.getSupplier())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditSupplierService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -305,38 +290,13 @@ public class CreditSupplierController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditSupplierService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditSupplierService,
+                    CreditSupplier::getSupplier,
-                        chunkItems,
+                    "",
-                        CreditSupplier::getId,
-                        CreditSupplier::setId,
-                        CreditSupplier::getSupplier,
-                        CreditSupplier::getSupplier,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditSupplierService.save(rowItem);
-                        if (!saved) {
-                            CreditSupplier existing = creditSupplierService.lambdaQuery()
-                                .eq(CreditSupplier::getSupplier, rowItem.getSupplier())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditSupplierService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditSuspectedRelationshipController.java

@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditSuspectedRelationship;
 import com.gxwebsoft.credit.param.CreditSuspectedRelationshipImportParam;
 import com.gxwebsoft.credit.param.CreditSuspectedRelationshipParam;
@@ -104,7 +105,7 @@ public class CreditSuspectedRelationshipController extends BaseController {
     @Operation(summary = "删除疑似关系")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditSuspectedRelationshipService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditSuspectedRelationship.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -137,7 +138,7 @@ public class CreditSuspectedRelationshipController extends BaseController {
     @Operation(summary = "批量删除疑似关系")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditSuspectedRelationshipService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditSuspectedRelationship.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -170,6 +171,7 @@ public class CreditSuspectedRelationshipController extends BaseController {
             CreditSuspectedRelationship::getName,
             CreditSuspectedRelationship::getCompanyId,
             CreditSuspectedRelationship::setCompanyId,
+            CreditSuspectedRelationship::setCompanyName,
             CreditSuspectedRelationship::getHasData,
             CreditSuspectedRelationship::setHasData,
             CreditSuspectedRelationship::getTenantId,
@@ -210,6 +212,11 @@ public class CreditSuspectedRelationshipController extends BaseController {
             Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByName = ExcelImportSupport.readHyperlinksByHeaderKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "企业名称");
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             final int chunkSize = 500;
             final int mpBatchSize = 500;
@@ -229,6 +236,9 @@ public class CreditSuspectedRelationshipController extends BaseController {
 
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getUserId() == null && currentUserId != null) {
                         item.setUserId(currentUserId);
@@ -263,99 +273,29 @@ public class CreditSuspectedRelationshipController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditSuspectedRelationshipService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> {
+                            mpBatchSize,
-                                List<String> names = new ArrayList<>(chunkItems.size());
+                            it -> {
-                                List<String> relatedParties = new ArrayList<>(chunkItems.size());
+                                if (it == null) {
-                                for (CreditSuspectedRelationship it : chunkItems) {
+                                    return null;
-                                    if (it == null) {
-                                        continue;
-                                    }
-                                    if (!ImportHelper.isBlank(it.getName())) {
-                                        names.add(it.getName().trim());
-                                    }
-                                    if (!ImportHelper.isBlank(it.getRelatedParty())) {
-                                        relatedParties.add(it.getRelatedParty().trim());
-                                    }
                                 }
-
+                                String n = it.getName();
-                                List<CreditSuspectedRelationship> existingList = (names.isEmpty() || relatedParties.isEmpty())
+                                String r = it.getRelatedParty();
-                                    ? new ArrayList<>()
+                                if (n != null) {
-                                    : creditSuspectedRelationshipService.lambdaQuery()
+                                    n = n.trim();
-                                    .in(CreditSuspectedRelationship::getName, names)
-                                    .in(CreditSuspectedRelationship::getRelatedParty, relatedParties)
-                                    .list();
-
-                                java.util.Map<String, CreditSuspectedRelationship> byNameRelated = new java.util.HashMap<>();
-                                java.util.Map<String, CreditSuspectedRelationship> byNameRelatedType = new java.util.HashMap<>();
-                                for (CreditSuspectedRelationship existing : existingList) {
-                                    if (existing == null
-                                        || ImportHelper.isBlank(existing.getName())
-                                        || ImportHelper.isBlank(existing.getRelatedParty())) {
-                                        continue;
-                                    }
-                                    String n = existing.getName().trim();
-                                    String r = existing.getRelatedParty().trim();
-                                    byNameRelated.putIfAbsent(n + "|" + r, existing);
-                                    if (!ImportHelper.isBlank(existing.getType())) {
-                                        byNameRelatedType.putIfAbsent(n + "|" + r + "|" + existing.getType().trim(), existing);
-                                    }
                                 }
-
+                                if (r != null) {
-                                List<CreditSuspectedRelationship> updates = new ArrayList<>();
+                                    r = r.trim();
-                                List<CreditSuspectedRelationship> inserts = new ArrayList<>();
-                                for (CreditSuspectedRelationship it : chunkItems) {
-                                    if (it == null
-                                        || ImportHelper.isBlank(it.getName())
-                                        || ImportHelper.isBlank(it.getRelatedParty())) {
-                                        continue;
-                                    }
-                                    String n = it.getName().trim();
-                                    String r = it.getRelatedParty().trim();
-                                    CreditSuspectedRelationship existing;
-                                    if (!ImportHelper.isBlank(it.getType())) {
-                                        existing = byNameRelatedType.get(n + "|" + r + "|" + it.getType().trim());
-                                    } else {
-                                        existing = byNameRelated.get(n + "|" + r);
-                                    }
-                                    if (existing != null) {
-                                        it.setId(existing.getId());
-                                        updates.add(it);
-                                    } else {
-                                        inserts.add(it);
-                                    }
                                 }
-                                if (!updates.isEmpty()) {
+                                if (n != null && !n.isEmpty() && r != null && !r.isEmpty()) {
-                                    creditSuspectedRelationshipService.updateBatchById(updates, mpBatchSize);
+                                    return n + "->" + r;
                                 }
-                                if (!inserts.isEmpty()) {
+                                return n;
-                                    creditSuspectedRelationshipService.saveBatch(inserts, mpBatchSize);
-                                }
-                                return updates.size() + inserts.size();
-                            },
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditSuspectedRelationshipService.save(rowItem);
-                                if (!saved) {
-                                    CreditSuspectedRelationship existing = creditSuspectedRelationshipService.lambdaQuery()
-                                        .eq(CreditSuspectedRelationship::getName, rowItem.getName())
-                                        .eq(CreditSuspectedRelationship::getRelatedParty, rowItem.getRelatedParty())
-                                        .eq(!ImportHelper.isBlank(rowItem.getType()), CreditSuspectedRelationship::getType, rowItem.getType())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditSuspectedRelationshipService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
                             },
+                            "",
                             errorMessages
                         );
                         chunkItems.clear();
@@ -369,99 +309,29 @@ public class CreditSuspectedRelationshipController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditSuspectedRelationshipService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> {
+                    mpBatchSize,
-                        List<String> names = new ArrayList<>(chunkItems.size());
+                    it -> {
-                        List<String> relatedParties = new ArrayList<>(chunkItems.size());
+                        if (it == null) {
-                        for (CreditSuspectedRelationship it : chunkItems) {
+                            return null;
-                            if (it == null) {
-                                continue;
-                            }
-                            if (!ImportHelper.isBlank(it.getName())) {
-                                names.add(it.getName().trim());
-                            }
-                            if (!ImportHelper.isBlank(it.getRelatedParty())) {
-                                relatedParties.add(it.getRelatedParty().trim());
-                            }
                         }
-
+                        String n = it.getName();
-                        List<CreditSuspectedRelationship> existingList = (names.isEmpty() || relatedParties.isEmpty())
+                        String r = it.getRelatedParty();
-                            ? new ArrayList<>()
+                        if (n != null) {
-                            : creditSuspectedRelationshipService.lambdaQuery()
+                            n = n.trim();
-                            .in(CreditSuspectedRelationship::getName, names)
-                            .in(CreditSuspectedRelationship::getRelatedParty, relatedParties)
-                            .list();
-
-                        java.util.Map<String, CreditSuspectedRelationship> byNameRelated = new java.util.HashMap<>();
-                        java.util.Map<String, CreditSuspectedRelationship> byNameRelatedType = new java.util.HashMap<>();
-                        for (CreditSuspectedRelationship existing : existingList) {
-                            if (existing == null
-                                || ImportHelper.isBlank(existing.getName())
-                                || ImportHelper.isBlank(existing.getRelatedParty())) {
-                                continue;
-                            }
-                            String n = existing.getName().trim();
-                            String r = existing.getRelatedParty().trim();
-                            byNameRelated.putIfAbsent(n + "|" + r, existing);
-                            if (!ImportHelper.isBlank(existing.getType())) {
-                                byNameRelatedType.putIfAbsent(n + "|" + r + "|" + existing.getType().trim(), existing);
-                            }
                         }
-
+                        if (r != null) {
-                        List<CreditSuspectedRelationship> updates = new ArrayList<>();
+                            r = r.trim();
-                        List<CreditSuspectedRelationship> inserts = new ArrayList<>();
-                        for (CreditSuspectedRelationship it : chunkItems) {
-                            if (it == null
-                                || ImportHelper.isBlank(it.getName())
-                                || ImportHelper.isBlank(it.getRelatedParty())) {
-                                continue;
-                            }
-                            String n = it.getName().trim();
-                            String r = it.getRelatedParty().trim();
-                            CreditSuspectedRelationship existing;
-                            if (!ImportHelper.isBlank(it.getType())) {
-                                existing = byNameRelatedType.get(n + "|" + r + "|" + it.getType().trim());
-                            } else {
-                                existing = byNameRelated.get(n + "|" + r);
-                            }
-                            if (existing != null) {
-                                it.setId(existing.getId());
-                                updates.add(it);
-                            } else {
-                                inserts.add(it);
-                            }
                         }
-                        if (!updates.isEmpty()) {
+                        if (n != null && !n.isEmpty() && r != null && !r.isEmpty()) {
-                            creditSuspectedRelationshipService.updateBatchById(updates, mpBatchSize);
+                            return n + "->" + r;
                         }
-                        if (!inserts.isEmpty()) {
+                        return n;
-                            creditSuspectedRelationshipService.saveBatch(inserts, mpBatchSize);
-                        }
-                        return updates.size() + inserts.size();
-                    },
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditSuspectedRelationshipService.save(rowItem);
-                        if (!saved) {
-                            CreditSuspectedRelationship existing = creditSuspectedRelationshipService.lambdaQuery()
-                                .eq(CreditSuspectedRelationship::getName, rowItem.getName())
-                                .eq(CreditSuspectedRelationship::getRelatedParty, rowItem.getRelatedParty())
-                                .eq(!ImportHelper.isBlank(rowItem.getType()), CreditSuspectedRelationship::getType, rowItem.getType())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditSuspectedRelationshipService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
                     },
+                    "",
                     errorMessages
                 );
             }

src/main/java/com/gxwebsoft/credit/controller/CreditUserController.java

@@ -1,16 +1,14 @@
 package com.gxwebsoft.credit.controller;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.core.web.ApiResult;
 import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.credit.entity.CreditCompany;
 import com.gxwebsoft.credit.entity.CreditUser;
 import com.gxwebsoft.credit.param.CreditUserImportParam;
 import com.gxwebsoft.credit.param.CreditUserParam;
@@ -25,7 +23,6 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -34,7 +31,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -115,7 +111,7 @@ public class CreditUserController extends BaseController {
     @Operation(summary = "删除招投标信息表")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditUserService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditUser.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -148,7 +144,7 @@ public class CreditUserController extends BaseController {
     @Operation(summary = "批量删除招投标信息表")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditUserService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditUser.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -181,6 +177,7 @@ public class CreditUserController extends BaseController {
             CreditUser::getWinningName,
             CreditUser::getCompanyId,
             CreditUser::setCompanyId,
+            CreditUser::setCompanyName,
             CreditUser::getHasData,
             CreditUser::setHasData,
             CreditUser::getTenantId,
@@ -208,19 +205,11 @@ public class CreditUserController extends BaseController {
 
         try {
             int sheetIndex = ExcelImportSupport.findSheetIndex(file, "招投标", 0);
-            List<CreditUserImportParam> list = null;
+            ExcelImportSupport.ImportResult<CreditUserImportParam> importResult =
-            int usedTitleRows = 0;
+                ExcelImportSupport.read(file, CreditUserImportParam.class, this::isEmptyImportRow, sheetIndex);
-            int usedHeadRows = 0;
+            List<CreditUserImportParam> list = importResult.getData();
-            int[][] tryConfigs = new int[][]{{1, 1}, {0, 1}, {0, 2}, {0, 3}};
+            int usedTitleRows = importResult.getTitleRows();
-
+            int usedHeadRows = importResult.getHeadRows();
-            for (int[] config : tryConfigs) {
-                list = filterEmptyRows(tryImport(file, config[0], config[1], sheetIndex));
-                if (!CollectionUtils.isEmpty(list)) {
-                    usedTitleRows = config[0];
-                    usedHeadRows = config[1];
-                    break;
-                }
-            }
             if (CollectionUtils.isEmpty(list)) {
                 return fail("未读取到数据，请确认模板表头与示例格式一致", null);
             }
@@ -229,6 +218,11 @@ public class CreditUserController extends BaseController {
             Integer currentUserId = loginUser != null ? loginUser.getUserId() : null;
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<Integer, String> urlMap = readNameHyperlinks(file, sheetIndex, usedTitleRows, usedHeadRows);
+            String fixedCompanyName = null;
+            if (companyId != null && companyId > 0) {
+                CreditCompany fixedCompany = creditCompanyService.getById(companyId);
+                fixedCompanyName = fixedCompany != null ? fixedCompany.getName() : null;
+            }
 
             final int chunkSize = 500;
             final int mpBatchSize = 500;
@@ -246,6 +240,9 @@ public class CreditUserController extends BaseController {
                     }
                     if (item.getCompanyId() == null && companyId != null) {
                         item.setCompanyId(companyId);
+                        if (ImportHelper.isBlank(item.getCompanyName()) && !ImportHelper.isBlank(fixedCompanyName)) {
+                            item.setCompanyName(fixedCompanyName);
+                        }
                     }
                     if (item.getCompanyId() != null && item.getCompanyId() > 0) {
                         touchedCompanyIds.add(item.getCompanyId());
@@ -280,35 +277,13 @@ public class CreditUserController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditUserService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditUserService,
+                            CreditUser::getName,
-                                chunkItems,
+                            "",
-                                CreditUser::getId,
-                                CreditUser::setId,
-                                CreditUser::getName,
-                                CreditUser::getName,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditUserService.save(rowItem);
-                                if (!saved) {
-                                    CreditUser existing = creditUserService.getByName(rowItem.getName());
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditUserService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                errorMessages.add("第" + rowNumber + "行：保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -322,35 +297,13 @@ public class CreditUserController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditUserService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditUserService,
+                    CreditUser::getName,
-                        chunkItems,
+                    "",
-                        CreditUser::getId,
-                        CreditUser::setId,
-                        CreditUser::getName,
-                        CreditUser::getName,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditUserService.save(rowItem);
-                        if (!saved) {
-                            CreditUser existing = creditUserService.getByName(rowItem.getName());
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditUserService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        errorMessages.add("第" + rowNumber + "行：保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -401,15 +354,6 @@ public class CreditUserController extends BaseController {
         workbook.close();
     }
 
-    private List<CreditUserImportParam> tryImport(MultipartFile file, int titleRows, int headRows, int sheetIndex) throws Exception {
-        ImportParams importParams = new ImportParams();
-        importParams.setTitleRows(titleRows);
-        importParams.setHeadRows(headRows);
-        importParams.setStartSheetIndex(sheetIndex);
-        importParams.setSheetNum(1);
-        return ExcelImportUtil.importExcel(file.getInputStream(), CreditUserImportParam.class, importParams);
-    }
-
     /**
      * 读取“项目名称”列的超链接，按数据行顺序返回。
      */
@@ -426,7 +370,7 @@ public class CreditUserController extends BaseController {
             if (headerRow != null) {
                 for (int c = headerRow.getFirstCellNum(); c < headerRow.getLastCellNum(); c++) {
                     Cell cell = headerRow.getCell(c);
-                    if (cell != null && "项目名称".equals(cell.getStringCellValue())) {
+                    if (cell != null && "项目名称".equals(normalizeHeaderText(cell.getStringCellValue()))) {
                         nameColIndex = c;
                         break;
                     }
@@ -451,14 +395,20 @@ public class CreditUserController extends BaseController {
     }
 
     /**
-     * 过滤掉完全空白的导入行，避免空行导致导入失败
+     * 用于表头匹配：仅做最常见的空白字符规整（避免表头中存在换行/空格导致无法定位列）。
      */
-    private List<CreditUserImportParam> filterEmptyRows(List<CreditUserImportParam> rawList) {
+    private static String normalizeHeaderText(String text) {
-        if (CollectionUtils.isEmpty(rawList)) {
+        if (text == null) {
-            return rawList;
+            return "";
         }
-        rawList.removeIf(this::isEmptyImportRow);
+        return text
-        return rawList;
+            .replace(" ", "")
+            .replace("\t", "")
+            .replace("\r", "")
+            .replace("\n", "")
+            .replace("\u00A0", "")
+            .replace("　", "")
+            .trim();
     }
 
     private boolean isEmptyImportRow(CreditUserImportParam param) {
@@ -492,6 +442,7 @@ public class CreditUserController extends BaseController {
         entity.setRole(param.getRole());
         entity.setInfoType(param.getInfoType());
         entity.setAddress(param.getAddress());
+        entity.setPlaintiffAppellant(param.getPlaintiffAppellant());
         entity.setProcurementName(param.getProcurementName());
         entity.setWinningName(param.getWinningName());
         entity.setWinningPrice(param.getWinningPrice());

src/main/java/com/gxwebsoft/credit/controller/CreditXgxfController.java

@@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -105,7 +104,7 @@ public class CreditXgxfController extends BaseController {
     @Operation(summary = "删除限制高消费")
     @DeleteMapping("/{id}")
     public ApiResult<?> remove(@PathVariable("id") Integer id) {
-        if (creditXgxfService.removeById(id)) {
+        if (batchImportSupport.hardRemoveById(CreditXgxf.class, id)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -138,7 +137,7 @@ public class CreditXgxfController extends BaseController {
     @Operation(summary = "批量删除限制高消费")
     @DeleteMapping("/batch")
     public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
-        if (creditXgxfService.removeByIds(ids)) {
+        if (batchImportSupport.hardRemoveByIds(CreditXgxf.class, ids)) {
             return success("删除成功");
         }
         return fail("删除失败");
@@ -160,7 +159,9 @@ public class CreditXgxfController extends BaseController {
         User loginUser = getLoginUser();
         Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
 
-        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyName(
+        // Party columns may contain multiple roles/names; match if any company name is contained in the text.
+        // Priority: 原告/上诉人 > 被告/被上诉人 > 其他当事人/第三人
+        BatchImportSupport.CompanyIdRefreshStats stats = batchImportSupport.refreshCompanyIdByCompanyNameContainedInText(
             creditXgxfService,
             creditCompanyService,
             currentTenantId,
@@ -168,13 +169,15 @@ public class CreditXgxfController extends BaseController {
             limit,
             CreditXgxf::getId,
             CreditXgxf::setId,
-            CreditXgxf::getDataType,
             CreditXgxf::getCompanyId,
             CreditXgxf::setCompanyId,
             CreditXgxf::getHasData,
             CreditXgxf::setHasData,
             CreditXgxf::getTenantId,
-            CreditXgxf::new
+            CreditXgxf::new,
+            CreditXgxf::getPlaintiffAppellant,
+            CreditXgxf::getAppellee,
+            CreditXgxf::getOtherPartiesThirdParty
         );
 
         if (!stats.anyDataRead) {
@@ -265,38 +268,13 @@ public class CreditXgxfController extends BaseController {
                     chunkItems.add(item);
                     chunkRowNumbers.add(excelRowNumber);
                     if (chunkItems.size() >= chunkSize) {
-                        successCount += batchImportSupport.persistChunkWithFallback(
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditXgxfService,
                             chunkItems,
                             chunkRowNumbers,
-                            () -> batchImportSupport.upsertBySingleKey(
+                            mpBatchSize,
-                                creditXgxfService,
+                            CreditXgxf::getCaseNumber,
-                                chunkItems,
+                            "",
-                                CreditXgxf::getId,
-                                CreditXgxf::setId,
-                                CreditXgxf::getCaseNumber,
-                                CreditXgxf::getCaseNumber,
-                                null,
-                                mpBatchSize
-                            ),
-                            (rowItem, rowNumber) -> {
-                                boolean saved = creditXgxfService.save(rowItem);
-                                if (!saved) {
-                                    CreditXgxf existing = creditXgxfService.lambdaQuery()
-                                        .eq(CreditXgxf::getCaseNumber, rowItem.getCaseNumber())
-                                        .one();
-                                    if (existing != null) {
-                                        rowItem.setId(existing.getId());
-                                        if (creditXgxfService.updateById(rowItem)) {
-                                            return true;
-                                        }
-                                    }
-                                } else {
-                                    return true;
-                                }
-                                String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                                errorMessages.add(prefix + "保存失败");
-                                return false;
-                            },
                             errorMessages
                         );
                         chunkItems.clear();
@@ -310,38 +288,13 @@ public class CreditXgxfController extends BaseController {
             }
 
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditXgxfService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKey(
+                    mpBatchSize,
-                        creditXgxfService,
+                    CreditXgxf::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditXgxf::getId,
-                        CreditXgxf::setId,
-                        CreditXgxf::getCaseNumber,
-                        CreditXgxf::getCaseNumber,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        boolean saved = creditXgxfService.save(rowItem);
-                        if (!saved) {
-                            CreditXgxf existing = creditXgxfService.lambdaQuery()
-                                .eq(CreditXgxf::getCaseNumber, rowItem.getCaseNumber())
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                if (creditXgxfService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -361,7 +314,7 @@ public class CreditXgxfController extends BaseController {
 
     /**
      * 批量导入历史限制高消费（仅解析“历史限制高消费”选项卡）
-     * 规则：案号相同则覆盖更新（recommend++ 记录更新次数）；案号不存在则插入。
+     * 规则：使用数据库唯一索引约束，重复数据不导入。
      */
     @PreAuthorize("hasAuthority('credit:creditXgxf:save')")
     @Operation(summary = "批量导入历史限制高消费司法大数据")
@@ -394,8 +347,10 @@ public class CreditXgxfController extends BaseController {
             Integer currentTenantId = loginUser != null ? loginUser.getTenantId() : null;
             Map<String, String> urlByCaseNumber = ExcelImportSupport.readUrlByKey(file, usedSheetIndex, usedTitleRows, usedHeadRows, "案号");
 
-            LinkedHashMap<String, CreditXgxf> latestByCaseNumber = new LinkedHashMap<>();
+            final int chunkSize = 500;
-            LinkedHashMap<String, Integer> latestRowByCaseNumber = new LinkedHashMap<>();
+            final int mpBatchSize = 500;
+            List<CreditXgxf> chunkItems = new ArrayList<>(chunkSize);
+            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
 
             for (int i = 0; i < list.size(); i++) {
                 CreditXgxfImportParam param = list.get(i);
@@ -433,121 +388,42 @@ public class CreditXgxfController extends BaseController {
                     // 历史导入的数据统一标记为“失效”
                     item.setDataStatus("失效");
 
-                    latestByCaseNumber.put(item.getCaseNumber(), item);
+                    if (item.getRecommend() == null) {
-                    latestRowByCaseNumber.put(item.getCaseNumber(), excelRowNumber);
+                        item.setRecommend(0);
+                    }
+                    if (item.getCompanyId() != null && item.getCompanyId() > 0) {
+                        touchedCompanyIds.add(item.getCompanyId());
+                    }
+
+                    chunkItems.add(item);
+                    chunkRowNumbers.add(excelRowNumber);
+                    if (chunkItems.size() >= chunkSize) {
+                        successCount += batchImportSupport.persistInsertOnlyChunk(
+                            creditXgxfService,
+                            chunkItems,
+                            chunkRowNumbers,
+                            mpBatchSize,
+                            CreditXgxf::getCaseNumber,
+                            "",
+                            errorMessages
+                        );
+                        chunkItems.clear();
+                        chunkRowNumbers.clear();
+                    }
                 } catch (Exception e) {
                     errorMessages.add("第" + excelRowNumber + "行：" + e.getMessage());
                     e.printStackTrace();
                 }
             }
 
-            if (latestByCaseNumber.isEmpty()) {
-                if (errorMessages.isEmpty()) {
-                    return fail("未读取到数据，请确认模板表头与示例格式一致", null);
-                }
-                return success("导入完成，成功0条，失败" + errorMessages.size() + "条", errorMessages);
-            }
-
-            final int chunkSize = 500;
-            final int mpBatchSize = 500;
-            List<CreditXgxf> chunkItems = new ArrayList<>(chunkSize);
-            List<Integer> chunkRowNumbers = new ArrayList<>(chunkSize);
-
-            for (Map.Entry<String, CreditXgxf> entry : latestByCaseNumber.entrySet()) {
-                String caseNumber = entry.getKey();
-                CreditXgxf item = entry.getValue();
-                Integer rowNo = latestRowByCaseNumber.get(caseNumber);
-                chunkItems.add(item);
-                chunkRowNumbers.add(rowNo != null ? rowNo : -1);
-                if (chunkItems.size() >= chunkSize) {
-                    successCount += batchImportSupport.persistChunkWithFallback(
-                        chunkItems,
-                        chunkRowNumbers,
-                        () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
-                            creditXgxfService,
-                            chunkItems,
-                            CreditXgxf::getId,
-                            CreditXgxf::setId,
-                            CreditXgxf::getCaseNumber,
-                            CreditXgxf::getCaseNumber,
-                            CreditXgxf::getRecommend,
-                            CreditXgxf::setRecommend,
-                            null,
-                            mpBatchSize
-                        ),
-                        (rowItem, rowNumber) -> {
-                            if (rowItem.getRecommend() == null) {
-                                rowItem.setRecommend(0);
-                            }
-                            boolean saved = creditXgxfService.save(rowItem);
-                            if (!saved) {
-                                CreditXgxf existing = creditXgxfService.lambdaQuery()
-                                    .eq(CreditXgxf::getCaseNumber, rowItem.getCaseNumber())
-                                    .select(CreditXgxf::getId, CreditXgxf::getRecommend)
-                                    .one();
-                                if (existing != null) {
-                                    rowItem.setId(existing.getId());
-                                    Integer old = existing.getRecommend();
-                                    rowItem.setRecommend(old == null ? 1 : old + 1);
-                                    if (creditXgxfService.updateById(rowItem)) {
-                                        return true;
-                                    }
-                                }
-                            } else {
-                                return true;
-                            }
-                            String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                            errorMessages.add(prefix + "保存失败");
-                            return false;
-                        },
-                        errorMessages
-                    );
-                    chunkItems.clear();
-                    chunkRowNumbers.clear();
-                }
-            }
-
             if (!chunkItems.isEmpty()) {
-                successCount += batchImportSupport.persistChunkWithFallback(
+                successCount += batchImportSupport.persistInsertOnlyChunk(
+                    creditXgxfService,
                     chunkItems,
                     chunkRowNumbers,
-                    () -> batchImportSupport.upsertBySingleKeyAndIncrementCounterOnUpdate(
+                    mpBatchSize,
-                        creditXgxfService,
+                    CreditXgxf::getCaseNumber,
-                        chunkItems,
+                    "",
-                        CreditXgxf::getId,
-                        CreditXgxf::setId,
-                        CreditXgxf::getCaseNumber,
-                        CreditXgxf::getCaseNumber,
-                        CreditXgxf::getRecommend,
-                        CreditXgxf::setRecommend,
-                        null,
-                        mpBatchSize
-                    ),
-                    (rowItem, rowNumber) -> {
-                        if (rowItem.getRecommend() == null) {
-                            rowItem.setRecommend(0);
-                        }
-                        boolean saved = creditXgxfService.save(rowItem);
-                        if (!saved) {
-                            CreditXgxf existing = creditXgxfService.lambdaQuery()
-                                .eq(CreditXgxf::getCaseNumber, rowItem.getCaseNumber())
-                                .select(CreditXgxf::getId, CreditXgxf::getRecommend)
-                                .one();
-                            if (existing != null) {
-                                rowItem.setId(existing.getId());
-                                Integer old = existing.getRecommend();
-                                rowItem.setRecommend(old == null ? 1 : old + 1);
-                                if (creditXgxfService.updateById(rowItem)) {
-                                    return true;
-                                }
-                            }
-                        } else {
-                            return true;
-                        }
-                        String prefix = rowNumber > 0 ? ("第" + rowNumber + "行：") : "";
-                        errorMessages.add(prefix + "保存失败");
-                        return false;
-                    },
                     errorMessages
                 );
             }
@@ -602,27 +478,29 @@ public class CreditXgxfController extends BaseController {
     private CreditXgxf convertImportParamToEntity(CreditXgxfImportParam param) {
         CreditXgxf entity = new CreditXgxf();
 
+        // Template compatibility: some upstream multi-company exports use alternate headers for the same columns.
+        String plaintiffAppellant = !ImportHelper.isBlank(param.getPlaintiffAppellant())
+            ? param.getPlaintiffAppellant()
+            : param.getPlaintiffAppellant2();
+        String appellee = !ImportHelper.isBlank(param.getAppellee())
+            ? param.getAppellee()
+            : param.getDataType();
+        String courtName = !ImportHelper.isBlank(param.getCourtName())
+            ? param.getCourtName()
+            : param.getCourtName2();
+
+
         entity.setCaseNumber(param.getCaseNumber());
         entity.setType(param.getType());
         entity.setDataType(param.getDataType());
-        entity.setPlaintiffUser(param.getPlaintiffUser());
+        entity.setPlaintiffAppellant(plaintiffAppellant);
-        entity.setDefendantUser(param.getDefendantUser());
+        entity.setAppellee(appellee);
         entity.setOtherPartiesThirdParty(param.getOtherPartiesThirdParty());
-        entity.setPlaintiffAppellant(param.getPlaintiffAppellant());
         entity.setDataStatus(param.getDataStatus());
-        entity.setAppellee(param.getAppellee());
-
-        // 兼容不同模板字段：如果 *2 有值则以 *2 为准写入主字段
-        entity.setInvolvedAmount(!ImportHelper.isBlank(param.getInvolvedAmount2())
-            ? param.getInvolvedAmount2()
-            : param.getInvolvedAmount());
-        entity.setOccurrenceTime(!ImportHelper.isBlank(param.getOccurrenceTime2())
-            ? param.getOccurrenceTime2()
-            : param.getOccurrenceTime());
-        entity.setCourtName(!ImportHelper.isBlank(param.getCourtName2())
-            ? param.getCourtName2()
-            : param.getCourtName());
 
+        entity.setInvolvedAmount(param.getInvolvedAmount());
+        entity.setOccurrenceTime(param.getOccurrenceTime());
+        entity.setCourtName(courtName);
         entity.setReleaseDate(param.getReleaseDate());
         entity.setComments(param.getComments());
 

src/main/java/com/gxwebsoft/credit/controller/ExcelImportSupport.java

@@ -2,8 +2,10 @@ package com.gxwebsoft.credit.controller;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
+import com.gxwebsoft.credit.excel.ExcelHeaderAlias;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.DataFormatter;
@@ -18,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -277,7 +280,7 @@ public class ExcelImportSupport {
             if (workbook.getNumberOfSheets() > sheetIndex) {
                 Sheet sheet = workbook.getSheetAt(sheetIndex);
                 if (sheet != null) {
-                    normalizeHeaderCells(sheet, titleRows, headRows);
+                    normalizeHeaderCells(sheet, titleRows, headRows, clazz);
                 }
             }
             try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
@@ -289,10 +292,14 @@ public class ExcelImportSupport {
         }
     }
 
-    private static void normalizeHeaderCells(Sheet sheet, int titleRows, int headRows) {
+    private static void normalizeHeaderCells(Sheet sheet, int titleRows, int headRows, Class<?> clazz) {
         if (sheet == null || headRows <= 0) {
             return;
         }
+        Map<String, String> expectedHeadersByKey = buildExpectedHeaderKeyMap(clazz);
+        if (expectedHeadersByKey.isEmpty()) {
+            return;
+        }
         int headerStart = Math.max(titleRows, 0);
         int headerEnd = headerStart + headRows - 1;
         for (int r = headerStart; r <= headerEnd; r++) {
@@ -317,21 +324,99 @@ public class ExcelImportSupport {
                     continue;
                 }
 
-                String normalized = normalizeHeaderText(text);
+                String canonical = findCanonicalHeader(text, expectedHeadersByKey);
-                if (normalized != null && !normalized.equals(text)) {
+                if (canonical != null && !canonical.equals(text)) {
-                    cell.setCellValue(normalized);
+                    cell.setCellValue(canonical);
                 }
             }
         }
     }
 
-    private static String normalizeHeaderText(String text) {
+    private static Map<String, String> buildExpectedHeaderKeyMap(Class<?> clazz) {
-        if (text == null) {
+        if (clazz == null) {
+            return Collections.emptyMap();
+        }
+        Map<String, String> map = new HashMap<>();
+        Class<?> current = clazz;
+        while (current != null && current != Object.class) {
+            Field[] fields = current.getDeclaredFields();
+            for (Field field : fields) {
+                Excel excel = field.getAnnotation(Excel.class);
+                if (excel == null) {
+                    continue;
+                }
+                String name = excel.name();
+                if (name == null || name.trim().isEmpty()) {
+                    continue;
+                }
+                String key = normalizeHeaderKey(name);
+                if (!key.isEmpty()) {
+                    // key -> canonical annotation name
+                    map.putIfAbsent(key, name);
+                }
+
+                // Allow import-time header aliases without changing the exported template header.
+                ExcelHeaderAlias alias = field.getAnnotation(ExcelHeaderAlias.class);
+                if (alias != null && alias.value() != null) {
+                    for (String aliasName : alias.value()) {
+                        if (aliasName == null || aliasName.trim().isEmpty()) {
+                            continue;
+                        }
+                        String aliasKey = normalizeHeaderKey(aliasName);
+                        if (!aliasKey.isEmpty()) {
+                            map.putIfAbsent(aliasKey, name);
+                        }
+                    }
+                }
+            }
+            current = current.getSuperclass();
+        }
+        return map;
+    }
+
+    private static String findCanonicalHeader(String rawHeaderText, Map<String, String> expectedHeadersByKey) {
+        if (rawHeaderText == null) {
             return null;
         }
-        // Remove common invisible whitespace characters, including full-width space.
+        String key = normalizeHeaderKey(rawHeaderText);
-        return text
+        if (key.isEmpty()) {
+            return null;
+        }
+
+        String canonical = expectedHeadersByKey.get(key);
+        if (canonical != null) {
+            return canonical;
+        }
+
+        // Some upstream templates append explanations in brackets, e.g. "原告/上诉人（申请执行人）".
+        // Only strip trailing bracket groups when the full header doesn't match any known expected header.
+        String strippedKey = stripTrailingBracketSuffix(key);
+        if (!strippedKey.equals(key)) {
+            canonical = expectedHeadersByKey.get(strippedKey);
+            if (canonical != null) {
+                return canonical;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Normalize header text for matching purposes only.
+     *
+     * <p>Do NOT drop bracket content (e.g. keep "(元)" or "(公告)" in the middle), because many templates use them as
+     * part of the canonical header name. We only remove whitespace and unify common full-width punctuation.</p>
+     */
+    private static String normalizeHeaderKey(String text) {
+        if (text == null) {
+            return "";
+        }
+        String normalized = text
+            // unify common full-width punctuation
             .replace("／", "/")
+            .replace("【", "[")
+            .replace("】", "]")
+            // remove common invisible whitespace characters, including full-width space.
             .replace(" ", "")
             .replace("\t", "")
             .replace("\r", "")
@@ -339,6 +424,34 @@ public class ExcelImportSupport {
             .replace("\u00A0", "")
             .replace("　", "")
             .trim();
+
+        // Make ( ) and （ ） comparable by normalizing both to ASCII.
+        normalized = normalized.replace('（', '(').replace('）', ')');
+        return normalized;
+    }
+
+    private static String stripTrailingBracketSuffix(String text) {
+        if (text == null) {
+            return "";
+        }
+        String s = text.trim();
+        while (true) {
+            if (s.endsWith(")")) {
+                int idx = s.lastIndexOf('(');
+                if (idx >= 0) {
+                    s = s.substring(0, idx).trim();
+                    continue;
+                }
+            }
+            if (s.endsWith("]")) {
+                int idx = s.lastIndexOf('[');
+                if (idx >= 0) {
+                    s = s.substring(0, idx).trim();
+                    continue;
+                }
+            }
+            return s;
+        }
     }
 
     private static <T> List<T> filterEmptyRows(List<T> rawList, Predicate<T> emptyRowPredicate) {
@@ -553,6 +666,10 @@ public class ExcelImportSupport {
     }
 
     private static int findColumnIndexByHeader(Sheet sheet, int titleRows, int headRows, String headerName) {
+        String targetKey = normalizeHeaderKey(headerName);
+        if (targetKey.isEmpty()) {
+            return -1;
+        }
         int firstHeaderRow = Math.max(0, titleRows);
         int lastHeaderRow = Math.max(0, titleRows + headRows - 1);
         for (int r = firstHeaderRow; r <= lastHeaderRow; r++) {
@@ -565,17 +682,10 @@ public class ExcelImportSupport {
                 if (cell == null) {
                     continue;
                 }
-                if (cell.getCellType() == CellType.STRING) {
+                DataFormatter formatter = new DataFormatter();
-                    String value = cell.getStringCellValue();
+                String value = formatter.formatCellValue(cell);
-                    if (headerName.equals(value != null ? value.trim() : null)) {
+                if (targetKey.equals(normalizeHeaderKey(value))) {
-                        return c;
+                    return c;
-                    }
-                } else {
-                    DataFormatter formatter = new DataFormatter();
-                    String value = formatter.formatCellValue(cell);
-                    if (headerName.equals(value != null ? value.trim() : null)) {
-                        return c;
-                    }
                 }
             }
         }

src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java

@@ -71,6 +71,9 @@ public class CreditAdministrativeLicense implements Serializable {
     @Schema(description = "企业ID")
     private Integer companyId;
 
+    @Schema(description = "企业别名")
+    private String companyAlias;
+
     @Schema(description = "主体企业")
     @TableField(exist = false)
     private String companyName;

src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java

@@ -55,6 +55,9 @@ public class CreditBranch implements Serializable {
     @Schema(description = "企业ID")
     private Integer companyId;
 
+    @Schema(description = "企业别名")
+    private String companyAlias;
+
     @Schema(description = "主题企业")
     @TableField(exist = false)
     private String companyName;

src/main/java/com/gxwebsoft/credit/entity/CreditCompany.java

@@ -176,6 +176,9 @@ public class CreditCompany implements Serializable {
     @Schema(description = "类型")
     private Integer type;
 
+    @Schema(description = "是否客户")
+    private Integer isCustomer;
+
     @Schema(description = "上级id, 0是顶级")
     private Integer parentId;
 

src/main/java/com/gxwebsoft/credit/entity/CreditCompetitor.java

@@ -57,8 +57,10 @@ public class CreditCompetitor implements Serializable {
     @Schema(description = "企业ID")
     private Integer companyId;
 
+    @Schema(description = "企业别名")
+    private String companyAlias;
+
     @Schema(description = "企业名称")
-    @TableField(exist = false)
     private String companyName;
 
     @Schema(description = "所属企业名称")

src/main/java/com/gxwebsoft/credit/entity/CreditCourtAnnouncement.java

@@ -42,7 +42,7 @@ public class CreditCourtAnnouncement implements Serializable {
     @Schema(description = "公告类型")
     private String dataType;
 
-    @Schema(description = "公告人")
+    @Schema(description = "原告/上诉人")
     private String plaintiffAppellant;
 
     @Schema(description = "刊登日期")

src/main/java/com/gxwebsoft/credit/entity/CreditCustomer.java

@@ -51,8 +51,10 @@ public class CreditCustomer implements Serializable {
     @Schema(description = "企业ID")
     private Integer companyId;
 
+    @Schema(description = "企业别名")
+    private String companyAlias;
+
     @Schema(description = "企业名称")
-    @TableField(exist = false)
     private String companyName;
 
     @Schema(description = "是否有数据")

src/main/java/com/gxwebsoft/credit/entity/CreditExternal.java

@@ -78,8 +78,10 @@ public class CreditExternal implements Serializable {
     @Schema(description = "企业ID")
     private Integer companyId;
 
+    @Schema(description = "企业别名")
+    private String companyAlias;
+
     @Schema(description = "企业名称")
-    @TableField(exist = false)
     private String companyName;
 
     @Schema(description = "是否有数据")