修改第二次加入小班bug,思考题评分列表修改,成绩保留两位数
This commit is contained in:
@@ -632,7 +632,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
||||
wrapper.selectAll(ClassEntity.class);
|
||||
wrapper.eq(ClassEntity::getState,"0");
|
||||
String classSql = "select 1 from ( select c.id from class c left join class_course cc on cc.model_id = c.model_id left join class_user cu on cu.class_id = c.id where c.del_flag = 0 and cc.del_flag = 0 and cu.del_flag = 0 and cu.user_id = "+ShiroUtils.getUId()+" ) s where s.id = t.id";
|
||||
String courseSql = "select 1 from (select cc.model_id from class_course cc where cc.del_flag = 0 and cc.course_id in (select cc.course_id from class_course cc left join class_model cm on cm.id = cc.model_id left join class c on c.model_id = cm.id left join class_user cu on cu.class_id = c.id where cc.del_flag = 0 and cm.del_flag = 0 and c.del_flag = 0 and cu.del_flag = 0 and cu.user_id = "+ShiroUtils.getUId()+")) q where q.model_id = t.model_id";
|
||||
String courseSql = "select 1 from (select cc.model_id from class_course cc where cc.del_flag = 0 and cc.course_id in (select cc.course_id from class_course cc left join class_model cm on cm.id = cc.model_id left join class c on c.model_id = cm.id left join class_user cu on cu.class_id = c.id where cc.del_flag = 0 and cm.del_flag = 0 and c.del_flag = 0 and cu.del_flag = 0 and c.state != 2 and cu.user_id = "+ShiroUtils.getUId()+")) q where q.model_id = t.model_id";
|
||||
wrapper.notExists(classSql);
|
||||
wrapper.notExists(courseSql);
|
||||
return this.baseMapper.selectList(wrapper);
|
||||
@@ -1284,6 +1284,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
||||
ClassTaskAndQuesReply reply = classTaskAndQuesReplyDao.selectOne(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
|
||||
.eq(ClassTaskAndQuesReply::getRelationId,m.get("id"))
|
||||
.eq(ClassTaskAndQuesReply::getType,"1")
|
||||
.eq(ClassTaskAndQuesReply::getClassId,params.get("classId"))
|
||||
.eq(ClassTaskAndQuesReply::getUserId,ShiroUtils.getUId()));
|
||||
m.put("reply",reply);
|
||||
}
|
||||
@@ -1463,10 +1464,13 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
||||
if (experienceScore.compareTo(new BigDecimal(classModel.getExperienceScore()))>-1){
|
||||
experienceScore = new BigDecimal(classModel.getExperienceScore());
|
||||
}
|
||||
experienceScore = experienceScore.setScale(2,RoundingMode.HALF_UP);
|
||||
map.put("experienceScore",experienceScore);
|
||||
usualScore = usualScore.add(experienceScore);
|
||||
userScore = userScore.add(experienceScore);
|
||||
}
|
||||
usualScore = usualScore.setScale(2,RoundingMode.HALF_UP);
|
||||
userScore = userScore.setScale(2,RoundingMode.HALF_UP);
|
||||
map.put("usualScore",usualScore);
|
||||
map.put("userScore",userScore);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user