From 0d2f5578a19fa4619c1a5943b8f9161383dbda3f Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 11 Apr 2022 14:23:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/IcVaccineListResultDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java index 3bd51e39eb..87480268cf 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java @@ -25,9 +25,9 @@ public class IcVaccineListResultDTO implements Serializable { */ @ExcelIgnore private String agencyId; - + @ExcelIgnore private String vaccineId; - + @ExcelIgnore private String userId; /** From a18376cc333c2d8829a41c06562ce6cb1b73213d Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 11 Apr 2022 14:25:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=95=BF=E5=BA=A6=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcTripReportRecordDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 47d23549da..19c09dc284 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -212,7 +212,7 @@ public class IcTripReportRecordDTO implements Serializable { @ExcelIgnore private Boolean heSuanCheck; - @ColumnWidth(20) + @ColumnWidth(25) @ExcelProperty("核算检测关注名单") private String heSuanCheckDesc; -} \ No newline at end of file +} From 757eb8dbca4ad66a3d7c3dcac4b907ee009c2cc7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 11 Apr 2022 14:27:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=20=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java index d75b510bec..378ea5a725 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java @@ -57,7 +57,7 @@ public class ExcelUtils { Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list); Sheet sheet1 = workbook.getSheetAt(0); sheet1.setDefaultColumnWidth(50*256); - sheet1.setDefaultRowHeight((short)(2*256)); + //sheet1.setDefaultRowHeight((short)(2*256)); ServletOutputStream out = ExcelUtils.getOutputStreamForExcel(fileName,response); workbook.write(out); out.flush();