From a1510b361cc91a6217655b7d35bda4fa33e6e148 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 20 Jun 2022 14:47:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?bug=2055833=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml | 1 + 1 file changed, 1 insertion(+) 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 cfa96b18..6f397361 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 @@ -49,6 +49,7 @@ AND aq.STANDARD_ID = #{standardId} + order by QUESTION_TIME desc + From 9d7ac6ecf04d11b75edb3b07b2772e83a434537d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 20 Jun 2022 16:09:13 +0800 Subject: [PATCH 5/9] 55657 --- .../mybatis/mapper/askQuestions/AskQuestionsMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3d6364f5..2a0cf305 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 @@ -204,7 +204,7 @@ From 478503d94dd63d18c4345e551df9724781f53411 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 20 Jun 2022 16:31:53 +0800 Subject: [PATCH 7/9] feat: There is no way the, #55663 --- .../da/slrs/StandardQA/controller/AskQuestionsController.java | 4 ++-- .../java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java | 2 +- .../adc/da/slrs/StandardQA/service/AskQuestionsService.java | 2 +- .../slrs/StandardQA/service/Impl/AskQuestionsServiceImpl.java | 4 ++-- .../mybatis/mapper/askQuestions/AskQuestionsMapper.xml | 3 +++ 5 files changed, 9 insertions(+), 6 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 2b66f3be..591908a9 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 @@ -119,8 +119,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 d0c0d413..799ef1ea 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 @@ -34,7 +34,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 1506a461..26efa00a 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 @@ -25,7 +25,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 6faa3749..28303729 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 @@ -71,8 +71,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 cfa96b18..c88aab9f 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 @@ -72,6 +72,9 @@ AND reply.ASK_ID = #{id} + + AND reply.state = #{state} + order by reply.REPLY_TIME From ad965b5d7d82955c091310797e971a94ea49cbbf Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 20 Jun 2022 17:21:42 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1cc215a2..6607aa07 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,7 +18,7 @@ public interface AskQuestionsDao extends BaseMapper { List getAskQuestions (@Param("askQuestions") AskQuestions askQuestions); - List getAskQuestionsNew (@Param("askQuestions") AskQuestions askQuestions); + List getAskQuestionsNew (@Param("ask") AskQuestions askQuestions); List getReplyDetails (@Param("askQuestions") AskQuestions askQuestions); From 9f84c0facf5cd15c2f5042ced41a7f0cbbb309aa Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 20 Jun 2022 18:11:32 +0800 Subject: [PATCH 9/9] feat: There is no way the, bug #55865 --- .../da/slrs/StandardQA/controller/ReplyController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java index 2573d3ea..0acbaaf4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.StandardQA.controller; import com.adc.da.base.web.BaseController; +import com.adc.da.common.ConvertMqEO; import com.adc.da.slrs.StandardQA.entity.AskQuestions; import com.adc.da.slrs.StandardQA.entity.Reply; import com.adc.da.slrs.StandardQA.service.Impl.ReplyServiceImpl; @@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Author: qk @@ -41,9 +43,11 @@ public class ReplyController extends BaseController { if(StringUtils.isEmpty(reply.getReply())){ return Result.error("-1","请输入回答内容"); } - if(reply.getFileList().size() >0) { - reply.setAppendixId(reply.getFileList().get(0).getAttId()); - reply.setAppendixName(reply.getFileList().get(0).getName()); + if(!reply.getFileList().isEmpty()) { + String appendixIds = reply.getFileList().stream().map(ConvertMqEO::getId).collect(Collectors.joining(","));; + String appendixNames = reply.getFileList().stream().map(ConvertMqEO::getName).collect(Collectors.joining(","));; + reply.setAppendixId(appendixIds); + reply.setAppendixName(appendixNames); } reply.setReplyTime(new Date()); reply.setId(UUIDUtils.randomUUID20());