From f57952b75557c31a0d3e3b35108768ceec011c8f Mon Sep 17 00:00:00 2001 From: thesai <1021828630@qq.com> Date: Wed, 11 Sep 2024 14:02:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=AE=9E=E8=AE=AD=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E5=90=8E=E7=9A=84=E8=AF=84=E5=88=86=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84memberId=E5=AD=97=E6=AE=B5=EF=BC=9B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=9E=E8=AE=AD=E6=8C=89id=E9=80=86?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/training2/TrainingV2PublishController.java | 3 +-- .../rtss/services/training2/Training2PublishService.java | 4 +--- .../joylink/rtss/services/training2/Training2Service.java | 1 - .../club/joylink/rtss/vo/paper/PaperTrainAnswerDetail.java | 6 ------ 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/club/joylink/rtss/controller/training2/TrainingV2PublishController.java b/src/main/java/club/joylink/rtss/controller/training2/TrainingV2PublishController.java index cd3c890d5..a4bd7aa69 100644 --- a/src/main/java/club/joylink/rtss/controller/training2/TrainingV2PublishController.java +++ b/src/main/java/club/joylink/rtss/controller/training2/TrainingV2PublishController.java @@ -124,8 +124,7 @@ public class TrainingV2PublishController { */ @PostMapping("/infos") public List findTrainingListInfos( - @RequestBody PublishedTrainingListRspVo vo - , + @RequestBody PublishedTrainingListRspVo vo, @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { //只查询以上架 vo.setState(BusinessConsts.STATUS_USE_INT); diff --git a/src/main/java/club/joylink/rtss/services/training2/Training2PublishService.java b/src/main/java/club/joylink/rtss/services/training2/Training2PublishService.java index a2f6323ce..77f81aa3d 100644 --- a/src/main/java/club/joylink/rtss/services/training2/Training2PublishService.java +++ b/src/main/java/club/joylink/rtss/services/training2/Training2PublishService.java @@ -380,9 +380,7 @@ public class Training2PublishService { if (reqVO.getType() != null) { or.andTypeEqualTo(reqVO.getType().value()); } -// if(reqVO.getOrgId() !=null){ -// or.andOrgIdNotEqualTo(reqVO.getOrgId()); -// } + example.setOrderByClause("id desc"); List list = this.publishedDao.selectByExample(example); if (CollectionUtils.isEmpty(list)) { return List.of(); diff --git a/src/main/java/club/joylink/rtss/services/training2/Training2Service.java b/src/main/java/club/joylink/rtss/services/training2/Training2Service.java index 30b755c7e..49a635a06 100644 --- a/src/main/java/club/joylink/rtss/services/training2/Training2Service.java +++ b/src/main/java/club/joylink/rtss/services/training2/Training2Service.java @@ -328,7 +328,6 @@ public class Training2Service { // .filter(s -> Objects.equals(s.getSimulationMember().getId(), member.getId())) .map(step -> { PaperTrainAnswerDetail detail = new PaperTrainAnswerDetail(); - detail.setMemberId(step.getSimulationMember().getId()); detail.setStepId(step.getId()); detail.setHaveRule(scoreMap.containsKey(step.getId())); detail.setRuleScore(scoreMap.get(step.getId())); diff --git a/src/main/java/club/joylink/rtss/vo/paper/PaperTrainAnswerDetail.java b/src/main/java/club/joylink/rtss/vo/paper/PaperTrainAnswerDetail.java index f36001cb7..e3157bfe9 100644 --- a/src/main/java/club/joylink/rtss/vo/paper/PaperTrainAnswerDetail.java +++ b/src/main/java/club/joylink/rtss/vo/paper/PaperTrainAnswerDetail.java @@ -40,12 +40,6 @@ public class PaperTrainAnswerDetail { */ private List clientOperations; - /** - * 步骤对应的成员的id - */ - private String memberId; - - public static class TrainOperations extends Operation2VO.ClientOperation2VO { }