导出居民信息 获取数据提出

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ExportResiUserFormDTO.java

@@ -13,6 +13,10 @@ import java.io.Serializable;
 @Data
 public class ExportResiUserFormDTO implements Serializable {
     private static final long serialVersionUID = 8777535966834678256L;
+    /**
+     * 客户Id
+     */
+    private String customerId;
     /**
      * 表单查询条件
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -555,7 +555,9 @@ public class IcResiUserController implements ResultDataResolver {
     @ReportRequest
     @NoRepeatSubmit
     @RequestMapping(value = "/exportExcelCustomData")
-    public Result<List<Map<String, Object>>> exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId,@RequestBody ExportResiUserFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
+    public Map<String, Object> exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId,
+                                                     @RequestParam("pageNo") Integer pageNo,@RequestParam("pageSize") Integer pageSize,
+                                                     @RequestBody ExportResiUserFormDTO pageFormDTO) throws Exception {
         log.warn("templateId=【"+templateId+"】");
         log.warn("pageFormDTO入参【"+JSON.toJSONString(pageFormDTO)+"】");
         pageFormDTO.setTemplateId(templateId);
@@ -564,8 +566,8 @@ public class IcResiUserController implements ResultDataResolver {
             searchForm.setFormCode("resi_base_info");
             searchForm.setCustomerId(tokenDto.getCustomerId());
             searchForm.setStaffId(tokenDto.getUserId());
-            searchForm.setPageNo(1);
-            searchForm.setPageSize(20);
+            searchForm.setPageNo(pageNo);
+            searchForm.setPageSize(pageSize);
             List<ResiUserQueryValueDTO> conditions=new ArrayList<>();
             // ResiUserQueryValueDTO temp=new ResiUserQueryValueDTO();
             // temp.setColumnName("");
@@ -580,10 +582,16 @@ public class IcResiUserController implements ResultDataResolver {
             IcExportTemplateSaveFormDTO exportTemplateSaveFormDTO = new IcExportTemplateSaveFormDTO();
             exportTemplateSaveFormDTO.setFormCode("resi_base_info");
             exportTemplateSaveFormDTO.setIsSaveTemp(false);
+            //固定通用客户Id
+            pageFormDTO.setCustomerId("jmreport_resi_default");
             pageFormDTO.setExportConfig(exportTemplateSaveFormDTO);
         }
         Page<Map<String, Object>> maps = icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, null, true);
-        return new Result<List<Map<String, Object>>>().ok(maps.getResult());
+        Map<String,Object> result = new HashMap<>();
+        result.put("total",maps.getPages());
+        result.put("count",maps.getTotal());
+        result.put("data",maps.getResult());
+        return result;
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java

@@ -104,7 +104,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
         WriteSheet writeSheet = null;
         try {
             //获取用户配置的导出条件
-            Result<IcCustomExportResultDTO> exportConfigResult = this.getIcCustomExportConfig(searchForm.getCustomerId(), templateId, exportResiUserFormDTO.getExportConfig());
+            Result<IcCustomExportResultDTO> exportConfigResult = this.getIcCustomExportConfig(exportResiUserFormDTO.getCustomerId(), templateId, exportResiUserFormDTO.getExportConfig());
 
             Map<String, ExportResiUserItemDTO> itemOriginMap = getItemMap(searchForm.getCustomerId());
             IcCustomExportResultDTO exportConfigData = exportConfigResult.getData();
@@ -120,6 +120,8 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
 
 
             if (!onlyGetData){
+                searchForm.setIsPage(false);
+                searchForm.setPageSize(NumConstant.TEN_THOUSAND);
 
                 //需要合并的列
                 List<Integer> mergeColumnIndexList = new ArrayList<>();
@@ -165,7 +167,9 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
                 mapListPage = PageHelper.startPage(searchForm.getPageNo(), searchForm.getPageSize(), searchForm.getIsPage()).doSelectPage(() -> {
                     icResiUserService.dynamicQuery(searchForm.getCustomerId(), searchForm.getFormCode(), IcResiUserConstant.IC_RESI_USER, allShowColumns, searchForm.getConditions(), staffInfoCacheResult.getAgencyId(), finalStaffOrgPath);
                 });
+                if (!searchForm.getIsPage()){
                     searchForm.setPageNo(searchForm.getPageNo() + NumConstant.ONE);
+                }
 
                 List<Map<String, Object>> result = mapListPage.getResult();
 
@@ -179,7 +183,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
                 if (!onlyGetData){
                     excelWriter.write(resultData, writeSheet);
                 }
-            } while (mapListPage.getResult().size() == searchForm.getPageSize());
+            } while (!searchForm.getIsPage() && mapListPage.getResult().size() == searchForm.getPageSize());
         } catch (IOException e) {
             log.error("exportIcResiUser exception", e);
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMessage(), "导出失败");
@@ -240,11 +244,14 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
      */
     public void validateSearchForm(TokenDto tokenDto, ExportResiUserFormDTO exportResiUserFormDTO) {
         IcResiUserPageFormDTO searchForm = exportResiUserFormDTO.getSearchForm();
+        if (StringUtils.isNotBlank(exportResiUserFormDTO.getCustomerId())){
+            searchForm.setCustomerId(exportResiUserFormDTO.getCustomerId());
+        }else{
             searchForm.setCustomerId(tokenDto.getCustomerId());
+        }
+
         searchForm.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(searchForm, IcResiUserPageFormDTO.AddUserInternalGroup.class);
-        searchForm.setIsPage(false);
-        searchForm.setPageSize(NumConstant.TEN_THOUSAND);
     }
 
     @Nullable