修改医案提醒
This commit is contained in:
@@ -1148,11 +1148,21 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
|||||||
if (quesReplys > 0){
|
if (quesReplys > 0){
|
||||||
info += "思考题";
|
info += "思考题";
|
||||||
}
|
}
|
||||||
int task1Replys = classTaskDao.selectCount(new LambdaQueryWrapper<ClassTask>()
|
List<ClassTask> task1s = classTaskDao.selectList(new LambdaQueryWrapper<ClassTask>()
|
||||||
.eq(ClassTask::getClassId,cu.getClassId())
|
.eq(ClassTask::getClassId,cu.getClassId())
|
||||||
.eq(ClassTask::getType,1)
|
.eq(ClassTask::getType,1));
|
||||||
.notLike(ClassTask::getScoreInfo,"\""+ShiroUtils.getUId()+"\""));
|
boolean flag = false;
|
||||||
if (task1Replys > 0){
|
for (ClassTask ct:task1s){
|
||||||
|
int task1Replys = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
|
||||||
|
.eq(ClassTaskAndQuesReply::getType,0)
|
||||||
|
.eq(ClassTaskAndQuesReply::getClassId,classEntity.getId())
|
||||||
|
.eq(ClassTaskAndQuesReply::getRelationId,ct.getId())
|
||||||
|
.notLike(ClassTaskAndQuesReply::getScoreInfo,"\""+ShiroUtils.getUId()+"\""));
|
||||||
|
if (task1Replys > 0){
|
||||||
|
flag = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (flag){
|
||||||
info += "医案";
|
info += "医案";
|
||||||
}
|
}
|
||||||
int expReplys = classTaskDao.selectCount(new LambdaQueryWrapper<ClassTask>()
|
int expReplys = classTaskDao.selectCount(new LambdaQueryWrapper<ClassTask>()
|
||||||
@@ -1468,8 +1478,11 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
|||||||
for (ClassUser classUser:classUsers){
|
for (ClassUser classUser:classUsers){
|
||||||
params.put("userId",classUser.getUserId());
|
params.put("userId",classUser.getUserId());
|
||||||
Map<String, Object> map = getUserScore(params);
|
Map<String, Object> map = getUserScore(params);
|
||||||
map.put("user",myUserDao.selectById(classUser.getUserId()));
|
MyUserEntity userEntity = myUserDao.selectById(classUser.getUserId());
|
||||||
resultList.add(map);
|
if (userEntity!=null){
|
||||||
|
map.put("user",userEntity);
|
||||||
|
resultList.add(map);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Collections.sort(resultList, new Comparator<Map<String,Object>>() {
|
Collections.sort(resultList, new Comparator<Map<String,Object>>() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user