From 607f00dc782a01dc76fd812fe976db62b1a491cd Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 17 三月 2026 11:10:32 +0800
Subject: [PATCH] fix(customer): 修复导入失败的问题
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 9 +++++----
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 15 ++++++++++-----
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 8a35b2b..101d72a 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -1,6 +1,7 @@
package com.ruoyi.basic.pojo;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -38,16 +39,16 @@
/**
* 璺熻繘绋嬪害
*/
- @Excel(name = "璺熻繘绋嬪害")
+// @Excel(name = "璺熻繘绋嬪害")
@TableField(exist = false)
private String followUpLevel;
/**
* 璺熻繘鏃堕棿
*/
- @Excel(name = "璺熻繘鏃堕棿")
+// @Excel(name = "璺熻繘鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@TableField(exist = false)
- private LocalDateTime followUpTime;
+ private Date followUpTime;
@Excel(name = "瀹㈡埛鍒嗙被")
private String customerType;
@@ -79,7 +80,7 @@
/**
* 鑱旂郴鐢佃瘽
*/
- @Excel(name = "鑱旂郴鐢佃瘽")
+ @Excel(name = "鑱旂郴鐢佃瘽",cellType = Excel.ColumnType.STRING)
private String contactPhone;
/**
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 b7cb426..58810c9 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.basic.service.impl;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,10 +35,9 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.*;
import java.util.stream.Collectors;
@@ -163,7 +164,11 @@
if (followUp != null) {
c.setFollowUpLevel(followUp.getFollowUpLevel());
- c.setFollowUpTime(followUp.getFollowUpTime());
+ c.setFollowUpTime(
+ Date.from(
+ followUp.getFollowUpTime().atZone(ZoneId.systemDefault()).toInstant()
+ )
+ );
}
})
.collect(Collectors.toList());
--
Gitblit v1.9.3