yinzuomei 3 years ago
parent
commit
6594e67d48
  1. 7
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

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

@ -584,9 +584,9 @@ public class IcResiUserController implements ResultDataResolver {
@RequestMapping(value = "/exportExcelCustomData") @RequestMapping(value = "/exportExcelCustomData")
public Map<String, Object> exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId, public Map<String, Object> exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId,
@RequestBody ExportResiUserFormDTO pageFormDTO) throws Exception { @RequestBody ExportResiUserFormDTO pageFormDTO) throws Exception {
log.warn("templateId=【"+templateId+"】");
log.warn("pageFormDTO入参【"+JSON.toJSONString(pageFormDTO)+"】"); log.warn("pageFormDTO入参【"+JSON.toJSONString(pageFormDTO)+"】");
pageFormDTO.setTemplateId(templateId); // pageFormDTO.setTemplateId(templateId);
pageFormDTO.setTemplateId(tokenDto.getCustomerId().concat("_").concat(templateId));
if (null == pageFormDTO.getSearchForm()) { if (null == pageFormDTO.getSearchForm()) {
IcResiUserPageFormDTO searchForm = new IcResiUserPageFormDTO(); IcResiUserPageFormDTO searchForm = new IcResiUserPageFormDTO();
searchForm.setFormCode("resi_base_info"); searchForm.setFormCode("resi_base_info");
@ -613,7 +613,8 @@ public class IcResiUserController implements ResultDataResolver {
pageFormDTO.setExportConfig(exportTemplateSaveFormDTO); pageFormDTO.setExportConfig(exportTemplateSaveFormDTO);
} }
//固定通用客户Id //固定通用客户Id
pageFormDTO.setCustomerId("jmreport_resi_default"); // pageFormDTO.setCustomerId("jmreport_resi_default");
pageFormDTO.setCustomerId(tokenDto.getCustomerId());
Page<Map<String, Object>> maps = icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, null, true); Page<Map<String, Object>> maps = icResiUserExportService.exportIcResiUser(tokenDto, pageFormDTO, null, true);
Map<String,Object> result = new HashMap<>(); Map<String,Object> result = new HashMap<>();
result.put("total",maps.getPages()); result.put("total",maps.getPages());

Loading…
Cancel
Save