完善集团校、发布对象、预习统计

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolController.java

@@ -133,11 +133,7 @@ public class SchoolController {
     @PostMapping("/sfschool")
     public ResultVo saveSchoolFriend(@RequestBody SchoolParams params) {
         Integer schoolid = params.getSchoolid();
-        List<Integer> schoolids = params.getSchoolids();
         N_Utils.validation(new Object[]{schoolid, "学校id", 1});
-        if(N_Utils.isListEmpty(schoolids)){
-            return new ResultVo(1,"未选择学校");
-        }
         schoolService.saveSchoolFriend(params);
         return new ResultVo(0, "保存成功");
     }

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java

@@ -429,22 +429,25 @@ public class SchoolService {
     public void saveSchoolFriend(SchoolParams params){
         //先移除学校关联学校
         schoolFriendMapper.deleteBySchoolid(params.getSchoolid());
-
-        List<TSchoolFriend> schoolfriends = new ArrayList<>();
         List<Integer> schoolids  = params.getSchoolids();
-        int timestemp = N_Utils.getSecondTimestamp();
-        for(Integer shid : schoolids){
-            if(!params.getSchoolid().equals(shid)){
-                TSchoolFriend sf = new TSchoolFriend();
-                sf.setSchoolid(params.getSchoolid());
-                sf.setFschoolid(shid);
-                sf.setCreateid(params.getCreateid());
-                sf.setCreatetime(timestemp);
-                schoolfriends.add(sf);
+
+        if(N_Utils.isListNotEmpty(schoolids)){
+            List<TSchoolFriend> schoolfriends = new ArrayList<>();
+
+            int timestemp = N_Utils.getSecondTimestamp();
+            for(Integer shid : schoolids){
+                if(!params.getSchoolid().equals(shid)){
+                    TSchoolFriend sf = new TSchoolFriend();
+                    sf.setSchoolid(params.getSchoolid());
+                    sf.setFschoolid(shid);
+                    sf.setCreateid(params.getCreateid());
+                    sf.setCreatetime(timestemp);
+                    schoolfriends.add(sf);
+                }
+            }
+            if(N_Utils.isListNotEmpty(schoolfriends)){
+                schoolFriendMapper.insertList(schoolfriends);
             }
-        }
-        if(N_Utils.isListNotEmpty(schoolfriends)){
-            schoolFriendMapper.insertList(schoolfriends);
         }
     }
 

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paperstudent/PaperClassController.java

@@ -53,7 +53,11 @@ public class PaperClassController {
         N_Utils.validation(new Object[]{paperid, "试卷id", 1, createid, "发布人id", 1
                 , papertype, "作业类型", 1, schoolid, "学校id", 1});
         Map list = paperClassService.listObject(paperid, createid, papertype, schoolid);
-        return new ResultVo(0, "获取发布对象成功", list);
+        if(N_Utils.isEmpty(list.get("classes"))){
+            return new ResultVo(1,"发布对象为空，请联系管理员设置班级权限");
+        }else{
+            return new ResultVo(0, "获取发布对象成功", list);
+        }
     }
 
     /**

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperClassService.java

@@ -146,82 +146,86 @@ public class PaperClassService {
                 , LinkedHashMap::new, Collectors.toList()));
         List<Integer> studentids = groups.stream().map(m -> (Integer) m.get("studentid")).distinct().collect(Collectors.toList());
 
-        List<Map> users = paperClassMapper.listUserByIds(studentids);
-        Map<Integer, Map> userMap = users.stream().collect(Collectors.toMap(m -> (Integer) m.get("userid"), m -> m));
-        if (papertype == 3) {//靶向作业
-            List<QuestionVo> questions = paperClassMapper.listPaperQuestions(paperid);
-            for (QuestionVo question : questions) {
-                String qstemtxt = question.getQstemtxt();
-                if(N_Utils.isNotEmpty(qstemtxt)){
-                    List<Map> sonqlist=JSON.parseArray(qstemtxt, Map.class);
-                    question.setSonqlist(sonqlist);
-                }
-                question.setQstemtxt(null);
-                List<PointVo> points = JSON.parseArray(question.getSource(), PointVo.class);
-                question.setPoints(points);
-                question.setSource(null);
-            }
-            paper.put("questions", questions);
-            List<String> questionids = questions.stream().map(QuestionVo::getQuestionid).collect(Collectors.toList());
-            List<Map> stuQuestions = paperClassMapper.listStuQuestion(questionids, studentids);
-            for (Integer studentid : studentids) {
-                List<String> stuQuestionIds = new ArrayList<>();//学生未收到或未得满分的试题ids
-                Double paperscore = 0.0;//试卷总分
+        List<Map> classes = new ArrayList<>();
+
+        if(N_Utils.isListNotEmpty(studentids)){
+            List<Map> users = paperClassMapper.listUserByIds(studentids);
+            Map<Integer, Map> userMap = users.stream().collect(Collectors.toMap(m -> (Integer) m.get("userid"), m -> m));
+            if (papertype == 3) {//靶向作业
+                List<QuestionVo> questions = paperClassMapper.listPaperQuestions(paperid);
                 for (QuestionVo question : questions) {
-                    String questionid = question.getQuestionid();
-                    boolean anyMatch = stuQuestions.stream().anyMatch(m -> m.get("studentid").equals(studentid)
-                            && m.get("questionid").equals(questionid));
-                    if (!anyMatch) {
-                        stuQuestionIds.add(questionid);
-                        paperscore = ArithUtil.add(paperscore, question.getScore());
+                    String qstemtxt = question.getQstemtxt();
+                    if(N_Utils.isNotEmpty(qstemtxt)){
+                        List<Map> sonqlist=JSON.parseArray(qstemtxt, Map.class);
+                        question.setSonqlist(sonqlist);
                     }
+                    question.setQstemtxt(null);
+                    List<PointVo> points = JSON.parseArray(question.getSource(), PointVo.class);
+                    question.setPoints(points);
+                    question.setSource(null);
                 }
-                Map stuQue = userMap.get(studentid);
-                stuQue.put("questionids", stuQuestionIds);
-                stuQue.put("paperscore", paperscore);
-                userMap.put(studentid, stuQue);
-            }
-        }
-        List<Map> classes = new ArrayList<>();
-        for (Map.Entry<Integer, List<Map>> entry : classList.entrySet()) {
-            Integer classid = entry.getKey();
-            List<Map> groupList = entry.getValue();
-            Map gMap = groupList.get(0);
-            Map c = new HashMap();
-            c.put("classid", classid);
-            c.put("gradeid", gMap.get("gradeid"));
-            c.put("classname", gMap.get("classname"));
-            LinkedHashMap<Integer, List<Map>> groupCollect = groupList.stream().collect(Collectors.groupingBy(m -> (Integer) m.get("groupid")
-                    , LinkedHashMap::new, Collectors.toList()));
-            List<Map> groups2 = new ArrayList<>();
-            for (Map.Entry<Integer, List<Map>> gentry : groupCollect.entrySet()) {
-                List<Map> studentList = gentry.getValue();
-                Map sMap = studentList.get(0);
-                Map g = new HashMap();
-                g.put("groupid", gentry.getKey());
-                g.put("groupname", sMap.get("groupname"));
-                g.put("groupnum", sMap.get("groupnum"));
-                g.put("grouptype", sMap.get("grouptype"));
-                List<Map> students = new ArrayList<>();
-                for (Map map : studentList) {
-                    Map s = new HashMap();
-                    Object studentid = map.get("studentid");
-                    s.put("studentid", studentid);
-                    Map stuMap = userMap.get(studentid);
-                    s.put("studentname", stuMap.get("username"));
-                    s.put("questionids", stuMap.get("questionids"));
-                    s.put("paperscore", stuMap.get("paperscore"));
-                    s.put("headpic", stuMap.get("headpic"));
-                    students.add(s);
+                paper.put("questions", questions);
+                List<String> questionids = questions.stream().map(QuestionVo::getQuestionid).collect(Collectors.toList());
+                List<Map> stuQuestions = paperClassMapper.listStuQuestion(questionids, studentids);
+                for (Integer studentid : studentids) {
+                    List<String> stuQuestionIds = new ArrayList<>();//学生未收到或未得满分的试题ids
+                    Double paperscore = 0.0;//试卷总分
+                    for (QuestionVo question : questions) {
+                        String questionid = question.getQuestionid();
+                        boolean anyMatch = stuQuestions.stream().anyMatch(m -> m.get("studentid").equals(studentid)
+                                && m.get("questionid").equals(questionid));
+                        if (!anyMatch) {
+                            stuQuestionIds.add(questionid);
+                            paperscore = ArithUtil.add(paperscore, question.getScore());
+                        }
+                    }
+                    Map stuQue = userMap.get(studentid);
+                    stuQue.put("questionids", stuQuestionIds);
+                    stuQue.put("paperscore", paperscore);
+                    userMap.put(studentid, stuQue);
                 }
+            }
 
-                students = students.stream().sorted(Comparator.comparing(m -> m.get("studentname").toString()))
-                        .collect(Collectors.toList());
-                g.put("students", students);
-                groups2.add(g);
+            for (Map.Entry<Integer, List<Map>> entry : classList.entrySet()) {
+                Integer classid = entry.getKey();
+                List<Map> groupList = entry.getValue();
+                Map gMap = groupList.get(0);
+                Map c = new HashMap();
+                c.put("classid", classid);
+                c.put("gradeid", gMap.get("gradeid"));
+                c.put("classname", gMap.get("classname"));
+                LinkedHashMap<Integer, List<Map>> groupCollect = groupList.stream().collect(Collectors.groupingBy(m -> (Integer) m.get("groupid")
+                        , LinkedHashMap::new, Collectors.toList()));
+                List<Map> groups2 = new ArrayList<>();
+                for (Map.Entry<Integer, List<Map>> gentry : groupCollect.entrySet()) {
+                    List<Map> studentList = gentry.getValue();
+                    Map sMap = studentList.get(0);
+                    Map g = new HashMap();
+                    g.put("groupid", gentry.getKey());
+                    g.put("groupname", sMap.get("groupname"));
+                    g.put("groupnum", sMap.get("groupnum"));
+                    g.put("grouptype", sMap.get("grouptype"));
+                    List<Map> students = new ArrayList<>();
+                    for (Map map : studentList) {
+                        Map s = new HashMap();
+                        Object studentid = map.get("studentid");
+                        s.put("studentid", studentid);
+                        Map stuMap = userMap.get(studentid);
+                        s.put("studentname", stuMap.get("username"));
+                        s.put("questionids", stuMap.get("questionids"));
+                        s.put("paperscore", stuMap.get("paperscore"));
+                        s.put("headpic", stuMap.get("headpic"));
+                        students.add(s);
+                    }
+
+                    students = students.stream().sorted(Comparator.comparing(m -> m.get("studentname").toString()))
+                                       .collect(Collectors.toList());
+                    g.put("students", students);
+                    groups2.add(g);
+                }
+                c.put("groups", groups2);
+                classes.add(c);
             }
-            c.put("groups", groups2);
-            classes.add(c);
         }
 
         paper.put("classes", classes);