From 343745bd0ade6a947f14c0b1b1dde7e0244312cc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 26 Apr 2023 12:37:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/CollectListExcelResultDTO.java    |  4 ++++
 .../com/epmet/controller/IcResiCollectController.java  | 10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java
index 04a34bb814..0b4dc12e1a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java
@@ -17,6 +17,10 @@ import java.util.List;
 public class CollectListExcelResultDTO implements Serializable {
 
     private static final long serialVersionUID = -5659769436514116680L;
+
+    @Excel(name = "所属网格",width = 30, needMerge = true)
+    private String gridName;
+
     /**
      * 户主姓名
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
index d508f670e8..944e2721cd 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
@@ -8,10 +8,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.IdCardRegexUtils;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.*;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -25,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 
@@ -121,8 +119,8 @@ public class IcResiCollectController {
             resultDTO.setListP(children);
             list.add(resultDTO);
         });
-
-        ExcelUtils.exportExcelToTarget(response, null, list, CollectListExcelResultDTO.class);
+        String fileName="信息采集"+ DateUtils.format(new Date(),DateUtils.DATE_PATTERN);
+        ExcelUtils.exportExcelToTarget(response, fileName, list, CollectListExcelResultDTO.class);
     }
 
     /**