diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java index a9e54659..9be60687 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java @@ -118,8 +118,8 @@ public class ClassExamServiceImpl extends ServiceImpl i List> sList = new ArrayList<>(); List> mList = new ArrayList<>(); if (courseList.size() > 0) { - int stotal = 10;//单选题总数 - int mtotal = 10;//多选题总数 + int stotal = 5;//单选题总数 + int mtotal = 5;//多选题总数 int snum = (int)Math.floor(stotal/courseList.size()); int mnum = (int)Math.floor(mtotal/courseList.size()); for (ClassCourse classCourse:courseList){ @@ -179,7 +179,7 @@ public class ClassExamServiceImpl extends ServiceImpl i classExamUser.setSubject(JSONUtil.toJsonStr(resultList)); classExamUser.setUserId(ShiroUtils.getUId()); classExamUserDao.insert(classExamUser); - return R.ok().put("examPaper",resultList); + return R.ok().put("examPaper",resultList).put("id",classExamUser.getId()); } @@ -229,7 +229,9 @@ public class ClassExamServiceImpl extends ServiceImpl i @Override public Object getExamPaperInfo(Map params) { List classExamUserList = classExamUserDao.selectList(new LambdaQueryWrapper() - .eq(ClassExamUser::getClassId,params.get("classId")).eq(ClassExamUser::getUserId,params.get("userId"))); + .eq(ClassExamUser::getClassId,params.get("classId")) + .eq(ClassExamUser::getUserId,params.get("userId")) + .orderByDesc(ClassExamUser::getScore)); return classExamUserList; }