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 fcd93676..33e28534 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 @@ -123,6 +123,7 @@ public class SarPublicIdeaAllController extends BaseController Map map=new HashMap<>(); map.put("1","上报"); map.put("2","处理后上报"); + map.put("3","不上报"); String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); @@ -156,6 +157,7 @@ public class SarPublicIdeaAllController extends BaseController .reason(sarPublicIdeaAll.getReason()) .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) + .state(map.get(sarPublicIdeaAll.getState())) .cause(sarPublicIdeaAll.getCause()) .build(); standExcel.add(getExcelDto); @@ -169,9 +171,7 @@ public class SarPublicIdeaAllController extends BaseController 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("原因")); if ("1".equals(type)) { EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") 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 fc5a877b..505f964e 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 state; + private String cause;