信息采集导出文件名

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;
+
     /**
      * 户主姓名
      */

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.*;
-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.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);
         });
-
+        String fileName="信息采集"+ DateUtils.format(new Date(),DateUtils.DATE_PATTERN);
-        ExcelUtils.exportExcelToTarget(response, null, list, CollectListExcelResultDTO.class);
+        ExcelUtils.exportExcelToTarget(response, fileName, list, CollectListExcelResultDTO.class);
     }
 
     /**