From a24a2d86d2ae9f8c2f72ce14ed787c894b86061b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 01 四月 2026 11:10:45 +0800
Subject: [PATCH] fix: 客户档案跟进进度、跟进时间字段去掉

---
 src/main/java/com/ruoyi/basic/pojo/Customer.java                    |    6 +++---
 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java |   22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 595dae8..e4fdad3 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -38,14 +38,14 @@
     /**
      * 璺熻繘绋嬪害
      */
-    @Excel(name = "璺熻繘绋嬪害")
+//    @Excel(name = "璺熻繘绋嬪害")
     @TableField(exist = false)
     private String followUpLevel;
 
     /**
      * 璺熻繘鏃堕棿
      */
-    @Excel(name = "璺熻繘鏃堕棿")
+//    @Excel(name = "璺熻繘鏃堕棿")
     @TableField(exist = false)
     private LocalDateTime followUpTime;
 
@@ -92,7 +92,7 @@
      * 缁存姢鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "缁存姢鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     private Date maintenanceTime;
 
     @TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index d30beb3..494f462 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -173,17 +173,17 @@
                     c.setAddressPhone(address + "(" + phone + ")");
 
                     // 鏌ヨ鏈�鏂扮殑璺熻繘璁板綍
-                    CustomerFollowUp followUp = customerFollowUpService.getOne(
-                            new LambdaQueryWrapper<CustomerFollowUp>()
-                                    .eq(CustomerFollowUp::getCustomerId, c.getId())
-                                    .orderByDesc(CustomerFollowUp::getFollowUpTime)
-                                    .last("LIMIT 1")
-                    );
-
-                    if (followUp != null) {
-                        c.setFollowUpLevel(followUp.getFollowUpLevel());
-                        c.setFollowUpTime(followUp.getFollowUpTime());
-                    }
+//                    CustomerFollowUp followUp = customerFollowUpService.getOne(
+//                            new LambdaQueryWrapper<CustomerFollowUp>()
+//                                    .eq(CustomerFollowUp::getCustomerId, c.getId())
+//                                    .orderByDesc(CustomerFollowUp::getFollowUpTime)
+//                                    .last("LIMIT 1")
+//                    );
+//
+//                    if (followUp != null) {
+//                        c.setFollowUpLevel(followUp.getFollowUpLevel());
+//                        c.setFollowUpTime(followUp.getFollowUpTime());
+//                    }
                 })
                 .collect(Collectors.toList());
 

--
Gitblit v1.9.3