From 983fa9a1f2bbd0f9d99acee673e9c41d47c97b60 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 10 Apr 2023 16:48:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AF=E6=8F=90=E9=97=AE=E4=BA=BA=E6=88=96=E5=9B=9E=E7=AD=94?= =?UTF-8?q?=E4=BA=BA=E5=8F=AF=E7=9C=8B=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E4=B8=8D=E6=98=AF=E5=8F=AA=E8=83=BD=E7=9C=8B?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AskQuestionsController.java | 4 +-- .../slrs/StandardQA/dao/AskQuestionsDao.java | 6 ++++ .../service/AskQuestionsService.java | 2 +- .../askQuestions/AskQuestionsMapper.xml | 36 +++++++++++++++++++ 4 files changed, 45 insertions(+), 3 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 fe674d1e..1cef6c15 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 @@ -157,8 +157,8 @@ public class AskQuestionsController extends BaseController { * @return */ @GetMapping("/getAskQuestionsByakId") - public ResponseMessage getAskQuestionsByakId(String id,String state){ - List askQuestionsList = askQuestionsService.getAskQuestionsByakId(id,state); + public ResponseMessage getAskQuestionsByakId(String id,String state,String userId){ + List askQuestionsList = askQuestionsService.getAskQuestionsByakId(id,state,userId); 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 2d20fa48..274b3687 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 @@ -39,4 +39,10 @@ public interface AskQuestionsDao extends BaseMapper { List getAskQuestionsByakId (@Param("id") String id,@Param("state") String state); List getUId(); + + String selectByRId(@Param("id") String id); + + String selectBYAQId(@Param("id") String id); + + List getAskQuestionsById(@Param("id") String id); } 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 36cf94ba..1b349281 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 @@ -29,7 +29,7 @@ public interface AskQuestionsService extends IService { List getAskQuestionsByStandardId(String standardId); List getArchiveAskQuestions(String id); - List getAskQuestionsByakId(String id,String state); + List getAskQuestionsByakId(String id,String state,String userId); } 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 88e63b05..291e2576 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 @@ -266,5 +266,41 @@ order by QUESTION_TIME desc + + + + + + From c32f8c6cf4a3a826928a145bce6f9f606138c107 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 10 Apr 2023 20:22:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AF=E6=8F=90=E9=97=AE=E4=BA=BA=E6=88=96=E5=9B=9E=E7=AD=94?= =?UTF-8?q?=E4=BA=BA=E5=8F=AF=E7=9C=8B=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E4=B8=8D=E6=98=AF=E5=8F=AA=E8=83=BD=E7=9C=8B?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardQA/controller/ReplyController.java | 1 + .../com/adc/da/slrs/StandardQA/entity/Reply.java | 2 ++ .../service/impl/AskQuestionsServiceImpl.java | 14 ++++++++++++-- .../mapper/askQuestions/AskQuestionsMapper.xml | 6 ++++-- 4 files changed, 19 insertions(+), 4 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 0b5e2100..c559a1e0 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 @@ -84,6 +84,7 @@ public class ReplyController extends BaseController { return Result.error("-1","编辑失败",null); } for(Reply reply: replyList){ + reply.setAnswerer(reply.getAnswererId()); reply.setState("yes"); } replyService.updateBatchById(replyList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java index d89d86f0..14093faa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java @@ -71,4 +71,6 @@ public class Reply extends BaseEntity { @TableField(exist = false) private String taskId; + @TableField(exist = false) + private String answererId; } 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 3960bf9e..3318b90e 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 @@ -8,6 +8,8 @@ import com.adc.da.slrs.StandardQA.entity.AskQuestionsPage; import com.adc.da.slrs.StandardQA.entity.AskQuestionsReplyVO; import com.adc.da.slrs.StandardQA.entity.Reply; import com.adc.da.slrs.StandardQA.service.AskQuestionsService; +import com.adc.da.slrs.sarUser.entity.UpDTO; +import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -39,6 +41,9 @@ public class AskQuestionsServiceImpl extends ServiceImpl getAskQuestions(AskQuestions askQuestions) { return askQuestionsDao.getAskQuestions(askQuestions); @@ -113,8 +118,13 @@ public class AskQuestionsServiceImpl extends ServiceImpl getAskQuestionsByakId(String id,String state) { - return askQuestionsDao.getAskQuestionsByakId(id,state); + public List getAskQuestionsByakId(String id,String state,String userId) { + String questioner = askQuestionsDao.selectBYAQId(id); + String answerer = askQuestionsDao.selectByRId(id); + if (userId.equals(questioner)||userId.equals(answerer)){ + return askQuestionsDao.getAskQuestionsByakId(id,state); + } + return askQuestionsDao.getAskQuestionsById(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 291e2576..e22df6f4 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 @@ -74,7 +74,7 @@ @@ -286,6 +287,7 @@ AND reply.ASK_ID = #{id} + limit 1 @@ -297,7 +299,7 @@ AND reply.ASK_ID = #{id} - AND reply.state = '1' + AND reply.state = 'yes' order by reply.REPLY_TIME