zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

思考题列表去掉空

Browse Source
This commit is contained in:
wuchunlei
2024-09-20 11:49:57 +08:00
parent 1ce98b5ec8
commit ec02ce9b43
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
View File

@@ -806,16 +806,12 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
for (ClassTask classTask:classTaskPage.getRecords()){ for (ClassTask classTask:classTaskPage.getRecords()){
int alreadyReply = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>() int alreadyReply = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
.eq(ClassTaskAndQuesReply::getRelationId,classTask.getId())); .eq(ClassTaskAndQuesReply::getRelationId,classTask.getId()));
int noScore = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
.eq(ClassTaskAndQuesReply::getRelationId,classTask.getId())
.lt(ClassTaskAndQuesReply::getScoreSuccess,2));
int userNoCount = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>() int userNoCount = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
.eq(ClassTaskAndQuesReply::getRelationId,classTask.getId()) .eq(ClassTaskAndQuesReply::getRelationId,classTask.getId())
.lt(ClassTaskAndQuesReply::getScoreSuccess,2) .lt(ClassTaskAndQuesReply::getScoreSuccess,2)
.notLike(ClassTaskAndQuesReply::getScoreInfo,"\""+ShiroUtils.getUId()+"\"")); .notLike(ClassTaskAndQuesReply::getScoreInfo,"\""+ShiroUtils.getUId()+"\""));
Map<String,Object> result = new HashMap<>(); Map<String,Object> result = new HashMap<>();
result.put("setGiveHomeWorkNumber",alreadyReply); result.put("setGiveHomeWorkNumber",alreadyReply);
result.put("setNoGiveScoreNumber",noScore);
result.put("userNoCount",userNoCount); result.put("userNoCount",userNoCount);
classTask.setOtherInfo(result); classTask.setOtherInfo(result);
} }
@@ -1046,6 +1042,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
map.put("courseEntity",courseEntity); map.put("courseEntity",courseEntity);
MPJLambdaWrapper<CourseCatalogueChapterEntity> chapterWrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<CourseCatalogueChapterEntity> chapterWrapper = new MPJLambdaWrapper<>();
chapterWrapper.eq(CourseCatalogueChapterEntity::getCourseId,courseEntity.getId()); chapterWrapper.eq(CourseCatalogueChapterEntity::getCourseId,courseEntity.getId());
chapterWrapper.ne(CourseCatalogueChapterEntity::getQuestions,"");
chapterWrapper.select(CourseCatalogueChapterEntity::getId,CourseCatalogueChapterEntity::getTitle); chapterWrapper.select(CourseCatalogueChapterEntity::getId,CourseCatalogueChapterEntity::getTitle);
chapterWrapper.orderByAsc(CourseCatalogueChapterEntity::getSort); chapterWrapper.orderByAsc(CourseCatalogueChapterEntity::getSort);
List<Map<String,Object>> chapterList = courseCatalogueChapterDao.selectMaps(chapterWrapper); List<Map<String,Object>> chapterList = courseCatalogueChapterDao.selectMaps(chapterWrapper);