From 647a9b605f44e8c43f5586a4ff82ffe1fbb68db8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 30 Mar 2022 10:42:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E8=AE=BF=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/utils/DateUtils.java     | 2 +-
 .../com/epmet/controller/IcFollowUpRecordController.java  | 8 +++++---
 .../epmet/service/impl/IcFollowUpRecordServiceImpl.java   | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
index f956423f3a..a28a038f7b 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
@@ -60,7 +60,7 @@ public class DateUtils {
     public static final String DATE_PATTERN_YYYY_MM = "yyyy-MM";
     public static final String WEEK_TYPE_ENGLISH = "english";
     public static final String WEEK_TYPE_CHINESE = "chinese";
-
+    public static final String DATE_PATTERN_MMDD = "MMdd";
     /**
      * 日期格式化 日期格式为：yyyy-MM-dd
      * @param date  日期
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java
index e30af61242..b03ad85ed0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcFollowUpRecordController.java
@@ -9,6 +9,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -17,7 +18,6 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcFollowUpRecordDTO;
 import com.epmet.dto.form.PageFollowUpFormDTO;
-import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.service.IcFollowUpRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 
 
 /**
@@ -111,8 +112,9 @@ public class IcFollowUpRecordController {
         int pageNo = formDTO.getPageNo();
         try {
             //导出文件名：张三随访记录0330
-            String fileName = "随访记录.xlsx";
-            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), NatListResultDTO.class).build();
+            String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD);
+            String fileName = formDTO.getName().concat("随访记录").concat(today).concat(".xlsx");
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcFollowUpRecordDTO.class).build();
             WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").build();
             PageData<IcFollowUpRecordDTO> data = null;
             do {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java
index 1dbf6a3eb5..eb9255a8ec 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcFollowUpRecordServiceImpl.java
@@ -47,10 +47,11 @@ public class IcFollowUpRecordServiceImpl extends BaseServiceImpl<IcFollowUpRecor
                 .eq(StringUtils.isNotBlank(formDTO.getName()),IcFollowUpRecordEntity::getName,formDTO.getName())
                 .eq(IcFollowUpRecordEntity::getOrigin,formDTO.getOrigin())
                 .eq(IcFollowUpRecordEntity::getCustomerId,formDTO.getCustomerId())
-                .orderByDesc(IcFollowUpRecordEntity::getCreatedTime);
-        PageInfo<IcFollowUpRecordDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.isPage())
+                .orderByDesc(IcFollowUpRecordEntity::getVisitTime);
+        PageInfo<IcFollowUpRecordEntity> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.isPage())
                 .doSelectPageInfo(() -> baseDao.selectList(wrapper));
-        return new PageData(data.getList(),data.getTotal());
+        List<IcFollowUpRecordDTO> list=ConvertUtils.sourceToTarget(data.getList(),IcFollowUpRecordDTO.class);
+        return new PageData(list,data.getTotal());
     }
 
     @Override