From 391169aeea3fdaeaaad0b4f9b8018e5c131ced97 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 16 Dec 2021 18:07:54 +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=E9=83=A8=E5=88=86=20=E7=9A=84=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=A2=84=E5=A4=87=20=E4=BB=A5=E5=8F=8A=20?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=A2=84=E5=A4=87=20=EF=BC=88=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E8=87=AA=E6=B5=8B=E5=AE=8C=E6=88=90=20=E6=9C=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E9=9C=80=E8=A6=81=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=8E=E6=B5=81=E7=A8=8B=E5=BC=80=E5=A7=8B=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E4=BC=A0=E8=BE=93=E6=95=B0=E6=8D=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarPublicIdeaAllController.java |  4 ++--
 .../sarStandIdea/dao/SarPublicIdeaAllDao.java  |  2 +-
 .../sarStandIdea/SarPublicIdeaAllMapper.xml    | 18 ++++++++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

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 653cd5a1..4608b4c5 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
@@ -99,7 +99,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
 
     @ApiOperation(value = "导出全部意见")
     @GetMapping("/tuallStand")
-    public void getAllStand(HttpServletResponse response,String cid){
+    public void getAllStand(HttpServletResponse response,@RequestParam(value = "cid")String cid,@RequestParam(value = "type",required = false)String type){
         try {
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
@@ -107,7 +107,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             List<SarPublicIdeaAll> data=new ArrayList<>();
             if (!StringUtils.isEmpty(cid)){
-                data=sarPublicIdeaAllDao.getPublicAllIdea(cid);
+                data=sarPublicIdeaAllDao.getPublicAllIdea(cid,type);
             }
             List<GetExcelDto> standExcel=new ArrayList<>();
             for (SarPublicIdeaAll sarPublicIdeaAll:data){
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
index d3fae93a..d361e5ee 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
@@ -27,5 +27,5 @@ public interface SarPublicIdeaAllDao extends BaseMapper<SarPublicIdeaAll> {
 
     Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId);
 
-    List<SarPublicIdeaAll> getPublicAllIdea(@Param("cid") String cid);
+    List<SarPublicIdeaAll> getPublicAllIdea(@Param("cid") String cid,@Param("type")String type);
 }
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 f79665b8..0312f1f2 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
@@ -6,38 +6,44 @@
         SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,ts_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
+         sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag
         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
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
-        WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}
+        WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} and sar_public_idea_all.wk_flag is null
     </select>
 
     <select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-         SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,
+         SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,sar_public_idea_all.wk_flag,
          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_all
          left join ts_user on sar_public_idea_all.user_id=ts_user.USID
          left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
          WHERE
-         sar_public_idea_all.idea_id = #{ideaId}
+         sar_public_idea_all.idea_id = #{ideaId} and sar_public_idea_all.wk_flag is null
          LIMIT ${(page-1)*size},${size}
     </select>
 
     <select id="getAllDataByIdeaCount" resultType="java.lang.Integer">
          SELECT count(id)
          FROM sar_public_idea_all WHERE
-         idea_id = #{ideaId}
+         idea_id = #{ideaId} and sar_public_idea_all.wk_flag is null
     </select>
 
     <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name
+        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag
         FROM sar_public_idea_all
         left join ts_user on ts_user.USID=sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
         WHERE cid = #{cid}
+        <if test="null==type or ''==type">
+            and sar_public_idea_all.wk_flag is null
+        </if>
+        <if test="null!=type and type != ''">
+            and sar_public_idea_all.wk_flag =='1'
+        </if>
         ORDER BY part_code ASC
     </select>
 </mapper>