From 4bd8568a118afeb9e7504a19cf98af59757de3d5 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 25 Dec 2023 15:40:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5):=2079?= =?UTF-8?q?390?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/vo/EnterpriseStandardInspectVo.java | 12 ++++++++++-- .../EnterpriseStandardInspectServiceImpl.java | 16 ++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java index 0eccee58..6bdc8bfe 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java @@ -105,7 +105,7 @@ public class EnterpriseStandardInspectVo { /** * 实际稽查完成日期 */ - @Excel(name = "实际稽查完成日期", width = 16, format = "yyyy-MM-dd", needMerge = true) + @Excel(name = "实际稽查完成日期", width = 18, format = "yyyy-MM-dd", needMerge = true) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "实际稽查完成日期") @@ -128,7 +128,7 @@ public class EnterpriseStandardInspectVo { /** * 稽查状态 */ - @Excel(name = "稽查状态", width = 15, dicCode = "inspect_status", needMerge = true) + @Excel(name = "状态", width = 15, dicCode = "inspect_status", needMerge = true) @Dict(dicCode = "inspect_status") @ApiModelProperty(value = "稽查状态") private String inspectStatus; @@ -154,6 +154,7 @@ public class EnterpriseStandardInspectVo { @ApiModelProperty(value = "整改计划") @ExcelCollection(name = "") private List enterpriseStandardInspectRectifyPlanList = Collections.emptyList(); + //================================= /** * ids 查询用 @@ -182,4 +183,11 @@ public class EnterpriseStandardInspectVo { @ApiModelProperty(value = "企标编号/企标名称 查询用") @TableField(exist = false) private String inspectNoOrName; + + /** + * 勾选数据 导出用 + */ + @ApiModelProperty(value = "勾选数据 导出用") + @TableField(exist = false) + private String selections; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java index 81985b2f..99e7a9fd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java @@ -86,12 +86,20 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl enterpriseStandardInspectVoIPage = this.queryByPage(enterpriseStandardInspectVo, 1, Integer.MAX_VALUE); - List records = enterpriseStandardInspectVoIPage.getRecords(); - + List enterpriseStandardInspectVoList= this.queryByList(enterpriseStandardInspectVo); + if (Objects.isNull(enterpriseStandardInspectVoList)){ + enterpriseStandardInspectVoList = new ArrayList<>(); + } + if (StringUtils.isNotBlank(enterpriseStandardInspectVo.getSelections())){ + enterpriseStandardInspectVoList = enterpriseStandardInspectVoList.stream() + .filter(v -> enterpriseStandardInspectVo.getSelections().contains(v.getId())) + .collect(Collectors.toList()); + } // 设置导出参数 ExportParams exportParams = new ExportParams(null, sheetName); // 可以为标题添加更多的配置 - Workbook workbook = ExcelExportUtil.exportExcel(exportParams, EnterpriseStandardInspectVo.class, records); + String[] excludes = {"存在问题", "整改措施", "整改负责人", "整改计划完成时间", "整改实际完成时间", "整改状态"}; + exportParams.setExclusions(excludes); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, EnterpriseStandardInspectVo.class, enterpriseStandardInspectVoList); // 编码文件名以兼容各种浏览器 String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");