From 7aa1c4a80cfa774eeaaea1dd6afba274f2a77eca Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 4 Apr 2023 15:36:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E7=AD=94=E8=BF=94=E5=9B=9E=E6=89=80=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=92=8C=E5=9B=9E=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AskQuestionsController.java | 5 ++++ .../entity/AskQuestionsReplyVO.java | 13 +++++++++ .../service/impl/AskQuestionsServiceImpl.java | 29 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsReplyVO.java 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 7693ce2c..fe674d1e 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 @@ -311,4 +311,9 @@ public class AskQuestionsController extends BaseController { return Result.success(objects); } + @PostMapping("/selectAskReply") + public ResponseMessage selectAskReply(String id){ + + return askQuestionsService.selectAskReply(id); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsReplyVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsReplyVO.java new file mode 100644 index 00000000..50692179 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsReplyVO.java @@ -0,0 +1,13 @@ +package com.adc.da.slrs.StandardQA.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class AskQuestionsReplyVO { + + private AskQuestions askQuestions; + + private List replyList; +} 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 c3574e69..3960bf9e 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 @@ -2,10 +2,14 @@ package com.adc.da.slrs.StandardQA.service.Impl; import com.adc.da.slrs.StandardQA.dao.AskQuestionsDao; +import com.adc.da.slrs.StandardQA.dao.ReplyDao; import com.adc.da.slrs.StandardQA.entity.AskQuestions; 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.util.http.ResponseMessage; +import com.adc.da.util.http.Result; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -17,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; /** @@ -31,6 +36,9 @@ public class AskQuestionsServiceImpl extends ServiceImpl getAskQuestions(AskQuestions askQuestions) { return askQuestionsDao.getAskQuestions(askQuestions); @@ -110,4 +118,25 @@ public class AskQuestionsServiceImpl extends ServiceImpl objects = new ArrayList<>(); + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("STANDARD_ID",id); + List askQuestions = askQuestionsDao.selectList(objectQueryWrapper); + if(!askQuestions.isEmpty()){ + for (AskQuestions data:askQuestions){ + AskQuestionsReplyVO askQuestionsReplyVO = new AskQuestionsReplyVO(); + QueryWrapper replyQueryWrapper = new QueryWrapper<>(); + replyQueryWrapper.eq("ASK_ID",data.getId()); + List replies = replyDao.selectList(replyQueryWrapper); + askQuestionsReplyVO.setAskQuestions(data); + if(!replies.isEmpty()){ + askQuestionsReplyVO.setReplyList(replies); + } + objects.add(askQuestionsReplyVO); + } + + } + return Result.success(objects); + } } From c8c55a839b96498eaa35d79309f91d35504cf362 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 4 Apr 2023 17:44:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=9A=E8=BF=87id=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 6 ++++++ .../service/ISarBussionessStandService.java | 2 ++ .../impl/SarBussionessStandServiceImpl.java | 16 ++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index d2a60dbc..f117a5aa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -524,5 +524,11 @@ public class SarBussionessStandController extends BaseController ResponseMessage newRpetitionFile(); ResponseMessage selectMaxStandnSn(); + + ResponseMessage selectById(String id,String type); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index e4f4371f..a08ee712 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -70,6 +70,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao; @@ -4332,6 +4333,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList,String standId,String attfId) { //重复的集合 List chongfu = new ArrayList<>();