公开征求意见以及流程部分功能修复

adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java

@@ -47,20 +47,34 @@ public class TableToExcel {
                     if (j<3)
                         hCell.setCellValue(columnMap.get(key));
                 }
+                if (null!=columnMap.get("commentText")) {
                     Cell hCellh = headRow.createCell(2);
                     hCellh.setCellValue("修改意见内容");
+                }
+                if (null!=columnMap.get("department")) {
                     Cell hCell = headRow.createCell(5);
                     hCell.setCellValue("提出部门");
+                }
+                if (null!=columnMap.get("responUserName")) {
                     Cell hCell1 = headRow.createCell(6);
                     hCell1.setCellValue("提出人");
+                }
+                if (null!=columnMap.get("stateText")) {
                     Cell hCell2 = headRow.createCell(7);
                     hCell2.setCellValue("处理意见");
+                }
+                if (null!=columnMap.get("oldText")) {
                     Cell nCell = neckRow.createCell(2);
                     nCell.setCellValue("修改前");
+                }
+                if (null!=columnMap.get("newText")) {
                     Cell nCell1 = neckRow.createCell(3);
                     nCell1.setCellValue("修改后");
-                Cell nCell2 = neckRow.createCell(4);
+                }
-                nCell2.setCellValue("修改理由");
+                if (null!=columnMap.get("reason")) {
+                    Cell nCell1 = neckRow.createCell(4);
+                    nCell1.setCellValue("修改理由");
+                }
 
 
                 //从第三行开始填充数据

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java

@@ -72,5 +72,8 @@ public class SarPublicIdea extends BaseEntity {
     @TableField("files_name")
     private String filesName;
 
+    @TableField("wkfiles")
+    private String wkfiles;
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java

@@ -63,4 +63,13 @@ public class SarPublicIdeaAll extends BaseEntity {
 
     public static final String CID = "cid";
 
+    @TableField("chapter_name")
+    private String chapterName;
+
+    @TableField(exist = false)
+    private String department;
+
+    @TableField("wk_flag")
+    private String wkFlag;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java

@@ -162,7 +162,7 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
     @GetMapping("/querySourceFileInfo")
     public ResponseMessage<List<SarStandFileEO>> querySourceFileInfo(String standId){
 
-        List<SarStandFileEO> sarStandFileEOS = sarStandFileEOService.selectFileByStandId(standId);
+        List<SarStandFileEO> sarStandFileEOS = sarStandFileEOService.querySourceFileInfo(standId);
         return Result.success(sarStandFileEOS);
     }
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml

@@ -3,15 +3,20 @@
 <mapper namespace="com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao">
 
     <select id="getPublicIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.* FROM sar_public_idea
+        SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_user.INSTITUTION_NAME as dept_name,ts_user.INSTITUTION_NAME as department,sar_public_idea_all.old_text,
+         sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
+         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
+         sar_public_idea_all.chapter_name as chapterName
+        FROM sar_public_idea
         INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id
+        left join ts_user on ts_user.USID = sar_public_idea_all.user_id
         WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}
     </select>
 
     <select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
          SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_user.INSTITUTION_NAME as dept_name,sar_public_idea_all.old_text,
          sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
-         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid
+         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,sar_public_idea_all.chapter_name as chapterName
          FROM sar_public_idea_all
          left join ts_user on sar_public_idea_all.user_id=ts_user.USID
          WHERE
@@ -26,7 +31,7 @@
     </select>
 
     <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_user.INSTITUTION_NAME as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid
+        SELECT sar_public_idea_all.id,reason,ts_user.INSTITUTION_NAME as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name
         FROM sar_public_idea_all
         left join ts_user on ts_user.USID=sar_public_idea_all.user_id
         WHERE cid = #{cid}