教师端课堂报告返回章节名称

通知班级、科目拉下列表排序

sapi/src/main/java/com/xhkjedu/sapi/controller/notice/NoticeController.java

@@ -185,19 +185,6 @@ public class NoticeController {
         for (Map.Entry<Object, List<Map>> entry : gMap.entrySet()) {
             Map<String, Object> g = new LinkedHashMap<>();
             g.put("gradeid", entry.getKey());
-            //List<Map<Object, List<Map>>> subjectClass = new ArrayList<>();
-            /*List<Map> subjectClass = entry.getValue();
-            Map<String, List<Map>> collect = users.stream().collect(Collectors.groupingBy(m -> m.get("subjectid").toString() + m.get("classid")));
-            for (Map.Entry<String, List<Map>> uentry : collect.entrySet()) {
-                List<Map> value = uentry.getValue();
-                Map map = value.get(0);
-                Map sc = new LinkedHashMap();
-                sc.put("subjectid", map.get("subjectid"));
-                sc.put("classid", map.get("classid"));
-                sc.put("name", map.get("name"));
-                sc.put("users", value);
-                subjectClass.add(sc);
-            }*/
             g.put("subjectClass", entry.getValue());
             grades.add(g);
         }

sapi/src/main/java/com/xhkjedu/sapi/service/notice/NoticeService.java

@@ -9,6 +9,7 @@ import com.xhkjedu.sapi.model.notice.TNoticeUser;
 import com.xhkjedu.sapi.mapper.notice.*;
 import com.xhkjedu.sapi.model.notice.TNoticeFile;
 import com.xhkjedu.sapi.model.notice.TNotice;
+import com.xhkjedu.sapi.vo.notice.NoticeClassVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.sapi.vo.notice.NoticeVo;
 import org.springframework.stereotype.Service;
@@ -265,27 +266,39 @@ public class NoticeService {
         List<TNoticeUser> users = noticeUserMapper.listSubjectAndClass(noticeid);
         List<Map<String, Integer>> grades = new ArrayList<>();
         List<Map<String, Object>> subjects = new ArrayList<>();
-        List<Map<String, Object>> classes = new ArrayList<>();
+        List<NoticeClassVo> classes = new ArrayList<>();
         for (TNoticeUser user : users) {
             String subjectid = user.getSubjectid();
             Integer gradeid = user.getGradeid();
             Map<String, Integer> g = new LinkedHashMap<>();
             g.put("gradeid", gradeid);
             grades.add(g);
-            Map<String, Object> sc = new LinkedHashMap<>();
-            String username = user.getUsername();
+            String[] username = user.getUsername().split("_");
             if (N_Utils.isEmpty(subjectid)) {
-                sc.put("gradeid", gradeid);
-                sc.put("classid", user.getClassid());
-                sc.put("classname", username);
-                classes.add(sc);
+                NoticeClassVo c = new NoticeClassVo();
+                c.setGradeid(gradeid);
+                c.setClassid(user.getClassid());
+                c.setClassname(username[0]);
+                String[] typeOrder = username[1].split("-");
+                c.setClasstype(N_Utils.str2Int(typeOrder[0]));
+                c.setClassorder(N_Utils.str2Int(typeOrder[1]));
+                classes.add(c);
             } else {
+                Map<String, Object> sc = new LinkedHashMap<>();
                 sc.put("subjectid", subjectid);
-                sc.put("subjectname", username);
+                sc.put("subjectname", username[0]);
+                sc.put("subjectorder", username[1]);
                 subjects.add(sc);
             }
         }
         grades.sort(Comparator.comparing(m -> m.get("gradeid")));
+        subjects.sort(Comparator.comparing(m -> N_Utils.str2Int(m.get("subjectorder").toString())));
+        classes = classes.stream().sorted(
+                Comparator.comparingInt(NoticeClassVo::getGradeid)
+                          .thenComparing(NoticeClassVo::getClasstype)
+                          .thenComparing(NoticeClassVo::getClassorder)
+                          .thenComparing(NoticeClassVo::getClassname)
+        ).collect(Collectors.toList());
         map.put("grades", grades.stream().distinct().collect(Collectors.toList()));
         map.put("subjects", subjects.stream().distinct().collect(Collectors.toList()));
         map.put("classes", classes);

sapi/src/main/java/com/xhkjedu/sapi/vo/notice/NoticeClassVo.java

@@ -0,0 +1,21 @@
+package com.xhkjedu.sapi.vo.notice;
+
+import lombok.Data;
+
+@Data
+public class NoticeClassVo {
+    //年级id
+    private Integer gradeid;
+
+    //班级id
+    private Integer classid;
+
+    //班级名称
+    private String classname;
+
+    //班级类型
+    private Integer classtype;
+
+    //班级排序
+    private Integer classorder;
+}

sapi/src/main/resources/mapper/notice/NoticeUserMapper.xml

@@ -50,8 +50,8 @@
     <!--获取通知科目和班级-->
     <select id="listSubjectAndClass" resultType="com.xhkjedu.sapi.model.notice.TNoticeUser">
         select nu.gradeid,nu.classid,nu.subjectid
-        ,if(nu.classid is not null,(select c.classname from t_class c where c.classid=nu.classid)
-            ,(select s.subjectname from t_subject s where s.subjectid=nu.subjectid))username
+        ,if(nu.classid is not null,(select concat(c.classname,'_',c.classtype,'-',c.classorder) from t_class c where c.classid=nu.classid)
+            ,(select concat(s.subjectname,'_',s.subjectorder) from t_subject s where s.subjectid=nu.subjectid))username
         from t_notice_user nu where noticeid=#{noticeid}
         group by nu.gradeid,nu.classid,nu.subjectid
     </select>

sclass/src/main/java/com/xhkjedu/sclass/vo/classroom/ReportRoomVo.java

@@ -57,4 +57,7 @@ public class ReportRoomVo {
 
     //视频列表
     private List<Map> videos;
+
+    //章节名称
+    private String directorname;
 }

sclass/src/main/resources/mapper/classroom/ClassroomMapper.xml

@@ -396,6 +396,7 @@
         select r.roomname,r.classnum,r.realstunum,r.createtime,r.endtime,c.classname,c.gradeid,u.username createname
         ,(select count(*) from t_classroom_askteacher ct where ct.roomid=r.roomid and ct.asktype=20)asknum
         ,(select count(*) from t_classroom_askteacher ct where ct.roomid=r.roomid and ct.asktype=21)callnum
+        ,(select d.directorname from t_director d where r.directorid=d.directorid)directorname
         from t_classroom r left join t_class c on r.classid=c.classid
         left join t_user u on r.createid=u.userid
         where r.roomid=#{roomid}