From c82ccd27d8153fad48dbed93f1189132492b8adc Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 20 Jun 2022 15:48:28 +0800
Subject: [PATCH] =?UTF-8?q?bug=2055837=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AskQuestionsController.java        | 11 +++++++++++
 .../da/slrs/StandardQA/dao/AskQuestionsDao.java   |  2 ++
 .../StandardQA/service/AskQuestionsService.java   |  1 +
 .../service/impl/AskQuestionsServiceImpl.java     |  5 +++++
 .../mapper/askQuestions/AskQuestionsMapper.xml    | 15 +++++++++++++++
 5 files changed, 34 insertions(+)

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..6abcdb85 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
@@ -113,6 +113,17 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
         return Result.success(askQuestionsList);
     }
 
+    /**
+     * 根据标准编号,等查询条件 查询我的回答
+     * @param askQuestions
+     * @return
+     */
+    @GetMapping("/getAskQuestionsNew")
+    public ResponseMessage getAskQuestionsNew(AskQuestions askQuestions){
+         List<AskQuestions> askQuestionsList = askQuestionsService.getAskQuestionsNew(askQuestions);
+        return Result.success(askQuestionsList);
+    }
+
     /**
      * 根据问题ID查询回答***
      * @param id
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..81a4910e 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
@@ -18,6 +18,8 @@ public interface AskQuestionsDao extends BaseMapper<AskQuestions> {
 
     List<AskQuestions> getAskQuestions (@Param("askQuestions") AskQuestions askQuestions);
 
+    List<AskQuestions> getAskQuestionsNew (@Param("askQuestions") AskQuestions askQuestions);
+
     List<AskQuestions> getReplyDetails (@Param("askQuestions") AskQuestions askQuestions);
 
     List<AskQuestions> getReplyDetailsByStandId (@Param("askQuestions") AskQuestions askQuestions);
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..dcc6fbe3 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
@@ -15,6 +15,7 @@ import java.util.List;
 public interface AskQuestionsService extends IService<AskQuestions> {
 
      List<AskQuestions> getAskQuestions(AskQuestions askQuestions);
+     List<AskQuestions> getAskQuestionsNew(AskQuestions askQuestions);
 
      List<AskQuestions> getReplyDetails(AskQuestions askQuestions);
      List<AskQuestions> getReplyDetailsByStandId(AskQuestions askQuestions);
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 f798527a..6aeb10ec 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
@@ -69,6 +69,11 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
         return askQuestionsDao.getAskQuestionsByStandardId(standardId);
     }
 
+    @Override
+    public List<AskQuestions> getAskQuestionsNew(AskQuestions askQuestions) {
+        return askQuestionsDao.getAskQuestionsNew(askQuestions);
+    }
+
     @Override
     public List<AskQuestions> getArchiveAskQuestions(String id) {
         return askQuestionsDao.getArchiveAskQuestions(id);
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 6f397361..3d6364f5 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
@@ -218,6 +218,21 @@
             WHERE
                 ti.`name`='标准法规部'
     </select>
+    <select id="getAskQuestionsNew" resultType="com.adc.da.slrs.StandardQA.entity.AskQuestions">
+        SELECT aq.ID,aq.CLASSIFICATION,aq.PROBLEM_DESCRIPTION,t1.UNAME QUESTIONER,aq.QUESTION_TIME,aq.STANDARD_ENCDOING,
+        aq.STANDARD_NAME,aq.STANDARD_ID
+        FROM ask_questions aq
+        LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER
+        <where>
+            <if test="ask.standardId !=null and ask.standardId !=''">
+                AND aq.STANDARD_ID = #{ask.standardId}
+            </if>
+            <if test="ask.problemDescription !=null and ask.problemDescription !=''">
+                AND aq.PROBLEM_DESCRIPTION LIKE concat(concat('%',#{ask.problemDescription}),'%')
+            </if>
+        </where>
+        order by QUESTION_TIME desc
+    </select>
 
 
 </mapper>