From b671c98ae6deec36de6525c1d78cd8c7bfd0473e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 15 Aug 2022 15:59:15 +0800
Subject: [PATCH] test

---
 .../controller/IcResiUserController.java      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 76706a51b0..6ea4925571 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -32,6 +32,7 @@ import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.dto.form.IcExportTemplateSaveFormDTO;
 import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
@@ -554,6 +555,29 @@ public class IcResiUserController implements ResultDataResolver {
     @NoRepeatSubmit
     @RequestMapping(value = "/exportExcelCustomData")
     public Result<List<Map<String, Object>>> exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestBody ExportResiUserFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
+        if (null == pageFormDTO.getSearchForm()) {
+            IcResiUserPageFormDTO searchForm = new IcResiUserPageFormDTO();
+            searchForm.setFormCode("resi_base_info");
+            searchForm.setCustomerId(tokenDto.getCustomerId());
+            searchForm.setStaffId(tokenDto.getUserId());
+            searchForm.setPageNo(1);
+            searchForm.setPageSize(20);
+            List<ResiUserQueryValueDTO> conditions=new ArrayList<>();
+            // ResiUserQueryValueDTO temp=new ResiUserQueryValueDTO();
+            // temp.setColumnName("");
+            // temp.setColumnValue(Arrays.asList("IS_UNEMPLOYED"));
+            // temp.setQueryType("resi_category");
+            // temp.setTableName("ic_resi_user");
+            // conditions.add(temp);
+            searchForm.setConditions(conditions);
+            pageFormDTO.setSearchForm(searchForm);
+        }
+        if (null == pageFormDTO.getExportConfig()) {
+            IcExportTemplateSaveFormDTO exportTemplateSaveFormDTO = new IcExportTemplateSaveFormDTO();
+            exportTemplateSaveFormDTO.setFormCode("resi_base_info");
+            exportTemplateSaveFormDTO.setIsSaveTemp(false);
+            pageFormDTO.setExportConfig(exportTemplateSaveFormDTO);
+        }
         Page<Map<String, Object>> maps = icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, null, true);
         return new Result<List<Map<String, Object>>>().ok(maps.getResult());
     }