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

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

@@ -61,16 +61,12 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
         if(StringUtils.isBlank(askQuestions.getUserId())){
             return Result.error();
         }
-        Set<String> askIdList = askQuestionsService.getAskQuestionsPage(askQuestions);
+        QueryWrapper queryWrapper = askQuestionsService.getqueryWrapper(askQuestions);
         //查询出所有的回答
         IPage<AskQuestions> iPage = new Page<>();
         iPage.setSize(askQuestions.getPageSize());
-        iPage.setPages(askQuestions.getPage());
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.orderByDesc("QUESTION_TIME");
-        if(!askIdList.isEmpty()){
-            queryWrapper.in("id",askIdList);
-        }
+        //iPage.setPages(askQuestions.getPage());
+        iPage.setCurrent(askQuestions.getPage());
         IPage<AskQuestions> page =  askQuestionsService.page(iPage,queryWrapper);
         if(!page.getRecords().isEmpty()){
             for (AskQuestions data : page.getRecords()){

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

@@ -5,6 +5,7 @@ import com.adc.da.slrs.StandardQA.entity.AskQuestions;
 import com.adc.da.slrs.StandardQA.entity.AskQuestionsPage;
 import com.adc.da.slrs.StandardQA.entity.Reply;
 import com.adc.da.util.http.ResponseMessage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -34,4 +35,7 @@ public interface AskQuestionsService extends IService<AskQuestions> {
      List<Reply> getAskQuestionsByakId(String id,String state,String userId);
 
      Set<String> getAskQuestionsPage(AskQuestionsPage askQuestions);
+
+     QueryWrapper getqueryWrapper(AskQuestionsPage askQuestions);
+
 }

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

@@ -210,6 +210,29 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
         return askIdList;
     }
 
+    @Override
+    public QueryWrapper getqueryWrapper(AskQuestionsPage askQuestions) {
+        Set<String> askIdList = getAskQuestionsPage(askQuestions);
+        IPage<AskQuestions> iPage = new Page<>();
+        iPage.setSize(askQuestions.getPageSize());
+        iPage.setCurrent(askQuestions.getPage());
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.orderByDesc("QUESTION_TIME");
+        if(!askIdList.isEmpty()){
+            queryWrapper.in("id",askIdList);
+        }
+        if(StringUtils.isNotBlank(askQuestions.getClassification())){
+            queryWrapper.eq("CLASSIFICATION",askQuestions.getClassification());
+        }
+        if(StringUtils.isNotBlank(askQuestions.getProblemDescription())){
+            queryWrapper.like("PROBLEM_DESCRIPTION",askQuestions.getProblemDescription());
+        }
+        if(StringUtils.isNotBlank(askQuestions.getQuestioner())){
+            queryWrapper.eq("QUESTIONER",askQuestions.getQuestioner());
+        }
+        return queryWrapper;
+    }
+
 
     public ResponseMessage selectAskReply(String id) {
          ArrayList<AskQuestionsReplyVO> objects = new ArrayList<>();