From 67ae676c9eebd8c45b8ca752f7eb768c926f8a9e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 11 十一月 2025 16:57:34 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java | 10 +++++++---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecordDetail.java | 5 +++++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubject.java | 3 ---
3 files changed, 12 insertions(+), 6 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 56a4d0b..4f000d9 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
@@ -80,8 +80,5 @@
@TableField(exist = false)
private Integer studyType=1;
- @ApiModelProperty(value = "题组id")
- @TableField(exist = false)
- private Integer listenId;
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecordDetail.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecordDetail.java
index cc3bf1b..7cadaf3 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecordDetail.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecordDetail.java
@@ -87,4 +87,9 @@
private Integer status;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "题目")
+ private TSubject subject;
+
}
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 449d565..b15b761 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
@@ -484,7 +484,6 @@
if(studyListen.getType()!=null && studyListen.getType()==2 && i<2){
data.setStudyType(2);
}
- data.setListenId(studyListen.getId());
subs.add(data);
TSubjectRecordDetail tSubjectRecordDetail = new TSubjectRecordDetail();
tSubjectRecordDetail.setUserId(userid);
@@ -493,6 +492,7 @@
tSubjectRecordDetail.setType(1);
tSubjectRecordDetail.setStatus(1);
tSubjectRecordDetail.setObjectId(studyListen.getId());
+ tSubjectRecordDetail.setSubject(data);
tSubjectRecordDetails.add(tSubjectRecordDetail);
i++;
@@ -517,7 +517,6 @@
if(studyListen.getType()!=null && studyListen.getType()==2 && temp<2){
data.setStudyType(2);
}
- data.setListenId(studyListen.getId());
temp++;
subs.add(data);
}
@@ -535,10 +534,15 @@
tSubjectRecordDetail.setStatus(1);
tSubjectRecordDetail.setObjectId(studyListen.getId());
subjectRecordDetailService.save(tSubjectRecordDetail);
+ tSubjectRecordDetail.setSubject(subs.get(i));
tSubjectRecordDetails.add(tSubjectRecordDetail);
}
}else{
- tSubjectRecordDetails.addAll(tSubjectRecordDetail1);
+ for (int i = 0; i < 4; i++) {
+ TSubjectRecordDetail tSubjectRecordDetail = tSubjectRecordDetail1.get( i);
+ tSubjectRecordDetail.setSubject(subs.get(i));
+ tSubjectRecordDetails.add(tSubjectRecordDetail);
+ }
}
}
--
Gitblit v1.7.1