Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java

@@ -130,8 +130,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);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java

@@ -36,7 +36,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();
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java

@@ -26,7 +26,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);
 
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java

@@ -80,8 +80,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);
     }
 
 

adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml

@@ -73,6 +73,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