diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml
index 951b761a..a0370e61 100644
--- a/adc-da-slrs/pom.xml
+++ b/adc-da-slrs/pom.xml
@@ -127,6 +127,12 @@
hanlp
portable-1.7.5
+
+ com.google.guava
+ guava
+ 19.0
+ compile
+
\ No newline at end of file
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java
index e03fc1cd..986f4737 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java
@@ -21,4 +21,5 @@ public interface SarBussStandValDao extends BaseMapper {
int deleteDataByStandId(String standId);
int insertForeach(List list); //批量新增
+
}
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 0750f6c6..e5fd8b62 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
@@ -10,6 +10,7 @@ import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.collect.Lists;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
@@ -109,13 +110,24 @@ public class SarPublicIdeaAllController extends BaseController
for (SarPublicIdeaAll sarPublicIdeaAll:data){
GetExcelDto getExcelDto=GetExcelDto.builder()
.partCode(sarPublicIdeaAll.getPartCode())
- .content(sarPublicIdeaAll.getContent())
+ .oldText(sarPublicIdeaAll.getOldText())
+ .newText(sarPublicIdeaAll.getNewText())
+ .reason(sarPublicIdeaAll.getReason())
.userName(sarPublicIdeaAll.getUserName())
.deptName(sarPublicIdeaAll.getDeptName())
.build();
standExcel.add(getExcelDto);
}
- EasyExcel.write(response.getOutputStream(),GetExcelDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1")
+
+ List> headList=new ArrayList>();
+ headList.add(Lists.newArrayList("章节编号"));
+ headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改前"));
+ headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改后"));
+ headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由"));
+ headList.add(Lists.newArrayList("提出部门"));
+ headList.add(Lists.newArrayList("提出人"));
+
+ EasyExcel.write(response.getOutputStream(),GetExcelDto.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1")
.doWrite(standExcel);
} catch (Exception e) {
response.reset();
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 37b2a020..80e65918 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
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandIdea.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentLoopMerge;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -23,13 +24,20 @@ import lombok.NoArgsConstructor;
@ColumnWidth(15)
public class GetExcelDto {
- @ExcelProperty("章节编号")
+// @ExcelProperty("章节编号")
private String partCode;
- @ExcelProperty("修改意见内容(包括理由或依据)")
- private String content;
- @ExcelProperty("提出人")
- private String userName;
- @ExcelProperty("所在部门")
+// @ExcelProperty("修改意见内容(包括理由或依据)")
+// private String content;
+ private String oldText;
+
+ private String newText;
+
+ private String reason;
+// @ExcelProperty("提出部门")
private String deptName;
+// @ExcelProperty("提出人")
+ private String userName;
+
+
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index ac587322..97b368c2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -1398,7 +1398,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getList = dao.getSarStandardsExportInfo(page);
attrInfoShow(getList);
return getList;