Merge remote-tracking branch 'cloud-schoolapi/ywx'

sapi/src/main/java/com/xhkjedu/sapi/service/itemtool/ReadService.java

@@ -143,7 +143,7 @@ public class ReadService {
      */
     public List<TRead> listReadsForAndr(TRead read) {
         List<TRead> reads = readMapper.listReadsForAndr(read);
-        //readDateService.setReads(reads);//关联阅读开放时间
+        readDateService.setReads(reads);//关联阅读开放时间
         return reads;
     }
 

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

@@ -35,10 +35,8 @@
     <!-- 获取分页资源（android） -->
     <select id="listReadsForAndr" resultType="com.xhkjedu.sapi.model.itemtool.TRead">
         SELECT r.readid,readname,readthumb,readauthor,readcount,createtime,readpath
-        FROM t_read r left join t_read_date rd on r.readid=rd.readid
+        FROM t_read r
         WHERE (belong=2 or schoolid=#{read.schoolid}) and readstate=1
-        and rd.weeknum=DATE_FORMAT(CURDATE(),'%w') and CURRENT_TIME() between rd.begintime and concat(rd.endtime,':59')
-        group by r.readid
         <if test="read.rorder=='createtime'">ORDER BY createtime DESC</if>
         <if test="read.rorder=='readcount'">ORDER BY readcount DESC</if>
          limit #{read.page},#{read.pageSize}
@@ -99,10 +97,8 @@
     <!--电子书列表-->
     <select id="listReadForStuWeb" resultType="com.xhkjedu.sapi.model.itemtool.TRead">
         SELECT r.readid,readname,readthumb,readauthor,readcount,createtime,readpath,readcomm
-        FROM t_read r left join t_read_date rd on r.readid=rd.readid
+        FROM t_read r
         WHERE (belong=2 or schoolid=#{read.schoolid}) and readstate=1
-        and rd.weeknum=DATE_FORMAT(CURDATE(),'%w') and CURRENT_TIME() between rd.begintime and concat(rd.endtime,':59')
-        group by r.readid
         <if test="read.rorder=='createtime'">ORDER BY createtime DESC</if>
         <if test="read.rorder=='readcount'">ORDER BY readcount DESC</if>
     </select>

sclass/src/main/java/com/xhkjedu/sclass/controller/classroom/ClassroomController.java

@@ -333,4 +333,16 @@ public class ClassroomController {
         List<Map> list = classroomService.listStudent(room.getClassid(), room.getLsbid());
         return new ResultVo(0, "获取班级学生列表成功", list);
     }
+
+    @PostMapping("/list_estudent")
+    public ResultVo listEStudent(@RequestBody TClassroomPaper paper) {
+        Long paperid = paper.getPaperid();
+        Integer page = paper.getPage();
+        Integer pageSize = paper.getPageSize();
+        N_Utils.validation(new Object[]{paperid, "考试id", 1, page, "显示页码", 1, pageSize, "显示条数", 1});
+        PageHelper.startPage(page, pageSize);
+        List<Map> list = classroomPaperService.listEStudent(paperid);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "获取考试按人统计列表成功", pageResult);
+    }
 }

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperStudentMapper.java

@@ -3,6 +3,9 @@ package com.xhkjedu.sclass.mapper.classroom;
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author ywx
  * @classname RoomPaperStudentMapper
@@ -21,4 +24,7 @@ public interface ClassroomPaperStudentMapper extends TkMapper<TClassroomPaperStu
 
     //根据考试学生id获取考试是否完成批阅
     Integer getCheckedByPsId(Integer psid);
+
+    //考试按人统计
+    List<Map> listEStudent(Long paperid);
 }

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomPaperService.java

@@ -225,4 +225,15 @@ public class ClassroomPaperService {
     public void updateScantronUseranswer(Integer pssid, String useranswer) {
         classroomPaperStudentScantronMapper.updateScantronUseranswer(pssid, useranswer);
     }
+
+    /**
+     * 考试按人统计
+     * @Param [paperid]
+     * @Author ywx
+     * @Date 2022/3/11 16:48
+     * @return java.util.List<java.util.Map>
+     **/
+    public List<Map> listEStudent(Long paperid) {
+        return classroomPaperStudentMapper.listEStudent(paperid);
+    }
 }

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

@@ -24,4 +24,11 @@
         left join t_classroom_paper p on ps.paperid=p.paperid
         where ps.psid=#{psid}
     </select>
+    <!--考试按人统计-->
+    <select id="listEStudent" resultType="java.util.Map">
+        select u.username,ps.stuscore,ps.costtime,ps.stoptime
+        from t_classroom_paper_student ps left join t_user u on ps.studentid=u.userid
+        where ps.paperid=#{paperid}
+        order by ps.stuscore desc
+    </select>
 </mapper>