From 983fa9a1f2bbd0f9d99acee673e9c41d47c97b60 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Mon, 10 Apr 2023 16:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=B8=AD=E5=BF=83=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF?=
 =?UTF-8?q?=E6=8F=90=E9=97=AE=E4=BA=BA=E6=88=96=E5=9B=9E=E7=AD=94=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=AF=E7=9C=8B=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E4=B8=8D=E6=98=AF=E5=8F=AA=E8=83=BD=E7=9C=8B=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AskQuestionsController.java    |  4 +--
 .../slrs/StandardQA/dao/AskQuestionsDao.java  |  6 ++++
 .../service/AskQuestionsService.java          |  2 +-
 .../askQuestions/AskQuestionsMapper.xml       | 36 +++++++++++++++++++
 4 files changed, 45 insertions(+), 3 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 fe674d1e..1cef6c15 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
@@ -157,8 +157,8 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
      * @return
      */
     @GetMapping("/getAskQuestionsByakId")
-    public ResponseMessage getAskQuestionsByakId(String id,String state){
-        List<Reply> askQuestionsList = askQuestionsService.getAskQuestionsByakId(id,state);
+    public ResponseMessage getAskQuestionsByakId(String id,String state,String userId){
+        List<Reply> askQuestionsList = askQuestionsService.getAskQuestionsByakId(id,state,userId);
         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 2d20fa48..274b3687 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
@@ -39,4 +39,10 @@ public interface AskQuestionsDao extends BaseMapper<AskQuestions> {
     List<Reply> getAskQuestionsByakId (@Param("id") String id,@Param("state") String state);
 
     List<String> getUId();
+
+    String selectByRId(@Param("id") String id);
+
+    String selectBYAQId(@Param("id") String id);
+
+    List<Reply> getAskQuestionsById(@Param("id") String id);
 }
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 36cf94ba..1b349281 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
@@ -29,7 +29,7 @@ public interface AskQuestionsService extends IService<AskQuestions> {
 
      List<AskQuestions> getAskQuestionsByStandardId(String standardId);
      List<AskQuestions> getArchiveAskQuestions(String id);
-     List<Reply> getAskQuestionsByakId(String id,String state);
+     List<Reply> getAskQuestionsByakId(String id,String state,String userId);
 
 
 }
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 88e63b05..291e2576 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
@@ -266,5 +266,41 @@
         order by QUESTION_TIME desc
     </select>
 
+    <select id="selectByRId" resultType="java.lang.String">
+        SELECT reply.ANSWERER
+        FROM reply
+        LEFT JOIN ts_user t2 ON t2.USID = reply.ANSWERER
+        <where>
+            <if test="id != null and id !=''">
+                AND reply.ASK_ID = #{id}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectBYAQId" resultType="java.lang.String">
+        SELECT ask_questions.QUESTIONER
+        FROM ask_questions
+        LEFT JOIN ts_user t2 ON t2.USID = ask_questions.QUESTIONER
+        left join reply on reply.ASK_ID = ask_questions.ID
+        <where>
+            <if test="id != null and id !=''">
+                AND reply.ASK_ID = #{id}
+            </if>
+        </where>
+    </select>
+
+    <select id="getAskQuestionsById" resultType="com.adc.da.slrs.StandardQA.entity.Reply">
+        SELECT reply.ID, reply.REPLY,reply.REPLY_TIME,t2.UNAME ANSWERER,reply.APPENDIX_ID,APPENDIX_NAME,reply.state
+        FROM reply
+        LEFT JOIN ts_user t2 ON t2.USID = reply.ANSWERER
+        <where>
+            <if test="id !=null and id !=''">
+                AND reply.ASK_ID = #{id}
+            </if>
+                AND reply.state = '1'
+        </where>
+        order by reply.REPLY_TIME
+    </select>
+
 
 </mapper>