Merge remote-tracking branch 'origin/develop_1' into develop_1

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

adc-da-slrs/pom.xml

@@ -127,6 +127,12 @@
             <artifactId>hanlp</artifactId>
             <version>portable-1.7.5</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>19.0</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 </project>

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java

@@ -21,4 +21,5 @@ public interface SarBussStandValDao extends BaseMapper<SarBussStandVal> {
     int deleteDataByStandId(String standId);
 
     int insertForeach(List<SarBussStandVal> list); //批量新增
+
 }

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<SarPublicIdeaAll>
             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<List<String>> headList=new ArrayList<List<String>>();
+            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();

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("修改意见内容(包括理由或依据)")
+//    @ExcelProperty("修改意见内容(包括理由或依据)")
-    private String content;
+//    private String content;
-    @ExcelProperty("提出人")
+    private String oldText;
-    private String userName;
+
-    @ExcelProperty("所在部门")
+    private String newText;
+
+    private String reason;
+//    @ExcelProperty("提出部门")
     private String deptName;
+//    @ExcelProperty("提出人")
+    private String userName;
+
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -1389,7 +1389,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
             if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
                 List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class);
-                String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_STAND_ATTR_INFO");
+                String advanceStr = SarAdvanceSearchUtil.createSql(searchList);
                 if (StringUtils.isNotBlank(advanceStr)) {
                     page.setAdvanceSearchStr(advanceStr);
                 } else {
@@ -1398,6 +1398,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
         }
         page.setOrderBy("SAR_STANDARDS_INFO.issue_time is null,SAR_STANDARDS_INFO.issue_time desc,SAR_STANDARDS_INFO.id");
+        //不知道从哪来的代码，疑似从Dmaster拉下来的
         if(standardsInfoExcelVO.getUserId() != null){
             page.setUserId(standardsInfoExcelVO.getUserId());
         }else {