diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java index 3bf64f3..86692dd 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java @@ -45,7 +45,7 @@ public class McBasicCmtyController extends BaseController { /** * 查询基础数据-户数列表 */ -// @RequirePermission("schsf:mcBasicCmty:list") + @RequirePermission("schsf:mcBasicCmty:list") @GetMapping("/list") public TableDataInfo list(McBasicCmtyVo mcBasicCmtyVo) { startPage(); @@ -54,7 +54,7 @@ public class McBasicCmtyController extends BaseController { return getDataTable(list); } - + @RequirePermission("schsf:mcBasicCmty:importData") @PostMapping("/importData") public AjaxResult importData(MultipartFile file) { if (file.isEmpty()) { @@ -80,7 +80,7 @@ public class McBasicCmtyController extends BaseController { // 检验重复数据 Map> collect = list.stream().collect(Collectors.groupingBy(o -> - o.getRegionName() + + o.getRegionName() + o.getGroupName() + o.getCompanyName() + o.getCompanyCode() @@ -116,10 +116,40 @@ public class McBasicCmtyController extends BaseController { } + @RequirePermission("schsf:mcBasicCmty:exportTemplate") + @Log(title = "基础数据-户数", businessType = BusinessType.EXPORT) + @PostMapping("/exportTemplate") + public void exportTemplate(HttpServletResponse response) throws IOException { + McBasicCmtyVo mcBasicCmtyVo = new McBasicCmtyVo(); + startPage(); + mcBasicCmtyVo.setDefFlag("0"); + List list = mcBasicCmtyService.selectMcBasicCmtyList(mcBasicCmtyVo); + try { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + String fileName = URLEncoder.encode("基础数据-户数", "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), McBasicCmty.class).autoCloseStream(Boolean.FALSE).sheet("客户信息列表").doWrite(list); + } catch (Exception e) { + // 重置response + e.printStackTrace(); + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + Map map = MapUtils.newHashMap(); + map.put("status", "failure"); + map.put("message", "下载文件失败" + e.getMessage()); + response.getWriter().println(JSON.toJSONString(map)); + } + } + + /** * 导出基础数据-户数列表 */ -// @RequirePermission("schsf:mcBasicCmty:export") + @RequirePermission("schsf:mcBasicCmty:export") @Log(title = "基础数据-户数", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, McBasicCmtyVo mcBasicCmtyVo) throws IOException { @@ -131,8 +161,7 @@ public class McBasicCmtyController extends BaseController { String fileName = URLEncoder.encode("基础数据-户数", "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), McBasicCmty.class).autoCloseStream(Boolean.FALSE).sheet("客户信息列表") - .doWrite(list); + EasyExcel.write(response.getOutputStream(), McBasicCmty.class).autoCloseStream(Boolean.FALSE).sheet("客户信息列表").doWrite(list); } catch (Exception e) { // 重置response e.printStackTrace(); diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicCmty.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicCmty.java index 553c00b..1d060a4 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicCmty.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/domain/McBasicCmty.java @@ -25,23 +25,23 @@ public class McBasicCmty extends BaseEntity private Long fiscalYear; /** 区域名称 */ - @ExcelProperty(index = 1,value = "区域名称") + @ExcelProperty(index = 1,value = "区域") private String regionName; /** 集团名称 */ - @ExcelProperty(index = 2,value = "集团名称") + @ExcelProperty(index = 2,value = "经管集团/直管公司") private String groupName; /** 公司名称 */ - @ExcelProperty(index = 3,value = "公司名称") + @ExcelProperty(index = 3,value = "项目公司") private String companyName; /** 公司代码 */ - @ExcelProperty(index = 4,value = "公司代码") + @ExcelProperty(index = 4,value = "项目公司代码（组织部门代码）") private String companyCode; /** 省 */ - @ExcelProperty(index = 5,value = "省") + @ExcelProperty(index = 5,value = "省份") private String province; /** 市 */ @@ -53,11 +53,11 @@ public class McBasicCmty extends BaseEntity private String district; /** 街道 */ - @ExcelProperty(index = 8,value = "街道") + @ExcelProperty(index = 8,value = "乡镇/街道") private String street; /** 村(小区) */ - @ExcelProperty(index = 9,value = "村(小区)") + @ExcelProperty(index = 9,value = "村/小区") private String vlgOrCmty; /** 负责人 */ @@ -69,7 +69,7 @@ public class McBasicCmty extends BaseEntity private String urbRurCls; /** 项目类型名称 */ - @ExcelProperty(index = 12,value = "项目类型名称") + @ExcelProperty(index = 12,value = "项目类型") private String projectTypeName; /** 村/小区总户数 */ @@ -77,15 +77,15 @@ public class McBasicCmty extends BaseEntity private Long commHh; /** 应收账款目标及完成-财年初财务确认应收账款户数 */ - @ExcelProperty(index = 14,value = "应收账款目标及完成-财年初财务确认应收账款户数") + @ExcelProperty(index = 14,value = {"应收账款目标及完成","财年初财务确认应收账款户数"}) private Long acctFyStartConf; /** 应收账款目标及完成-往年应收在今年已回款户数 */ - @ExcelProperty(index = 15,value = "应收账款目标及完成-往年应收在今年已回款户数") + @ExcelProperty(index = 15,value = {"应收账款目标及完成","往年应收在今年已回款户数"}) private Long acctPrevRecov; /** 应收账款目标及完成-往年已收费户数 */ - @ExcelProperty(index = 16,value = "应收账款目标及完成-往年已收费户数") + @ExcelProperty(index = 16,value = {"应收账款目标及完成","往年已收费户数"}) private Long acctPrevCharged; /** 本财年新增已回款户 */ @@ -101,71 +101,70 @@ public class McBasicCmty extends BaseEntity private Long qtrTargetCompany; /** 纳入政府补贴户数-已收费户数 */ - @ExcelProperty(index = 20,value = "纳入政府补贴户数-已收费户数") + @ExcelProperty(index = 20,value = {"纳入政府补贴户数","已收费户数"}) private Long hhGsgCharged; /** 纳入政府补贴户数-未收费户数 */ - @ExcelProperty(index = 21,value = "纳入政府补贴户数-未收费户数") + @ExcelProperty(index = 21,value = {"纳入政府补贴户数","未收费户数"}) private Long hhGsgUncharged; /** 纳入政府补贴户数-合计 */ - @ExcelProperty(index = 22,value = "纳入政府补贴户数-合计") + @ExcelProperty(index = 22,value = "合计") private Long hhGsgTotal; /** 市场化收费户数-新增户数(财务字段)全款户数 */ - @ExcelProperty(index = 23,value = "市场化收费户数-新增户数(财务字段)全款户数") + @ExcelProperty(index = 23,value = {"市场化收费户数","新增户数(财务字段)","全款户数"}) private Long hhNewFull; /** 市场化收费户数-新增户数(财务字段)分期/定金户数 */ - @ExcelProperty(index = 24,value = "市场化收费户数-新增户数(财务字段)分期/定金户数") + @ExcelProperty(index = 24,value = {"市场化收费户数","新增户数(财务字段)","分期/定金户数"}) private Long hhNewInstall; /** 市场化收费户数-往年应收户数(财务字段)全款户数 */ - @ExcelProperty(index = 25,value = "市场化收费户数-往年应收户数(财务字段)全款户数") + @ExcelProperty(index = 25,value = {"市场化收费户数","往年应收户数(财务字段)","已收费户数","全款户数"}) private Long hhPrevFull; /** 市场化收费户数-往年应收户数(财务字段)分期/定金户数 */ - @ExcelProperty(index = 26,value = "市场化收费户数-往年应收户数(财务字段)分期/定金户数") + @ExcelProperty(index = 26,value = {"市场化收费户数","往年应收户数(财务字段)","已收费户数","分期/定金户数"}) private Long hhPrevInstDp; /** 市场化收费户数-未收费户数 */ - @ExcelProperty(index = 27,value = "市场化收费户数-未收费户数") + @ExcelProperty(index = 27,value = {"市场化收费户数","往年应收户数(财务字段)","未收费户数"}) private Long hhUnchg; /** 暂不可收费户数-其中：提前确认 */ - @ExcelProperty(index = 28,value = "暂不可收费户数-其中：提前确认") + @ExcelProperty(index = 28,value = {"市场化收费户数","其中：提前确认"}) private Long hhUnchgConf; /** 暂不可收费户数-其中：纳入扫雷 */ - @ExcelProperty(index = 29,value = "暂不可收费户数-其中：纳入扫雷") + @ExcelProperty(index = 29,value = {"市场化收费户数","其中：纳入扫雷"}) private Long hhUnchgScan; /** 评价指标-市场化累计回款户数 */ - @ExcelProperty(index = 30,value = "评价指标-市场化累计回款户数") + @ExcelProperty(index = 30,value = {"评价指标","市场化累计回款户数"}) private Long hhEvCumPaid; /** 评价指标-其中：分期/定金户数 */ - @ExcelProperty(index = 31,value = "评价指标-其中：分期/定金户数") + @ExcelProperty(index = 31,value = {"评价指标","其中：分期/定金户数"}) private Long hhEvInst; /** 评价指标-其中：全款户数 */ - @ExcelProperty(index = 32,value = "评价指标-其中：全款户数") + @ExcelProperty(index = 32,value = {"评价指标","其中：全款户数"}) private Long hhEvFull; /** 评价指标-点火户数 */ - @ExcelProperty(index = 33,value = "评价指标-点火户数") + @ExcelProperty(index = 33,value = {"评价指标","点火户数"}) private Long hhEvIgnite; /** 评价指标-累计报装率 */ - @ExcelProperty(index = 34,value = "评价指标-累计报装率") + @ExcelProperty(index = 34,value = {"评价指标","累计报装率"}) private Long hhEvCumSetup; /** 评价指标-累计气化率 */ - @ExcelProperty(index = 35,value = "评价指标-累计气化率") + @ExcelProperty(index = 35,value = {"评价指标","累计气化率"}) private Long hhEvCumGas; /** 删除标志（0：未删除，1：已删除） */ - @ExcelProperty(value = "删除标志") private String defFlag; public void setId(Long id) -- libgit2 0.21.2