9.1

liujie

2 天以前 ba755e563e47cf683e03ad7d12659bb1d8642b93

9.1

 ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/GameDTO.java

@@ -24,6 +24,8 @@
    private String rate;
    @ApiModelProperty("超级记忆通关率")
    private String answerRate;
    @ApiModelProperty("题目ids")
    @ApiModelProperty("题目ids 超级听力")
    private String subjectIds;
    @ApiModelProperty("题目ids 超级记忆")
    private String subjectIdsOne;
}

 ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/GameVO.java

@@ -27,6 +27,8 @@
    private String rate;
    @ApiModelProperty(value = "超级记忆通关率")
    private String answerRate;
    @ApiModelProperty(value = "游戏题目")
    @ApiModelProperty(value = "游戏题目 超级听力")
    private List<TSubject> subjects;
    @ApiModelProperty(value = "游戏题目 超级记忆")
    private List<TSubject> subjectsOne;
}

 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TStudyController.java

@@ -56,8 +56,11 @@
    @ResponseBody
    public AjaxResult addStudySet(@RequestBody AddStudySetDTO dto) {
        System.err.println("后台"+dto);
        if(dto.getGame().getCount()>dto.getGame().getSubjectIds().split(",").length){
            return AjaxResult.error("超级听力选择题目数量不足");
        }
        if(dto.getGame().getAnswerCount()>dto.getGame().getSubjectIds().split(",").length){
            return AjaxResult.error("选择题目数量不足");
            return AjaxResult.error("超级记忆选择题目数量不足");
        }
        R<Object> objectR = studyClient.addStudySet(dto);
        int code = objectR.getCode();

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java

@@ -355,6 +355,7 @@
                studyId.setRate(game.getRate());
                studyId.setAnswerRate(game.getAnswerRate());
                studyId.setSubjectIds(game.getSubjectIds());
                studyId.setSubjectIdsOne(game.getSubjectIdsOne());
                gameService.updateById(studyId);
            } else {
                // 判断当前周目配置的题目数量
@@ -384,6 +385,7 @@
                tGame.setAnswerIntegral(game.getAnswerIntegral());
                tGame.setAnswerCount(game.getAnswerCount());
                tGame.setSubjectIds(game.getSubjectIds());
                tGame.setSubjectIdsOne(game.getSubjectIdsOne());
                gameService.save(tGame);
            }

@@ -931,6 +933,11 @@
            if(subjectIds!=null && subjectIds.length()>0){
                gameVO.setSubjects(subjectService.list(new QueryWrapper<TSubject>()
                        .in("id", subjectIds.split(","))));
            }
            String subjectIdsOne = tGame.getSubjectIdsOne();
            if(subjectIdsOne!=null && subjectIdsOne.length()>0){
                gameVO.setSubjectsOne(subjectService.list(new QueryWrapper<TSubject>()
                        .in("id", subjectIdsOne.split(","))));
            }
            gameVOS.add(gameVO);
        }
@@ -1788,7 +1795,7 @@
        }
//        List<String> subjectId = getSubjectId(week);
        List<String> subjectId = new ArrayList<>();
        String subjectIds = game.getSubjectIds();
        String subjectIds = game.getSubjectIdsOne();
        if(subjectIds!=null){
            String[] split = subjectIds.split(",");
            for (String s : split) {

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGame.java

@@ -84,4 +84,8 @@
    @ApiModelProperty("题目ids")
    private String subjectIds;


    @ApiModelProperty("题目ids")
    private String subjectIdsOne;

}

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/GameDTO.java

@@ -24,7 +24,9 @@
    private Integer answerIntegral;
    @ApiModelProperty("超级记忆游戏题目数量")
    private Integer answerCount;
    @ApiModelProperty("题目ids")
    @ApiModelProperty("题目ids 超级听力")
    private String subjectIds;
    @ApiModelProperty("题目ids 超级记忆 ")
    private String subjectIdsOne;

}

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/GameVO.java

@@ -27,6 +27,9 @@
    private Integer answerIntegral;
    @ApiModelProperty(value = "超级记忆游戏题目数量")
    private Integer answerCount;
    @ApiModelProperty(value = "超级记忆游戏时间")
    @ApiModelProperty(value = "超级听力游戏时间")
    private List<TSubject> subjects;

    @ApiModelProperty(value = "超级记忆游戏时间")
    private List<TSubject> subjectsOne;
}