From a5e00ef286ac35b99905598d51c60d42809c7985 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 16 Dec 2021 15:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E4=BB=A5=E5=8F=8A=E6=B5=81=E7=A8=8B=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/common/TableToExcel.java  | 42 ++++++++++++-------
 .../sarStandIdea/entity/SarPublicIdea.java    |  3 ++
 .../sarStandIdea/entity/SarPublicIdeaAll.java |  9 ++++
 .../controller/SarStandFileEOController.java  |  2 +-
 .../sarStandIdea/SarPublicIdeaAllMapper.xml   | 11 +++--
 5 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java
index 2229e53e..ff511b51 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java
+++ b/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));
                 }
-                Cell hCellh = headRow.createCell(2);
-                hCellh.setCellValue("修改意见内容");
-                Cell hCell = headRow.createCell(5);
-                hCell.setCellValue("提出部门");
-                Cell hCell1 = headRow.createCell(6);
-                hCell1.setCellValue("提出人");
-                Cell hCell2 = headRow.createCell(7);
-                hCell2.setCellValue("处理意见");
-                Cell nCell = neckRow.createCell(2);
-                nCell.setCellValue("修改前");
-                Cell nCell1 = neckRow.createCell(3);
-                nCell1.setCellValue("修改后");
-                Cell nCell2 = neckRow.createCell(4);
-                nCell2.setCellValue("修改理由");
+                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("修改后");
+                }
+                if (null!=columnMap.get("reason")) {
+                    Cell nCell1 = neckRow.createCell(4);
+                    nCell1.setCellValue("修改理由");
+                }
 
 
                 //从第三行开始填充数据
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java
index 6c21bd31..a3609dcd 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java
+++ b/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;
+
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java
index c50619dd..59b7b231 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java
+++ b/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;
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java
index cceb64d5..6cd5d163 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java
+++ b/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);
     }
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
index c2488f4b..2e872438 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+++ b/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}