joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

[修改]实训结束后的评分删除多余的memberId字段；查询实训按id逆序排列
All checks were successful
CI / Docker-Build (push) Successful in 2m13s
Details

Browse Source
This commit is contained in:
thesai 2024-09-11 14:02:16 +08:00
parent 9c9e7c60e3
commit f57952b755
4 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/club/joylink/rtss/controller/training2/TrainingV2PublishController.java
View File

@ -124,8 +124,7 @@ public class TrainingV2PublishController {
*/ */
@PostMapping("/infos") @PostMapping("/infos")
public List<PublishedTraining2InfoRspVo> findTrainingListInfos( public List<PublishedTraining2InfoRspVo> findTrainingListInfos(
@RequestBody PublishedTrainingListRspVo vo @RequestBody PublishedTrainingListRspVo vo,
,
@RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) {
//只查询以上架 //只查询以上架
vo.setState(BusinessConsts.STATUS_USE_INT); vo.setState(BusinessConsts.STATUS_USE_INT);

4
src/main/java/club/joylink/rtss/services/training2/Training2PublishService.java
View File

@ -380,9 +380,7 @@ public class Training2PublishService {
if (reqVO.getType() != null) { if (reqVO.getType() != null) {
or.andTypeEqualTo(reqVO.getType().value()); or.andTypeEqualTo(reqVO.getType().value());
} }
// if(reqVO.getOrgId() !=null){ example.setOrderByClause("id desc");
// or.andOrgIdNotEqualTo(reqVO.getOrgId());
// }
List<PublishedTraining2> list = this.publishedDao.selectByExample(example); List<PublishedTraining2> list = this.publishedDao.selectByExample(example);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return List.of(); return List.of();

1
src/main/java/club/joylink/rtss/services/training2/Training2Service.java
View File

@ -328,7 +328,6 @@ public class Training2Service {
// .filter(s -> Objects.equals(s.getSimulationMember().getId(), member.getId())) // .filter(s -> Objects.equals(s.getSimulationMember().getId(), member.getId()))
.map(step -> { .map(step -> {
PaperTrainAnswerDetail detail = new PaperTrainAnswerDetail(); PaperTrainAnswerDetail detail = new PaperTrainAnswerDetail();
detail.setMemberId(step.getSimulationMember().getId());
detail.setStepId(step.getId()); detail.setStepId(step.getId());
detail.setHaveRule(scoreMap.containsKey(step.getId())); detail.setHaveRule(scoreMap.containsKey(step.getId()));
detail.setRuleScore(scoreMap.get(step.getId())); detail.setRuleScore(scoreMap.get(step.getId()));

6
src/main/java/club/joylink/rtss/vo/paper/PaperTrainAnswerDetail.java
View File

@ -40,12 +40,6 @@ public class PaperTrainAnswerDetail {
*/ */
private List<TrainOperations> clientOperations; private List<TrainOperations> clientOperations;
/**
* 步骤对应的成员的id
*/
private String memberId;
public static class TrainOperations extends Operation2VO.ClientOperation2VO { public static class TrainOperations extends Operation2VO.ClientOperation2VO {
} }