From dc5f63fdb5a94b0a2cb7755d50ecf994d5db16eb Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 10 Jan 2022 18:25:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E5=AF=BC=E5=87=BA=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandIdea/controller/SarPublicIdeaAllController.java | 3 ++- .../java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index f1d5d28a..fcd93676 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -156,6 +156,7 @@ public class SarPublicIdeaAllController extends BaseController .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) + .cause(sarPublicIdeaAll.getCause()) .build(); standExcel.add(getExcelDto); } @@ -170,8 +171,8 @@ public class SarPublicIdeaAllController extends BaseController headList.add(Lists.newArrayList("提出人")); if ("1".equals(type)){ headList.add(Lists.newArrayList("处理意见")); - headList.add(Lists.newArrayList("原因")); } + headList.add(Lists.newArrayList("原因")); if ("1".equals(type)) { EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(standExcel2); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java index 80e65918..fc5a877b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java @@ -38,6 +38,8 @@ public class GetExcelDto { // @ExcelProperty("提出人") private String userName; + private String cause; + }