From d93e9fb2ba3db1cfa2d00eddaac23124eca98b23 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 12 Jan 2022 11:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandIdea/controller/SarPublicIdeaController.java  | 8 ++++----
 .../mapper/sarStandIdea/SarPublicIdeaAllMapper.xml        | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java
index e447f216..7b0341a6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java
@@ -74,10 +74,10 @@ public class SarPublicIdeaController extends BaseController<SarPublicIdea> {
 //            c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天
 //            sarPublicIdea.setStartTime(c.getTime());
 //
-//            Calendar c2 = Calendar.getInstance();
-//            c2.setTime(sarPublicIdea.getEndTime());
-//            c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天
-//            sarPublicIdea.setEndTime(c2.getTime());
+            Calendar c2 = Calendar.getInstance();
+            c2.setTime(sarPublicIdea.getEndTime());
+            c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天
+            sarPublicIdea.setEndTime(c2.getTime());
 
             sarPublicIdeaService.save(sarPublicIdea);
         }catch(Exception e){
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 3fe43621..94b5e2fa 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
@@ -11,7 +11,7 @@
         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} and sar_public_idea_all.wk_flag is null
+        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">
@@ -23,14 +23,14 @@
          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} and sar_public_idea_all.wk_flag is null
+         sar_public_idea_all.idea_id = #{ideaId}
          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} and sar_public_idea_all.wk_flag is null
+         idea_id = #{ideaId}
     </select>
 
     <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">