From 478503d94dd63d18c4345e551df9724781f53411 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Mon, 20 Jun 2022 16:31:53 +0800
Subject: [PATCH] feat: There is no way the, #55663

---
 .../da/slrs/StandardQA/controller/AskQuestionsController.java | 4 ++--
 .../java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java  | 2 +-
 .../adc/da/slrs/StandardQA/service/AskQuestionsService.java   | 2 +-
 .../slrs/StandardQA/service/Impl/AskQuestionsServiceImpl.java | 4 ++--
 .../mybatis/mapper/askQuestions/AskQuestionsMapper.xml        | 3 +++
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java
index 2b66f3be..591908a9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java
@@ -119,8 +119,8 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
      * @return
      */
     @GetMapping("/getAskQuestionsByakId")
-    public ResponseMessage getAskQuestionsByakId(String id){
-        List<Reply> askQuestionsList = askQuestionsService.getAskQuestionsByakId(id);
+    public ResponseMessage getAskQuestionsByakId(String id,String state){
+        List<Reply> askQuestionsList = askQuestionsService.getAskQuestionsByakId(id,state);
         return Result.success(askQuestionsList);
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java
index d0c0d413..799ef1ea 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java
@@ -34,7 +34,7 @@ public interface AskQuestionsDao extends BaseMapper<AskQuestions> {
 
     List<AskQuestions> getArchiveAskQuestions (String id);
 
-    List<Reply> getAskQuestionsByakId (String id);
+    List<Reply> getAskQuestionsByakId (String id,String state);
 
     List<String> getUId();
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java
index 1506a461..26efa00a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java
@@ -25,7 +25,7 @@ public interface AskQuestionsService extends IService<AskQuestions> {
 
      List<AskQuestions> getAskQuestionsByStandardId(String standardId);
      List<AskQuestions> getArchiveAskQuestions(String id);
-     List<Reply> getAskQuestionsByakId(String id);
+     List<Reply> getAskQuestionsByakId(String id,String state);
 
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/AskQuestionsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/AskQuestionsServiceImpl.java
index 6faa3749..28303729 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/AskQuestionsServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/AskQuestionsServiceImpl.java
@@ -71,8 +71,8 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
     }
 
     @Override
-    public List<Reply> getAskQuestionsByakId(String id) {
-        return askQuestionsDao.getAskQuestionsByakId(id);
+    public List<Reply> getAskQuestionsByakId(String id,String state) {
+        return askQuestionsDao.getAskQuestionsByakId(id,state);
     }
 
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml
index cfa96b18..c88aab9f 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml
@@ -72,6 +72,9 @@
                 <if test="id !=null and id !=''">
                     AND reply.ASK_ID = #{id}
                 </if>
+                <if test="state !=null and state !=''">
+                    AND reply.state = #{state}
+                </if>
             </where>
             order by reply.REPLY_TIME