打分列表排序按,自己没有评的→等待其他人评的→全部评分完成的
This commit is contained in:
@@ -886,6 +886,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
|||||||
wrapper.selectAll(ClassTask.class);
|
wrapper.selectAll(ClassTask.class);
|
||||||
wrapper.select("IF(LOCATE('"+"\""+ShiroUtils.getUId()+"\""+"', score_info)>0,1,0) as flag");
|
wrapper.select("IF(LOCATE('"+"\""+ShiroUtils.getUId()+"\""+"', score_info)>0,1,0) as flag");
|
||||||
wrapper.orderByAsc("flag");
|
wrapper.orderByAsc("flag");
|
||||||
|
wrapper.orderByAsc(ClassTask::getScoreSuccess);
|
||||||
}
|
}
|
||||||
wrapper.eq(ClassTask::getType,params.get("type"));
|
wrapper.eq(ClassTask::getType,params.get("type"));
|
||||||
}
|
}
|
||||||
@@ -1017,6 +1018,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
|||||||
wrapper.selectAll(ClassTaskAndQuesReply.class);
|
wrapper.selectAll(ClassTaskAndQuesReply.class);
|
||||||
wrapper.select("IF(LOCATE('"+"\""+ShiroUtils.getUId()+"\""+"', score_info)>0,1,0) as flag");
|
wrapper.select("IF(LOCATE('"+"\""+ShiroUtils.getUId()+"\""+"', score_info)>0,1,0) as flag");
|
||||||
wrapper.orderByAsc("flag");
|
wrapper.orderByAsc("flag");
|
||||||
|
wrapper.orderByAsc(ClassTaskAndQuesReply::getScoreSuccess);
|
||||||
wrapper.orderByAsc(ClassTaskAndQuesReply::getCreateTime);
|
wrapper.orderByAsc(ClassTaskAndQuesReply::getCreateTime);
|
||||||
Page<ClassTaskAndQuesReply> TaskAndQuesReplyPage = classTaskAndQuesReplyDao.selectPage(new Page<>(page, limit), wrapper);
|
Page<ClassTaskAndQuesReply> TaskAndQuesReplyPage = classTaskAndQuesReplyDao.selectPage(new Page<>(page, limit), wrapper);
|
||||||
for (ClassTaskAndQuesReply classTaskAndQuesReply :TaskAndQuesReplyPage.getRecords()){
|
for (ClassTaskAndQuesReply classTaskAndQuesReply :TaskAndQuesReplyPage.getRecords()){
|
||||||
@@ -1248,6 +1250,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
|||||||
replyWrap.selectAs(CourseCatalogueChapterEntity::getQuestions,"questions");
|
replyWrap.selectAs(CourseCatalogueChapterEntity::getQuestions,"questions");
|
||||||
replyWrap.selectAs(ClassTaskAndQuesReply::getCreateTime,"createTime");
|
replyWrap.selectAs(ClassTaskAndQuesReply::getCreateTime,"createTime");
|
||||||
replyWrap.orderByAsc("flag");
|
replyWrap.orderByAsc("flag");
|
||||||
|
replyWrap.orderByAsc("scoreSuccess");
|
||||||
replyWrap.orderByAsc("createTime");
|
replyWrap.orderByAsc("createTime");
|
||||||
Page<Map<String,Object>> replyPage = classTaskAndQuesReplyDao.selectMapsPage(new Page<>(page, limit), replyWrap);
|
Page<Map<String,Object>> replyPage = classTaskAndQuesReplyDao.selectMapsPage(new Page<>(page, limit), replyWrap);
|
||||||
for (Map<String,Object> map:replyPage.getRecords()){
|
for (Map<String,Object> map:replyPage.getRecords()){
|
||||||
|
|||||||
Reference in New Issue
Block a user