通知、课堂

README.md

@@ -44,3 +44,19 @@ resource 资源
 | 16   | 完形填空（复合）、阅读理解（复合）             | 16       | 正常 |
 | 17   | 任务型阅读（复合）                     | 17       | 正常 |
 
+#### 课堂保存类型
+
+| 序号 | 类型rtype              | 备注 |
+| ---- |----------------------|--|
+| 1    | startclass                  | 课堂--开始 |
+| 2    | stopclass                 | 课堂--结束 |
+| 3    | savefile     | 课堂--保存图片 |
+| 4    | askteacher             | 互动--发起 |
+| 5    | askstudent              | 互动--保存学生作答 |
+| 6    | sign             | 学生--签到 |
+| 7    | paperteacher            | 堂测--发布 | 
+| 8    | paperstudent            | 堂测--学生作答详情 |
+| 9    | voteteacher            | 投票-发布 |
+| 10   | votestudent | 投票--学生投票 | 
+| 11   | profileteacher      | 资料-发布 |
+| 12   | profilestudent   | 资料-学生查看 | 

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

@@ -129,7 +129,7 @@ public class NoticeController {
     }
 
     /**
-     *功能描述 电子书学生--网页--列表
+     *功能描述 学生--网页--列表
      * @author WN
      * @date 2022/2/22
      * @param  * @param notice

sapi/src/main/java/com/xhkjedu/sapi/mapper/notice/NoticeMapper.java

@@ -79,4 +79,7 @@ public interface NoticeMapper extends TkMapper<TNotice> {
     int deleteNotice(@Param("noticeid")Integer noticeid);
 
     Integer getNoticeid(@Param("noticeid")Integer noticeid);
+
+    //获取用户所属科目
+    String getUserSubjectByUserid(@Param("userid")Integer userid);
 }

sapi/src/main/java/com/xhkjedu/sapi/model/notice/TNotice.java

@@ -39,6 +39,9 @@ public class TNotice extends BaseBean {
     //通知内容纯文本
     private String noticetxt;
 
+    //科目id
+    private String subjectid;
+
     @Transient
     //班级id集合
     private List<ClassVo> classes;

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

@@ -2,16 +2,16 @@ package com.xhkjedu.sapi.service.notice;
 
 import com.xhkjedu.sapi.listener.MessageSender;
 import com.xhkjedu.sapi.mapper.notice.NoticeClassMapper;
+import com.xhkjedu.sapi.mapper.notice.NoticeFileMapper;
 import com.xhkjedu.sapi.mapper.notice.NoticeMapper;
 import com.xhkjedu.sapi.mapper.notice.NoticeUserMapper;
+import com.xhkjedu.sapi.model.notice.TNotice;
 import com.xhkjedu.sapi.model.notice.TNoticeClass;
-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.model.notice.TNoticeUser;
 import com.xhkjedu.sapi.vo.notice.NoticeClassVo;
-import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.sapi.vo.notice.NoticeVo;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,6 +44,16 @@ public class NoticeService {
         if (N_Utils.isEmptyInteger(model.getCreatetime())) {
             model.setCreatetime(N_Utils.getSecondTimestamp());
         }
+
+        //根据noticetype发布对象为学生时，获取教师科目
+        if(model.getNoticetype() == 3){
+            //获取教师任教科目
+            String subjectid = noticeMapper.getUserSubjectByUserid(model.getCreateid());
+            if(N_Utils.isNotEmpty(subjectid)){
+                model.setSubjectid(subjectid);
+            }
+        }
+
         noticeMapper.insertUseGeneratedKeys(model);
         model.setNoticeid(model.getId());
         //添加通知对象

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

@@ -27,4 +27,6 @@ public class NoticeVo {
 
     //通知对象1班级2老师3学校师生4学校教师5学校学生
     private Integer noticetype;
+
+    private String subjectname;//科目
 }

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

@@ -61,9 +61,10 @@
     </select>
     <!-- 用户通知列表 -->
     <select id="listMy" resultType="com.xhkjedu.sapi.vo.notice.NoticeVo">
-        select n.noticeid,n.noticetitle,n.noticetxt,n.createtime,u.username createname,IFNULL(nt.readed,0) as readed
+        select n.noticeid,n.noticetitle,n.noticetxt,n.createtime,n.subjectname,u.username createname,IFNULL(nt.readed,0) as readed
         from t_notice n left join t_user u on n.createid=u.userid
         left join t_notice_user nt on n.noticeid = nt.noticeid
+        left join t_subject s on n.subjectid=s.subjectid
         where nt.userid=#{notice.createid}
         <if test="notice.readed!=null"> and nt.readed=#{notice.readed}</if>
         <if test="notice.noticetitle!=null and notice.noticetitle!=''">
@@ -76,6 +77,9 @@
         <if test="notice.stoptime!=null and notice.stoptime!=0">
             and n.createtime &lt;=#{notice.stoptime}
         </if>
+        <if test="notice.subjectid!=null and notice.subjectid!='' and notice.subjectid!='0'.toString()">
+            and n.subjectid=#{notice.subjectid}
+        </if>
 
         group by n.noticeid order by nt.readed,n.createtime desc
         <if test="notice.page==null">
@@ -88,7 +92,7 @@
     </select>
     <!--学生通知列表-->
     <select id="listStudent" resultType="com.xhkjedu.sapi.vo.notice.NoticeVo">
-        select n.noticeid,n.noticetitle,n.noticetxt,n.createtime,u.username createname
+        select n.noticeid,n.noticetitle,n.noticetxt,n.createtime,n.subjectid,u.username createname
         from t_notice n left join t_user u on n.createid=u.userid
         left join t_notice_class nc on n.noticeid = nc.noticeid
         left join t_class_student cs on nc.classid=cs.classid
@@ -102,10 +106,11 @@
     <!--//////////////////////////////////////////////学生WEB端//////////////////////////////////////////////-->
     <!--学生通知列表-->
     <select id="listNoticeForStuWeb" resultType="com.xhkjedu.sapi.vo.notice.NoticeVo">
-        select n.noticeid,n.noticetitle,n.noticecontent,n.noticetxt,n.createtime,u.username createname
+        select n.noticeid,n.noticetitle,n.noticecontent,n.noticetxt,s.subjectname,n.createtime,u.username createname
         from t_notice n left join t_user u on n.createid=u.userid
         left join t_notice_class nc on n.noticeid = nc.noticeid
         left join t_class_student cs on nc.classid=cs.classid
+        left join t_subject s on n.subjectid=s.subjectid
         where ((cs.studentid=#{notice.createid} and n.noticetype=1) or (n.noticetype=3 and nc.classid=#{notice.createid}))
         <if test="notice.noticetitle!=null and notice.noticetitle!=''">
             and (n.noticetitle like concat('%', #{notice.noticetitle}, '%')
@@ -117,6 +122,9 @@
         <if test="notice.stoptime!=null and notice.stoptime!=0">
             and n.createtime&lt;=#{notice.stoptime}
         </if>
+        <if test="notice.subjectid!=null and notice.subjectid!='' and notice.subjectid!='0'.toString()">
+            and n.subjectid=#{notice.subjectid}
+        </if>
         group by n.noticeid order by n.createtime desc
     </select>
     <!--根据班级删除通知-->
@@ -132,4 +140,9 @@
     <select id="getNoticeid" resultType="java.lang.Integer">
         select noticeid from t_notice where noticeid=#{noticeid}
     </select>
+
+    <!--根据用户ID获取用户所属科目-->
+    <select id="getUserSubjectByUserid" resultType="java.lang.String">
+        select subjectid from t_teacher_powersb where teacherid=#{userid} group by subjectid limit 1
+    </select>
 </mapper>

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomPaperScantron.java

@@ -45,4 +45,5 @@ public class TClassroomPaperScantron extends BaseBean {
 
     //选项数量
     private Integer optionnum;
+
 }

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

@@ -180,8 +180,8 @@
         ,g.gradeid,g.classname,(select count(*) from t_classroom_sign s where s.userid=#{room.studentid}
         and s.roomid=r.roomid) signstate
         ,(select count(*) from t_classroom_video rv where rv.roomid=r.roomid)videonum
-        ,(select count(*) from t_classroom_vote vt where vt.roomid=c.roomid)votenum
-        ,(select count(*) from t_classroom_profile p where p.roomid=c.roomid)profilenum
+        ,(select count(*) from t_classroom_vote vt where vt.roomid=r.roomid)votenum
+        ,(select count(*) from t_classroom_profile p where p.roomid=r.roomid)profilenum
         from t_classroom r left join t_user u on r.teacherid=u.userid
         left join t_subject_book sb on r.lsbid=sb.lsbid
         left join t_class_student cs on r.classid=cs.classid