ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubject.java
@@ -75,4 +75,9 @@ @TableField(exist = false) private Integer sort; @ApiModelProperty(value = "题目类型 1常规 2示例 ") @TableField(exist = false) private Integer studyType=1; } ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
@@ -477,9 +477,13 @@ List<String> subjectIds = Arrays.stream(studyListen.getSubject().split(",")).collect(Collectors.toList()); List<TSubject> subs = new ArrayList<>(); // 图片及语音集合 int i=0; for (String id : subjectIds) { TSubject data = subjectService.lambdaQuery().eq(TSubject::getId, id) .eq(TSubject::getDisabled, 0).one(); if(studyListen.getType()==2 && i<2){ data.setStudyType(2); } subs.add(data); TSubjectRecordDetail tSubjectRecordDetail = new TSubjectRecordDetail(); tSubjectRecordDetail.setUserId(userid); @@ -489,6 +493,8 @@ tSubjectRecordDetail.setStatus(1); tSubjectRecordDetail.setObjectId(studyListen.getId()); tSubjectRecordDetails.add(tSubjectRecordDetail); i++; } subjectList.add(subs); } @@ -503,9 +509,14 @@ List<String> subjectIds = Arrays.stream(studyListen.getSubject().split(",")).collect(Collectors.toList()); List<TSubject> subs = new ArrayList<>(); // 图片及语音集合 int temp=0; for (String id : subjectIds) { TSubject data = subjectService.lambdaQuery().eq(TSubject::getId, id) .eq(TSubject::getDisabled, 0).one(); if(studyListen.getType()==2 && temp<2){ data.setStudyType(2); } temp++; subs.add(data); } subjectList.add(subs); ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyModelVO.java
@@ -20,4 +20,6 @@ @ApiModelProperty("自主学习题目所包含录音图片等") private List<List<TSubject>> subjectList; } ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyAnswerMapper.xml
@@ -13,5 +13,6 @@ and sl.week = #{week} and s.quarter = #{quarter} </where> order by sl.studySort asc </select> </mapper> ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyInductionMapper.xml
@@ -13,5 +13,6 @@ and sl.week = #{week} and s.quarter = #{quarter} </where> order by sl.studySort asc </select> </mapper> ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyListenMapper.xml
@@ -10,5 +10,6 @@ sl.disabled = 0 and s.disabled = 0 and sl.day = #{day} and sl.week = #{week} and s.quarter = #{quarter} </where> order by sl.studySort asc </select> </mapper> ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyLookMapper.xml
@@ -10,5 +10,6 @@ sl.disabled = 0 and s.disabled = 0 and sl.day = #{day} and sl.week = #{week} and s.quarter = #{quarter} </where> order by sl.studySort asc </select> </mapper> ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyPairMapper.xml
@@ -13,5 +13,6 @@ and sl.week = #{week} and s.quarter = #{quarter} </where> order by sl.studySort asc </select> </mapper>
