| src/main/java/com/ruoyi/basic/pojo/Customer.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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; /** 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());