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

公开征求意见 导出 bug修复

Browse Source
This commit is contained in:
yuezhihang
2022-01-12 10:20:28 +08:00
parent 654e7e8127
commit fed0b3dc85
2 changed files with 5 additions and 3 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
+3 -3
View File
@@ -123,6 +123,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
Map<String,String> map=new HashMap<>(); Map<String,String> map=new HashMap<>();
map.put("1","上报"); map.put("1","上报");
map.put("2","处理后上报"); map.put("2","处理后上报");
map.put("3","不上报");
String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20"); String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
List<SarPublicIdeaAll> data=new ArrayList<>(); List<SarPublicIdeaAll> data=new ArrayList<>();
@@ -156,6 +157,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())
.state(map.get(sarPublicIdeaAll.getState()))
.cause(sarPublicIdeaAll.getCause()) .cause(sarPublicIdeaAll.getCause())
.build(); .build();
standExcel.add(getExcelDto); standExcel.add(getExcelDto);
@@ -169,9 +171,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由")); headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由"));
headList.add(Lists.newArrayList("提出部门")); headList.add(Lists.newArrayList("提出部门"));
headList.add(Lists.newArrayList("提出人")); headList.add(Lists.newArrayList("提出人"));
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")
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 state;
private String cause; private String cause;