通知 学生批阅

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

@@ -28,12 +28,6 @@ public class TNoticeFile extends BaseBean {
     //封面图地址
     private String resourcecover;
 
-    //是否转换0未转换1已转换2转换失败3加密
-    private Integer converted;
-
-    //转换失败原因
-    private String convertmsg;
-
     //转换后的pdf文件地址
     private String pdfurl;
 

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

@@ -39,8 +39,4 @@ public class TNoticeUser extends BaseBean {
 
     //学校id
     private Integer schoolid;
-
-    private Integer gradeid;//年级id
-
-    private Integer classid;//班级id
 }

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

@@ -66,39 +66,14 @@ public class NoticeService {
 
     //添加通知对象
     private void saveNoticeObj(TNotice model) {
-        Integer noticetype = model.getNoticetype();
-        if (noticetype == 1) {//通知对象1班级
-            noticeClassMapper.batchSave(model);
-        } else if (noticetype == 2 || noticetype == 3) {//通知对象2老师3单个学生
-            model.setUsers(N_Utils.listDistinct(model.getUsers()));//通知对象去重
-            noticeUserMapper.batchSave(model);
-        }
-
-        /*if (N_Utils.isListEmpty(model.getSchools())) {//兼容以前添加单个学校模式
-            List<TSchool> schools = new ArrayList<>();
-            TSchool s = new TSchool();
-            s.setSchoolid(model.getSchoolid());
-            schools.add(s);
-            model.setSchools(schools);
-        }
-        noticeSchoolMapper.batchSave(model);//通知学校关联信息*/
+        model.setUsers(N_Utils.listDistinct(model.getUsers()));//通知对象去重
+        noticeUserMapper.batchSave(model);
     }
 
     //获取详情
     public TNotice findById(Integer noticeid) {
         TNotice notice = noticeMapper.findById(noticeid);
         notice.setFiles(noticeFileMapper.listByNoticeId(noticeid));
-        /*Integer noticetype = notice.getNoticetype();
-        if (noticetype == 1) {
-            List<ClassVo> classes = noticeMapper.listClass(noticeid);
-            notice.setClasses(classes);
-        } else if (noticetype == 2 || noticetype == 3) {
-            List<NoticeUserVo> users = noticeMapper.listUser(noticeid);
-            notice.setUsers(users);
-        } else {
-            List<TSchool> schools = noticeMapper.listSchool(noticeid);
-            notice.setSchools(schools);
-        }*/
         return notice;
     }
 

sapi/src/main/resources/mapper/itemtool/StudentTodoMapper.xml

@@ -63,9 +63,8 @@
             </if>
             <if test="todo.todotype=='notice'">
                 select 'notice' as todotype,count(distinct n.noticeid)num,#{todo.subjectid} as subjectid
-                from t_notice n left join t_notice_class nc on n.noticeid = nc.noticeid
-                left join t_class_student s on nc.classid=s.classid
-                where s.studentid=#{todo.studentid}
+                from t_notice n left join t_notice_user nu on n.noticeid = nu.noticeid
+                where nu.userid=#{todo.studentid} and nu.readed=0
                 <if test="todo.showtime!=null and todo.showtime!=0">
                     and n.createtime>=#{todo.showtime}
                 </if>

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

@@ -5,12 +5,9 @@
     <select id="listAll" resultType="com.xhkjedu.sapi.vo.notice.NoticeVo">
         select n.noticeid,n.noticetitle,n.createtime,u.username createname,n.noticetype
         from t_notice n left join t_user u on n.createid=u.userid
-        <if test="notice.schoolid!=null">
-        left join t_notice_school ns on n.noticeid = ns.noticeid
-        </if>
         <where>
             <if test="notice.schoolid!=null">
-                and ns.schoolid=#{notice.schoolid}
+                and n.schoolid=#{notice.schoolid}
             </if>
             <if test="notice.schoolid==null">
                 and n.schoolid is null

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

@@ -25,14 +25,14 @@
             <result property="userid" column="userid"/>
             <result property="readed" column="readed"/>
             <result property="username" column="username"/>
+            <result property="headpic" column="headpic"/>
         </collection>
     </resultMap>
     <select id="listByNoticeId" resultMap="userResult">
-        select nu.userid,nu.readed,u.username,nu.gradeid,nu.classid,nu.subjectid
+        select nu.userid,nu.readed,u.username,u.headpic,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))name
         from t_notice_user nu left join t_user u on nu.userid = u.userid
         where nu.noticeid=#{noticeid}
-        order by convert(u.username using gbk)
     </select>
 </mapper>

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

@@ -166,10 +166,24 @@ public class PaperStudentController {
         Integer pageSize = ps.getPageSize();
         N_Utils.validation(new Object[]{checkid,"批阅人id",1,page,"显示页码",1,pageSize,"显示条数",1});
         ps.setPage((page - 1)*pageSize);
-        List<PaperStudentVo> list = paperStudentService.correctList(ps);
+        List<Map> list = paperStudentService.correctList(ps);
         return new ResultVo(0, "获取学生批阅列表成功！",list);
     }
 
+    /**
+     * @Description 批阅学生列表
+     * @Date 2023/12/19 16:14
+     * @Author YWX
+     * @Param [ps]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_stu")
+    public ResultVo listCorrectStu(@RequestBody TPaperStudent ps) {
+        N_Utils.validation(new Object[]{ps.getCheckid(), "批阅人id", 1, ps.getPaperid(), "作业id", 1, ps.getClassid(), "班级id", 1});
+        List<Map> list = paperStudentService.listCorrectStu(ps);
+        return new ResultVo(0, "获取批阅学生列表成功！", list);
+    }
+
     /**
      * 题库作业--按题批阅列表
      * @Param [ps]

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paperstudent/PaperStudentMapper.java

@@ -104,7 +104,7 @@ public interface PaperStudentMapper extends TkMapper<TPaperStudent> {
      * @Date 2020/6/18 14:35
      * @return java.util.List<com.xhkjedu.vo.paperstudent.PaperStudentVo>
      **/
-    List<PaperStudentVo> correctList(@Param("ps") TPaperStudent ps);
+    List<Map> correctList(@Param("ps") TPaperStudent ps);
 
     /**
      * 作业说明
@@ -221,4 +221,7 @@ public interface PaperStudentMapper extends TkMapper<TPaperStudent> {
 
     //获取可批阅人数
     Integer getCheckNum(@Param("paperid") Integer paperid,@Param("checkid") Integer checkid);
+
+    //批阅学生列表
+    List<Map> listCorrectStu(@Param("ps") TPaperStudent ps);
 }

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

@@ -469,7 +469,7 @@ public class PaperStudentService {
      * @Date 2020/6/18 14:34
      * @return java.util.List<com.xhkjedu.vo.paperstudent.PaperStudentVo>
      **/
-    public List<PaperStudentVo> correctList(TPaperStudent ps) {
+    public List<Map> correctList(TPaperStudent ps) {
         return paperStudentMapper.correctList(ps);
     }
 
@@ -1131,4 +1131,15 @@ public class PaperStudentService {
     public Integer isChecker(PaperStudentQuestionVo psq) {
         return paperStudentMapper.isChecker(psq);
     }
+
+    /**
+     * @Description 批阅学生列表
+     * @Date 2023/12/19 16:14
+     * @Author YWX
+     * @Param [ps]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listCorrectStu(TPaperStudent ps) {
+        return paperStudentMapper.listCorrectStu(ps);
+    }
 }

sstudy/src/main/resources/mapper/paperstudent/PaperStudentMapper.xml

@@ -40,16 +40,21 @@
         GROUP BY ps.psid ORDER BY pg.starttime DESC,p.createtime DESC LIMIT #{ps.page},#{ps.pageSize}
     </select>
     <!--批阅列表-->
-    <select id="correctList" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentVo">
-        select ps.psid,p.paperid,p.papername,p.paperclass,p.schoolid,ps.psstate,ps.pschecked
-        ,pg.starttime,pg.stoptime,u.username createname,s.subjectname,p.papertype,pg.checked
+    <select id="correctList" resultType="java.util.Map">
+        select a.*
+        ,pg.starttime,pg.stoptime,u.username createname,s.subjectname,pg.checked
+        from (select ps.paperid,ps.classid,p.createid,p.subjectid,p.papername,p.paperclass,p.schoolid,p.papertype
+        ,count(if(ps.psstate in(1,2) and ps.pschecked=0,ps.psid,null)) wpynum
+        ,count(if(ps.psstate in(0,3) and ps.pschecked=0,ps.psid,null)) wtjnum
+        ,count(if(ps.pschecked=1,ps.psid,null)) ypynum
         from t_paper_student ps join t_paper p on p.paperid = ps.paperid
-        left join t_paper_class pg on ps.paperid = pg.paperid and ps.classid=pg.classid
-        left join t_user u on p.createid = u.userid
-        left join t_subject s on p.subjectid = s.subjectid
         left join t_director d on p.directorid=d.directorid
-        where p.deleted=0 and ps.checkid=#{ps.checkid} and (d.disabled=0 or p.directorid is null) and ps.psstate in (1,2) and ps.pschecked!=1
-        ORDER BY ps.stoptime desc LIMIT #{ps.page},#{ps.pageSize}
+        where p.deleted=0 and ps.checkid=#{ps.checkid} and (d.disabled=0 or p.directorid is null)
+        group by p.paperid,ps.classid)a
+        left join t_paper_class pg on a.paperid = pg.paperid and a.classid=pg.classid
+        left join t_user u on a.createid = u.userid
+        left join t_subject s on a.subjectid = s.subjectid
+        order by pg.starttime desc limit #{ps.page},#{ps.pageSize}
     </select>
     <!--作业说明-->
     <select id="getPaperComm" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperCommVo">
@@ -404,4 +409,13 @@
         left join t_paper_class pg on ps.paperid=pg.paperid and ps.classid=pg.classid
         where p.paperid=#{paperid} and ps.psstate in(1,2)
     </select>
+    <!--批阅学生列表-->
+    <select id="listCorrectStu" resultType="java.util.Map">
+        select ps.psid,ps.userscore,ps.psstate,ps.pschecked,u.username,u.headpic
+        from t_paper_student ps left join t_user u on ps.studentid=u.userid
+        where paperid=#{ps.paperid} and ps.classid=#{ps.classid} and ps.checkid=#{ps.checkid} and ps.pschecked!=1
+        <if test="ps.psstate!=null and ps.psstate==0">and ps.psstate in(0,3)</if>
+        <if test="ps.psstate!=null and ps.psstate==2">and ps.psstate in(1,2)</if>
+        order by field(ps.psstate,1,2,0,3)
+    </select>
 </mapper>

suser/src/main/resources/mapper/gradeclass/ClassTeacherMapper.xml

@@ -227,16 +227,12 @@
         left join t_class_student cs on c.classid = cs.classid
         left join t_user u on cs.studentid=u.userid
         where ct.teacherid=#{role.teacherid} and c.year=#{role.year} and c.classstate=1
-        and c.schoolid=#{role.schoolid}
-        <if test="role.classtype!=null and role.classtype!=0">
-            <if test="role.classtype!=11">and c.classtype=#{role.classtype}</if>
-            <if test="role.classtype==11">and c.classtype in(1,2)</if>
-        </if>
-        <if test="role.classtype==null or role.classtype==0">
-            and c.classtype!=99
+        and c.schoolid=#{role.schoolid} and c.classnum>0
+        <if test="classtype!=null and classtype!=0">
+            and c.classtype=#{classtype}
         </if>
-        <if test="role.gradeid!=null and role.gradeid!=0">
-            and c.gradeid=#{role.gradeid}
+        <if test="classtype==null or classtype==0">
+            and c.classtype <![CDATA[ < ]]>5
         </if>
         order by c.gradeid,c.classtype,c.classorder,c.classname,convert(u.username using gbk)
     </select>