FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公开征求意见导出 修复

Browse Source
This commit is contained in:
yuezhihang
2022-01-10 18:25:55 +08:00
parent 596528bcbf
commit dc5f63fdb5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
+2 -1
View File
@@ -156,6 +156,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
.reason(sarPublicIdeaAll.getReason()) .reason(sarPublicIdeaAll.getReason())
.userName(sarPublicIdeaAll.getUserName()) .userName(sarPublicIdeaAll.getUserName())
.deptName(sarPublicIdeaAll.getDeptName()) .deptName(sarPublicIdeaAll.getDeptName())
.cause(sarPublicIdeaAll.getCause())
.build(); .build();
standExcel.add(getExcelDto); standExcel.add(getExcelDto);
} }
@@ -170,8 +171,8 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
headList.add(Lists.newArrayList("提出人")); headList.add(Lists.newArrayList("提出人"));
if ("1".equals(type)){ if ("1".equals(type)){
headList.add(Lists.newArrayList("处理意见")); headList.add(Lists.newArrayList("处理意见"));
headList.add(Lists.newArrayList("原因"));
} }
headList.add(Lists.newArrayList("原因"));
if ("1".equals(type)) { if ("1".equals(type)) {
EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1")
.doWrite(standExcel2); .doWrite(standExcel2);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java
+2
View File
@@ -38,6 +38,8 @@ public class GetExcelDto {
// @ExcelProperty("提出人") // @ExcelProperty("提出人")
private String userName; private String userName;
private String cause;
} }