From ab711362c7d7986eeff65c820483b7f6e061ff65 Mon Sep 17 00:00:00 2001
From: kangwenjing <1138819403@qq.com>
Date: Wed, 15 Apr 2026 16:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 48 ++++++++++---------
 .../expansion/ChannelExpansionItemDTO.java    |  9 ++++
 .../dto/expansion/SalesExpansionItemDTO.java  |  9 ++++
 .../dto/opportunity/OpportunityItemDTO.java   |  9 ++++
 .../tools/OpportunitySearchToolProvider.java  |  2 +-
 .../mapper/expansion/ExpansionMapper.xml      | 36 ++++++++++++++
 .../mapper/opportunity/OpportunityMapper.xml  | 17 +++++++
 docs/crm.md                                   |  3 +-
 docs/scripts/capture-manual-screenshots.mjs   |  4 +-
 frontend/src/lib/auth.ts                      |  4 ++
 frontend/src/pages/Expansion.tsx              |  4 ++
 frontend/src/pages/Opportunities.tsx          | 27 ++++++++---
 12 files changed, 137 insertions(+), 35 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 417524c4..aac18b52 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,30 +24,30 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "main",
-    "last_opened_file_path": "/Users/kangwenjing/Downloads/crm/unis_crm",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "项目",
-    "project.structure.proportion": "0.14450866",
-    "project.structure.side.proportion": "0.18800648",
-    "settings.editor.selected.configurable": "configurable.group.appearance",
-    "ts.external.directory.path": "/Users/kangwenjing/Downloads/crm/unis_crm/frontend/node_modules/typescript/lib",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/Users/kangwenjing/Downloads/crm/unis_crm&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;项目&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.14450866&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.18800648&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;configurable.group.appearance&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;/Users/kangwenjing/Downloads/crm/unis_crm/frontend/node_modules/typescript/lib&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="Spring Boot.UnisCrmBackendApplication">
     <configuration name="unis-crm-backend中的所有" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="unis-crm-backend" />
@@ -94,6 +94,8 @@
       <workItem from="1775541962012" duration="805000" />
       <workItem from="1775611219527" duration="1273000" />
       <workItem from="1775721940000" duration="8576000" />
+      <workItem from="1776219416113" duration="650000" />
+      <workItem from="1776238420843" duration="21000" />
     </task>
     <task id="LOCAL-00001" summary="修改定位信息 0323">
       <option name="closed" value="true" />
diff --git a/backend/src/main/java/com/unis/crm/dto/expansion/ChannelExpansionItemDTO.java b/backend/src/main/java/com/unis/crm/dto/expansion/ChannelExpansionItemDTO.java
index 7f0275a5..53cb0d5b 100644
--- a/backend/src/main/java/com/unis/crm/dto/expansion/ChannelExpansionItemDTO.java
+++ b/backend/src/main/java/com/unis/crm/dto/expansion/ChannelExpansionItemDTO.java
@@ -37,6 +37,7 @@ public class ChannelExpansionItemDTO {
     private String stage;
     private Boolean landed;
     private String expectedSignDate;
+    private String updatedAt;
     private String notes;
     private List<ChannelExpansionContactDTO> contacts = new ArrayList<>();
     private List<ChannelRelatedProjectSummaryDTO> relatedProjects = new ArrayList<>();
@@ -298,6 +299,14 @@ public class ChannelExpansionItemDTO {
         this.expectedSignDate = expectedSignDate;
     }
 
+    public String getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(String updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
     public String getNotes() {
         return notes;
     }
diff --git a/backend/src/main/java/com/unis/crm/dto/expansion/SalesExpansionItemDTO.java b/backend/src/main/java/com/unis/crm/dto/expansion/SalesExpansionItemDTO.java
index 1dbc3305..20546ff8 100644
--- a/backend/src/main/java/com/unis/crm/dto/expansion/SalesExpansionItemDTO.java
+++ b/backend/src/main/java/com/unis/crm/dto/expansion/SalesExpansionItemDTO.java
@@ -29,6 +29,7 @@ public class SalesExpansionItemDTO {
     private Boolean active;
     private String employmentStatus;
     private String expectedJoinDate;
+    private String updatedAt;
     private String notes;
     private java.util.List<RelatedProjectSummaryDTO> relatedProjects = new java.util.ArrayList<>();
     private List<ExpansionFollowUpDTO> followUps = new ArrayList<>();
@@ -225,6 +226,14 @@ public class SalesExpansionItemDTO {
         this.expectedJoinDate = expectedJoinDate;
     }
 
+    public String getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(String updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
     public String getNotes() {
         return notes;
     }
diff --git a/backend/src/main/java/com/unis/crm/dto/opportunity/OpportunityItemDTO.java b/backend/src/main/java/com/unis/crm/dto/opportunity/OpportunityItemDTO.java
index 64373510..7e195218 100644
--- a/backend/src/main/java/com/unis/crm/dto/opportunity/OpportunityItemDTO.java
+++ b/backend/src/main/java/com/unis/crm/dto/opportunity/OpportunityItemDTO.java
@@ -12,6 +12,7 @@ public class OpportunityItemDTO {
     private String name;
     private String client;
     private String owner;
+    private String updatedAt;
     private String projectLocation;
     private String operatorCode;
     private String operatorName;
@@ -85,6 +86,14 @@ public class OpportunityItemDTO {
         this.owner = owner;
     }
 
+    public String getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(String updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
     public String getProjectLocation() {
         return projectLocation;
     }
diff --git a/backend/src/main/java/com/unis/crm/llm/tools/OpportunitySearchToolProvider.java b/backend/src/main/java/com/unis/crm/llm/tools/OpportunitySearchToolProvider.java
index 0449e87b..8c941c0c 100644
--- a/backend/src/main/java/com/unis/crm/llm/tools/OpportunitySearchToolProvider.java
+++ b/backend/src/main/java/com/unis/crm/llm/tools/OpportunitySearchToolProvider.java
@@ -40,7 +40,7 @@ public class OpportunitySearchToolProvider extends PermissionedMcpToolProvider {
         properties.put("keyword", stringProperty("关键词，匹配商机名称、编号、客户名称、项目地点、产品类型。"));
         properties.put("stage", stringProperty("商机阶段编码，例如 initial_contact/solution_discussion/bidding/business_negotiation/won/lost。"));
         properties.put("ownerUserId", integerProperty("商机负责人用户 ID，实际可见范围仍按系统数据权限裁剪。"));
-        properties.put("includeArchived", booleanProperty("是否包含已归档商机，默认 false。"));
+        properties.put("includeArchived", booleanProperty("是否包含已签单商机，默认 false。"));
         properties.put("page", integerProperty("页码，默认 1。"));
         properties.put("pageSize", integerProperty("每页条数，默认 10，最大 50。"));
         properties.put("limit", integerProperty("返回条数，默认 10，最大 50。"));
diff --git a/backend/src/main/resources/mapper/expansion/ExpansionMapper.xml b/backend/src/main/resources/mapper/expansion/ExpansionMapper.xml
index 783fecb8..a266ba65 100644
--- a/backend/src/main/resources/mapper/expansion/ExpansionMapper.xml
+++ b/backend/src/main/resources/mapper/expansion/ExpansionMapper.xml
@@ -89,8 +89,26 @@
             (s.employment_status = 'active') as active,
             s.employment_status as employmentStatus,
             coalesce(to_char(s.expected_join_date, 'YYYY-MM-DD'), '无') as expectedJoinDate,
+            coalesce(
+                to_char(
+                    case
+                        when sales_followup.latest_followup_time is null then s.updated_at
+                        else greatest(s.updated_at, sales_followup.latest_followup_time)
+                    end,
+                    'YYYY-MM-DD HH24:MI'
+                ),
+                '无'
+            ) as updatedAt,
             coalesce(s.remark, '无') as notes
         from crm_sales_expansion s
+        left join (
+            select
+                f.biz_id,
+                max(f.followup_time) as latest_followup_time
+            from crm_expansion_followup f
+            where f.biz_type = 'sales'
+            group by f.biz_id
+        ) sales_followup on sales_followup.biz_id = s.id
         left join sys_user u
           on u.user_id = s.owner_user_id
          and u.is_deleted = 0
@@ -168,8 +186,26 @@
             end as stage,
             c.landed_flag as landed,
             coalesce(to_char(c.expected_sign_date, 'YYYY-MM-DD'), '无') as expectedSignDate,
+            coalesce(
+                to_char(
+                    case
+                        when channel_followup.latest_followup_time is null then c.updated_at
+                        else greatest(c.updated_at, channel_followup.latest_followup_time)
+                    end,
+                    'YYYY-MM-DD HH24:MI'
+                ),
+                '无'
+            ) as updatedAt,
             coalesce(c.remark, '无') as notes
         from crm_channel_expansion c
+        left join (
+            select
+                f.biz_id,
+                max(f.followup_time) as latest_followup_time
+            from crm_expansion_followup f
+            where f.biz_type = 'channel'
+            group by f.biz_id
+        ) channel_followup on channel_followup.biz_id = c.id
         left join sys_user u
           on u.user_id = c.owner_user_id
          and u.is_deleted = 0
diff --git a/backend/src/main/resources/mapper/opportunity/OpportunityMapper.xml b/backend/src/main/resources/mapper/opportunity/OpportunityMapper.xml
index f568fecb..7e95d847 100644
--- a/backend/src/main/resources/mapper/opportunity/OpportunityMapper.xml
+++ b/backend/src/main/resources/mapper/opportunity/OpportunityMapper.xml
@@ -54,6 +54,16 @@
             o.opportunity_name as name,
             coalesce(c.customer_name, '未填写最终客户') as client,
             coalesce(u.display_name, '当前用户') as owner,
+            coalesce(
+                to_char(
+                    case
+                        when opportunity_followup.latest_followup_time is null then o.updated_at
+                        else greatest(o.updated_at, opportunity_followup.latest_followup_time)
+                    end,
+                    'YYYY-MM-DD HH24:MI'
+                ),
+                '无'
+            ) as updatedAt,
             coalesce(o.project_location, '') as projectLocation,
             coalesce(operator_dict.item_value, o.operator_name, '') as operatorCode,
             coalesce(operator_dict.item_label, nullif(o.operator_name, ''), '') as operatorName,
@@ -117,6 +127,13 @@
             ), '') as nextPlan,
             coalesce(o.description, '') as notes
         from crm_opportunity o
+        left join (
+            select
+                f.opportunity_id,
+                max(f.followup_time) as latest_followup_time
+            from crm_opportunity_followup f
+            group by f.opportunity_id
+        ) opportunity_followup on opportunity_followup.opportunity_id = o.id
         left join crm_customer c on c.id = o.customer_id
         left join sys_user u on u.user_id = o.owner_user_id
         left join crm_sales_expansion se on se.id = o.sales_expansion_id
diff --git a/docs/crm.md b/docs/crm.md
index 84f7c754..ffd7f0e2 100644
--- a/docs/crm.md
+++ b/docs/crm.md
@@ -386,7 +386,7 @@ flowchart TD
 
 建议对以下数据建立归档策略：
 
-- 已归档商机
+- 已签单商机
 - 早期历史动态日志
 - 历史打卡照片
 - 大体量日报附件或冗余快照
@@ -638,4 +638,3 @@ flowchart TD
 - `docs/opportunity-integration-api.md`
 - `backend/README.md`
 - `frontend/README.md`
-
diff --git a/docs/scripts/capture-manual-screenshots.mjs b/docs/scripts/capture-manual-screenshots.mjs
index b07096f6..957ff264 100644
--- a/docs/scripts/capture-manual-screenshots.mjs
+++ b/docs/scripts/capture-manual-screenshots.mjs
@@ -291,8 +291,8 @@ const opportunityOverview = {
       amount: 530000,
       date: "2026-03-18",
       confidence: "C",
-      stageCode: "已归档",
-      stage: "已归档",
+      stageCode: "已签单",
+      stage: "已签单",
       type: "替换",
       archived: true,
       pushedToOms: false,
diff --git a/frontend/src/lib/auth.ts b/frontend/src/lib/auth.ts
index 0e66122f..d8532f46 100644
--- a/frontend/src/lib/auth.ts
+++ b/frontend/src/lib/auth.ts
@@ -299,6 +299,7 @@ export interface OpportunityItem {
   name?: string;
   client?: string;
   owner?: string;
+  updatedAt?: string;
   projectLocation?: string;
   operatorCode?: string;
   operatorName?: string;
@@ -339,6 +340,7 @@ export interface OpportunityMeta {
   operatorOptions?: OpportunityDictOption[];
   projectLocationOptions?: OpportunityDictOption[];
   opportunityTypeOptions?: OpportunityDictOption[];
+  confidenceOptions?: OpportunityDictOption[];
 }
 
 export interface OmsPreSalesOption {
@@ -416,6 +418,7 @@ export interface SalesExpansionItem {
   active?: boolean;
   employmentStatus?: string;
   expectedJoinDate?: string;
+  updatedAt?: string;
   notes?: string;
   relatedProjects?: RelatedProjectSummary[];
   followUps?: ExpansionFollowUp[];
@@ -461,6 +464,7 @@ export interface ChannelExpansionItem {
   stage?: string;
   landed?: boolean;
   expectedSignDate?: string;
+  updatedAt?: string;
   notes?: string;
   contacts?: ChannelExpansionContact[];
   relatedProjects?: ChannelRelatedProjectSummary[];
diff --git a/frontend/src/pages/Expansion.tsx b/frontend/src/pages/Expansion.tsx
index 4a6afaa9..0969d0c4 100644
--- a/frontend/src/pages/Expansion.tsx
+++ b/frontend/src/pages/Expansion.tsx
@@ -330,6 +330,7 @@ function buildSalesExportHeaders(items: SalesExpansionItem[]) {
     "工号",
     "姓名",
     "创建人",
+    "更新修改时间",
     "联系方式",
     "代表处 / 办事处",
     "所属部门",
@@ -357,6 +358,7 @@ function buildSalesExportData(items: SalesExpansionItem[]) {
       normalizeExportText(item.employeeNo),
       normalizeExportText(item.name),
       normalizeExportText(item.owner),
+      normalizeExportText(item.updatedAt),
       normalizeExportText(item.phone),
       normalizeExportText(item.officeName),
       normalizeExportText(item.dept),
@@ -389,6 +391,7 @@ function buildChannelExportHeaders(items: ChannelExpansionItem[]) {
     "编码",
     "渠道名称",
     "创建人",
+    "更新修改时间",
     "省份",
     "市",
     "办公地址",
@@ -426,6 +429,7 @@ function buildChannelExportData(items: ChannelExpansionItem[]) {
       normalizeExportText(item.channelCode),
       normalizeExportText(item.name),
       normalizeExportText(item.owner),
+      normalizeExportText(item.updatedAt),
       normalizeExportText(item.province),
       normalizeExportText(item.city),
       normalizeExportText(item.officeAddress),
diff --git a/frontend/src/pages/Opportunities.tsx b/frontend/src/pages/Opportunities.tsx
index cd33816c..a6de74f1 100644
--- a/frontend/src/pages/Opportunities.tsx
+++ b/frontend/src/pages/Opportunities.tsx
@@ -83,6 +83,13 @@ function formatAmount(value?: number) {
   return new Intl.NumberFormat("zh-CN").format(Number(value));
 }
 
+function formatOpportunityBoolean(value?: boolean, trueLabel = "是", falseLabel = "否") {
+  if (value === null || value === undefined) {
+    return "";
+  }
+  return value ? trueLabel : falseLabel;
+}
+
 function normalizeOpportunityExportText(value?: string | number | boolean | null) {
   if (value === null || value === undefined) {
     return "";
@@ -648,8 +655,8 @@ function OpportunityExportFilterModal({
 
   return (
     <ModalShell
-      title={`导出${archiveTab === "active" ? "未归档" : "已归档"}商机`}
-      subtitle="选择条件后导出 Excel；不填条件则导出当前归档页签下的全部可见商机。"
+      title={`导出${archiveTab === "active" ? "未签单" : "已签单"}商机`}
+      subtitle="选择条件后导出 Excel；不填条件则导出当前签单页签下的全部可见商机。"
       onClose={onClose}
       footer={(
         <div className="flex flex-col-reverse gap-3 sm:flex-row sm:justify-between">
@@ -1603,7 +1610,7 @@ export default function Opportunities() {
         .filter((item) => (archiveTab === "active" ? !item.archived : Boolean(item.archived)))
         .filter((item) => matchesOpportunityExportFilters(item, filters, effectiveConfidenceOptions));
       if (exportItems.length <= 0) {
-        throw new Error(`当前筛选条件下暂无可导出的${archiveTab === "active" ? "未归档" : "已归档"}商机`);
+        throw new Error(`当前筛选条件下暂无可导出的${archiveTab === "active" ? "未签单" : "已签单"}商机`);
       }
 
       const ExcelJS = await import("exceljs");
@@ -1613,6 +1620,9 @@ export default function Opportunities() {
         "项目编号",
         "项目名称",
         "创建人",
+        "更新修改时间",
+        "是否签单",
+        "是否推送OMS",
         "项目地",
         "最终用户",
         "建设类型",
@@ -1661,6 +1671,9 @@ export default function Opportunities() {
           normalizeOpportunityExportText(item.code),
           normalizeOpportunityExportText(item.name),
           normalizeOpportunityExportText(item.owner),
+          normalizeOpportunityExportText(item.updatedAt),
+          formatOpportunityBoolean(item.archived, "已签单", "未签单"),
+          formatOpportunityBoolean(item.pushedToOms, "已推送", "未推送"),
           normalizeOpportunityExportText(item.projectLocation),
           normalizeOpportunityExportText(item.client),
           normalizeOpportunityExportText(item.type || "新建"),
@@ -1726,7 +1739,7 @@ export default function Opportunities() {
       });
 
       const buffer = await workbook.xlsx.writeBuffer();
-      const filename = `商机储备_${archiveTab === "active" ? "未归档" : "已归档"}_${formatOpportunityExportFilenameTime()}.xlsx`;
+      const filename = `商机储备_${archiveTab === "active" ? "未签单" : "已签单"}_${formatOpportunityExportFilenameTime()}.xlsx`;
       downloadOpportunityExcelFile(filename, buffer);
       setExportFilterOpen(false);
     } catch (exportErr) {
@@ -1943,7 +1956,7 @@ export default function Opportunities() {
 
   const renderEmpty = () => (
     <div className="crm-empty-panel">
-      {archiveTab === "active" ? "暂无未归档商机，先新增一条试试。" : "暂无已归档商机。"}
+      {archiveTab === "active" ? "暂无未签单商机，先新增一条试试。" : "暂无已签单商机。"}
     </div>
   );
 
@@ -1987,7 +2000,7 @@ export default function Opportunities() {
               : "text-slate-600 hover:text-slate-900 dark:text-slate-400 dark:hover:text-white"
           }`}
         >
-          未归档
+          未签单
         </button>
         <button
           onClick={() => {
@@ -2000,7 +2013,7 @@ export default function Opportunities() {
               : "text-slate-600 hover:text-slate-900 dark:text-slate-400 dark:hover:text-white"
           }`}
         >
-          已归档
+          已签单
         </button>
       </div>