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 6abcdb85..7452a6ff 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 @@ -130,8 +130,8 @@ public class AskQuestionsController extends BaseController { * @return */ @GetMapping("/getAskQuestionsByakId") - public ResponseMessage getAskQuestionsByakId(String id){ - List askQuestionsList = askQuestionsService.getAskQuestionsByakId(id); + public ResponseMessage getAskQuestionsByakId(String id,String state){ + List 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 81a4910e..1cc215a2 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 @@ -36,7 +36,7 @@ public interface AskQuestionsDao extends BaseMapper { List getArchiveAskQuestions (String id); - List getAskQuestionsByakId (String id); + List getAskQuestionsByakId (String id,String state); List 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 dcc6fbe3..6b56667e 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 @@ -26,7 +26,7 @@ public interface AskQuestionsService extends IService { List getAskQuestionsByStandardId(String standardId); List getArchiveAskQuestions(String id); - List getAskQuestionsByakId(String id); + List 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 6aeb10ec..3c18aeb2 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 @@ -80,8 +80,8 @@ public class AskQuestionsServiceImpl extends ServiceImpl getAskQuestionsByakId(String id) { - return askQuestionsDao.getAskQuestionsByakId(id); + public List 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 2a0cf305..f4d53649 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 @@ -73,6 +73,9 @@ AND reply.ASK_ID = #{id} + + AND reply.state = #{state} + order by reply.REPLY_TIME