From 5a57b1b73022877150bb7a5fba58d1a636874dfa Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 15:01:31 +0800
Subject: [PATCH] 1020更新
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java | 11 +++++++++++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyModelVO.java | 2 ++
ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyPairMapper.xml | 1 +
ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyAnswerMapper.xml | 1 +
ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyLookMapper.xml | 1 +
ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyInductionMapper.xml | 1 +
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubject.java | 5 +++++
ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyListenMapper.xml | 1 +
8 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubject.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubject.java
index c2e72b2..8dba22c 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubject.java
+++ b/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;
+
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
index e3d9d1e..d1eba40 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
+++ b/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);
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyModelVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyModelVO.java
index f391e77..0dc2043 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyModelVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyModelVO.java
@@ -20,4 +20,6 @@
@ApiModelProperty("自主学习题目所包含录音图片等")
private List<List<TSubject>> subjectList;
+
+
}
diff --git a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyAnswerMapper.xml b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyAnswerMapper.xml
index 14d7aca..96db38b 100644
--- a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyAnswerMapper.xml
+++ b/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>
diff --git a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyInductionMapper.xml b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyInductionMapper.xml
index b6e5a1c..810d924 100644
--- a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyInductionMapper.xml
+++ b/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>
diff --git a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyListenMapper.xml b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyListenMapper.xml
index 55b9e2f..635413f 100644
--- a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyListenMapper.xml
+++ b/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>
diff --git a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyLookMapper.xml b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyLookMapper.xml
index b2a3249..8e857d9 100644
--- a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyLookMapper.xml
+++ b/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>
diff --git a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyPairMapper.xml b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyPairMapper.xml
index 8d4fba8..933b098 100644
--- a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TStudyPairMapper.xml
+++ b/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>
--
Gitblit v1.7.1