From 401510af482a05aa777db983791f8e7594edaec2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 08 七月 2025 13:53:55 +0800
Subject: [PATCH] 新增迭代
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
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 2f5da68..8fc166f 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
@@ -446,7 +446,7 @@
StudyListenResultVO studyListenResultVO = new StudyListenResultVO(learnStudy, subjectList);
List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
- .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list();
+ .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count();
int listenSize = listenList.size();
@@ -560,7 +560,7 @@
StudyLookResultVO studyListenResultVO = new StudyLookResultVO(learnStudy, subjectList);
List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
- .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list();
+ .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count();
int listenSize = listenList.size();
@@ -572,7 +572,7 @@
.eq(TStudyListen::getDay, 1).last("limit 1").one();
if (one!=null){
if (listenRate<(Double.parseDouble(one.getRate())/100)){
- return R.fail("听音选图未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%");
+ return R.fail("听音选图未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
}
}
}
@@ -704,7 +704,7 @@
.eq(TSubjectRecordDetail::getDay, day)
.eq(TSubjectRecordDetail::getType, 3).list();
List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
- .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list();
+ .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 2).collect(Collectors.toList());
int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count();
int listenSize = listenList.size();
@@ -716,7 +716,7 @@
.eq(TStudyLook::getDay, 2).last("limit 1").one();
if (one!=null){
if (listenRate<(Double.parseDouble(one.getRate())/100)){
- return R.fail("看图选音未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%");
+ return R.fail("看图选音未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
}
}
}
@@ -881,7 +881,7 @@
.eq(TSubjectRecordDetail::getDay, day)
.eq(TSubjectRecordDetail::getType, 4).list();
List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
- .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list();
+ .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 3).collect(Collectors.toList());
int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count();
int listenSize = listenList.size();
@@ -893,7 +893,7 @@
.eq(TStudyInduction::getDay, 3).last("limit 1").one();
if (one!=null){
if (listenRate<(Double.parseDouble(one.getRate())/100)){
- return R.fail("归纳排除未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%");
+ return R.fail("归纳排除未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
}
}
}
@@ -1066,7 +1066,7 @@
.eq(TSubjectRecordDetail::getDay, day)
.eq(TSubjectRecordDetail::getType, 5).list();
List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
- .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list();
+ .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count();
int listenSize = listenList.size();
@@ -1078,7 +1078,7 @@
.eq(TStudyAnswer::getDay, 4).last("limit 1").one();
if (one!=null){
if (listenRate<(Double.parseDouble(one.getRate())/100)){
- return R.fail("归纳排除未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%");
+ return R.fail("归纳排除未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
}
}
}
--
Gitblit v1.7.1