From 9c399ca46e7328a2251dceca648238748a5f67d4 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 5 Dec 2023 16:12:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=93=E7=B3=BB=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E5=BA=8F=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarMenuStandard/entity/StandSystemDTO.java | 5 +++++ .../service/impl/SarMenuStandardNewServiceNewImpl.java | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index e599c3a5..0e35b6f7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -27,6 +27,10 @@ public class StandSystemDTO { @ApiModelProperty(value = "节点Id") private String menuId; + @ApiModelProperty(value = "序号") + @Excel(name = "序号", width = 10, orderNum = "0") + private Integer standIndex; + @Excel(name = "体系结构", width = 40, orderNum = "1") @ApiModelProperty(value = "体系结构") private String standSystem; @@ -49,6 +53,7 @@ public class StandSystemDTO { private String standName; @ApiModelProperty(value = "标准状态") + @Excel(name = "文本状态", width = 25, orderNum = "4") private String standState; @ApiModelProperty(value = "文本状态") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index fe74cbb5..c96659d6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -351,6 +351,11 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl pageList = resultList.subList(start, end); + int standIndex = 1; + for (StandSystemDTO dto : pageList) { + dto.setStandIndex(standIndex); + standIndex++; + } // 使用MyBatis Plus的Page类来构造分页对象 Page page = new Page<>(pageNum, pageSize, total); @@ -391,6 +396,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl dataList; standSystemDTO.setPage(1); standSystemDTO.setPageSize(Integer.MAX_VALUE); + if (StringUtils.isBlank(standSystemDTO.getExportName())) { + standSystemDTO.setExportName("标准体系"); + } try { response.setHeader("Content-Disposition", "attachment; filename=" + ReadExcel.encodeFileName(standSystemDTO.getExportName() + ".xlsx",