exportExcelCustomData

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

@@ -552,9 +552,13 @@ public class IcResiUserController implements ResultDataResolver {
      * @date 2021/11/19 4:24 下午
      * @remark 用于报表调用的接口  试试
      */
+    @ReportRequest
     @NoRepeatSubmit
     @RequestMapping(value = "/exportExcelCustomData")
-    public Result<List<Map<String, Object>>> exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestBody ExportResiUserFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
+    public Result<List<Map<String, Object>>> exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId,@RequestBody ExportResiUserFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
+        log.warn("templateId=【"+templateId+"】");
+        log.warn("pageFormDTO入参【"+JSON.toJSONString(pageFormDTO)+"】");
+        pageFormDTO.setTemplateId(templateId);
         if (null == pageFormDTO.getSearchForm()) {
             IcResiUserPageFormDTO searchForm = new IcResiUserPageFormDTO();
             searchForm.setFormCode("resi_base_info");
@@ -572,7 +576,7 @@ public class IcResiUserController implements ResultDataResolver {
             searchForm.setConditions(conditions);
             pageFormDTO.setSearchForm(searchForm);
         }
-        if (null == pageFormDTO.getExportConfig()||StringUtils.isBlank(pageFormDTO.getExportConfig().getFormCode())) {
+        if (null == pageFormDTO.getExportConfig()) {
             IcExportTemplateSaveFormDTO exportTemplateSaveFormDTO = new IcExportTemplateSaveFormDTO();
             exportTemplateSaveFormDTO.setFormCode("resi_base_info");
             exportTemplateSaveFormDTO.setIsSaveTemp(false);