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-11 09:33:49 +08:00
parent 868390b85e
commit 4b8624a3c2
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1028,11 +1028,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
questionWrapper.leftJoin(ClassEntity.class,ClassEntity::getModelId,ClassModel::getId); questionWrapper.leftJoin(ClassEntity.class,ClassEntity::getModelId,ClassModel::getId);
questionWrapper.selectAll(ClassTaskAndQuesReply.class); questionWrapper.selectAll(ClassTaskAndQuesReply.class);
questionWrapper.eq(ClassEntity::getId,classEntity.getId()); questionWrapper.eq(ClassEntity::getId,classEntity.getId());
if (params.containsKey("userId")){ questionWrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
questionWrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
}else {
questionWrapper.eq(ClassTaskAndQuesReply::getUserId,ShiroUtils.getUId());
}
questionWrapper.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId()); questionWrapper.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId());
List<ClassTaskAndQuesReply> questionReplys = classTaskAndQuesReplyDao.selectList(questionWrapper); List<ClassTaskAndQuesReply> questionReplys = classTaskAndQuesReplyDao.selectList(questionWrapper);
if (questionReplys.size() > 0) { if (questionReplys.size() > 0) {
@@ -1051,7 +1047,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
task0wrapper.selectAll(ClassTaskAndQuesReply.class); task0wrapper.selectAll(ClassTaskAndQuesReply.class);
task0wrapper.eq(ClassTask::getClassId,classEntity.getId()); task0wrapper.eq(ClassTask::getClassId,classEntity.getId());
task0wrapper.eq(ClassTask::getType,"0"); task0wrapper.eq(ClassTask::getType,"0");
task0wrapper.eq(ClassTaskAndQuesReply::getUserId,ShiroUtils.getUId()); task0wrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
List<ClassTaskAndQuesReply> task0Replys = classTaskAndQuesReplyDao.selectList(task0wrapper); List<ClassTaskAndQuesReply> task0Replys = classTaskAndQuesReplyDao.selectList(task0wrapper);
if (task0Replys.size() > 0) { if (task0Replys.size() > 0) {
for (ClassTaskAndQuesReply reply : task0Replys) { for (ClassTaskAndQuesReply reply : task0Replys) {
@@ -1069,7 +1065,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
task1wrapper.selectAll(ClassTaskAndQuesReply.class); task1wrapper.selectAll(ClassTaskAndQuesReply.class);
task1wrapper.eq(ClassTask::getClassId,classEntity.getId()); task1wrapper.eq(ClassTask::getClassId,classEntity.getId());
task1wrapper.eq(ClassTask::getType,"1"); task1wrapper.eq(ClassTask::getType,"1");
task1wrapper.eq(ClassTaskAndQuesReply::getUserId,ShiroUtils.getUId()); task1wrapper.eq(ClassTaskAndQuesReply::getUserId,params.get("userId"));
List<ClassTaskAndQuesReply> task1Replys = classTaskAndQuesReplyDao.selectList(task1wrapper); List<ClassTaskAndQuesReply> task1Replys = classTaskAndQuesReplyDao.selectList(task1wrapper);
if (task1Replys.size() > 0) { if (task1Replys.size() > 0) {
for (ClassTaskAndQuesReply reply : task1Replys) { for (ClassTaskAndQuesReply reply : task1Replys) {
@@ -1083,7 +1079,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
if (classModel.getIsExperience()==1){ if (classModel.getIsExperience()==1){
double experienceScore = 0; double experienceScore = 0;
MPJLambdaWrapper<ClassTask> experiencewrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<ClassTask> experiencewrapper = new MPJLambdaWrapper<>();
experiencewrapper.eq(ClassTask::getUserId,ShiroUtils.getUId()); experiencewrapper.eq(ClassTask::getUserId,params.get("userId"));
experiencewrapper.eq(ClassTask::getClassId,classEntity.getId()); experiencewrapper.eq(ClassTask::getClassId,classEntity.getId());
experiencewrapper.eq(ClassTask::getType,"2"); experiencewrapper.eq(ClassTask::getType,"2");
List<ClassTask> experiences = classTaskDao.selectList(experiencewrapper); List<ClassTask> experiences = classTaskDao.selectList(experiencewrapper);
@@ -1206,11 +1202,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
Collections.sort(resultList, new Comparator<Map<String,Object>>() { Collections.sort(resultList, new Comparator<Map<String,Object>>() {
@Override @Override
public int compare(Map<String,Object> m1, Map<String,Object> m2) { public int compare(Map<String,Object> m1, Map<String,Object> m2) {
if((double)(m2.get("userScore")) > (double)(m1.get("userScore"))){ return ((BigDecimal)m2.get("userScore")).compareTo((BigDecimal)m1.get("userScore"));
return 1;
}else {
return -1;
}
} }
}); });
} }