学生课堂回顾列表

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

@@ -146,9 +146,9 @@ public class ClassroomController {
 
     @PostMapping("call_objective")
     public ResultVo callObjective(@RequestBody RoomCorrectCallVo call) {
+        Long asktid = call.getAsktid();
+        N_Utils.validation(new Object[]{asktid, "互动id", 1});
         try {
-            Long asktid = call.getAsktid();
-            N_Utils.validation(new Object[]{asktid, "互动id", 1});
             ObjectiveVo objective = classroomService.callObjective(asktid, call.getRealstunum());
             return new ResultVo(0, "获取课堂提问客观题详情成功", objective);
         } catch (Exception e) {
@@ -159,9 +159,9 @@ public class ClassroomController {
 
     @PostMapping("exam_objective")
     public ResultVo examObjective(@RequestBody ReportEQuestionVo question) {
+        Long pscaid = question.getPscaid();
+        N_Utils.validation(new Object[]{pscaid, "答题卡id", 1});
         try {
-            Long pscaid = question.getPscaid();
-            N_Utils.validation(new Object[]{pscaid, "答题卡id", 1});
             ObjectiveVo objective = classroomService.examObjective(pscaid, question.getRealstunum());
             return new ResultVo(0, "获取课堂考试客观题详情成功", objective);
         } catch (Exception e) {
@@ -172,9 +172,9 @@ public class ClassroomController {
 
     @PostMapping("call_subjective")
     public ResultVo callSubjective(@RequestBody RoomCorrectCallVo call) {
+        Long asktid = call.getAsktid();
+        N_Utils.validation(new Object[]{asktid, "互动id", 1});
         try {
-            Long asktid = call.getAsktid();
-            N_Utils.validation(new Object[]{asktid, "互动id", 1});
             SubjectiveVo subjective = classroomService.callSubjective(asktid, call.getRealstunum());
             return new ResultVo(0, "获取课堂提问主观题详情成功", subjective);
         } catch (Exception e) {
@@ -185,9 +185,9 @@ public class ClassroomController {
 
     @PostMapping("exam_subjective")
     public ResultVo examSubjective(@RequestBody ReportEQuestionVo question) {
+        Long pscaid = question.getPscaid();
+        N_Utils.validation(new Object[]{pscaid, "答题卡id", 1});
         try {
-            Long pscaid = question.getPscaid();
-            N_Utils.validation(new Object[]{pscaid, "答题卡id", 1});
             SubjectiveVo subjective = classroomService.examSubjective(pscaid, question.getRealstunum());
             return new ResultVo(0, "获取课堂考试主观题详情成功", subjective);
         } catch (Exception e) {
@@ -207,11 +207,11 @@ public class ClassroomController {
 
     @PostMapping("/correct_exam")
     public ResultVo correctExam(@RequestBody TPaperStudent ps) {
+        Integer psid = ps.getPsid();
+        Integer checkid = ps.getCreateid();
+        String questionResult = ps.getQuestionResult();
+        N_Utils.validation(new Object[]{psid, "试卷学生id", 1, checkid, "批改人id", 1});
         try {
-            Integer psid = ps.getPsid();
-            Integer checkid = ps.getCreateid();
-            String questionResult = ps.getQuestionResult();
-            N_Utils.validation(new Object[]{psid, "试卷学生id", 1, checkid, "批改人id", 1});
             int result = classroomPaperService.correctExam(psid, checkid, questionResult);
             if (result > 0) {
                 return new ResultVo(0, "批阅成功", 0);
@@ -257,13 +257,12 @@ public class ClassroomController {
     //学生app 课堂回顾列表
     @PostMapping("list_class_stu")
     public ResultVo listStuClass(@RequestBody TClassroom room) {
+        Integer studentid = room.getStudentid();
+        Integer page = room.getPage();
+        Integer pageSize = room.getPageSize();
+        N_Utils.validation(new Object[]{studentid, "学生id", 1
+                , page, "显示页码", 1, pageSize, "显示条数", 1});
         try {
-            Integer studentid = room.getStudentid();
-            String subjectid = room.getSubjectid();
-            Integer page = room.getPage();
-            Integer pageSize = room.getPageSize();
-            N_Utils.validation(new Object[]{studentid, "学生id", 1, subjectid, "科目id", 2
-                    , page, "显示页码", 1, pageSize, "显示条数", 1});
             PageHelper.startPage(page, pageSize);
             List<Map> list = classroomService.listStuClass(room);
             PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
@@ -292,11 +291,11 @@ public class ClassroomController {
      **/
     @PostMapping("list_class_directorid")
     public ResultVo listClassByDirectorId(@RequestBody TClassroom room) {
+        Integer teacherid = room.getTeacherid();
+        Integer page = room.getPage();
+        Integer pageSize = room.getPageSize();
+        N_Utils.validation(new Object[]{teacherid, "教师id", 1, page, "显示页码", 1, pageSize, "显示条数", 1});
         try {
-            Integer teacherid = room.getTeacherid();
-            Integer page = room.getPage();
-            Integer pageSize = room.getPageSize();
-            N_Utils.validation(new Object[]{teacherid, "教师id", 1, page, "显示页码", 1, pageSize, "显示条数", 1});
             PageHelper.startPage(page, pageSize);
             List<Map> list = classroomService.listClassByDirectorId(room);
             PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));

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

@@ -177,16 +177,27 @@
     <select id="listStuClass" resultMap="classRooms">
         select r.roomid,r.roomname,r.classid,r.roomstate,r.directorid,r.createtime,r.endtime,r.realstunum,u.username createname
         ,(select d.directorname from t_director d where d.directorid=r.directorid)directorname
+        ,g.gradeid,g.classname
         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
-        where cs.studentid=#{room.studentid} and sb.subjectid=#{room.subjectid}
+        LEFT JOIN t_class g ON r.classid=g.classid
+        where cs.studentid=#{room.studentid}
+        <if test="room.subjectid!=null and room.subjectid!='0'.toString() and room.subjectid!=''">
+            and sb.subjectid=#{room.subjectid}
+        </if>
         <if test="room.lsbid!=null and room.lsbid!='0'.toString() and room.lsbid!=''">
           and r.lsbid=#{room.lsbid}
         </if>
         <if test="room.directorid!=null and room.directorid!='0'.toString() and room.directorid!=''">
           and r.directorid=#{room.directorid}
         </if>
+        <if test="room.createtime!=null and room.createtime!=0">
+            AND UNIX_TIMESTAMP(FROM_UNIXTIME(r.createtime,'%Y%m%d'))>=#{room.createtime}
+        </if>
+        <if test="room.endtime!=null and room.endtime!=0">
+            AND UNIX_TIMESTAMP(FROM_UNIXTIME(r.createtime,'%Y%m%d'))&lt;=#{room.endtime}
+        </if>
         order by r.createtime desc
     </select>
     <!--学生课堂回顾详情-->
@@ -333,10 +344,12 @@
             c.directorid=#{room.directorid}
         </if>
         <if test="room.classid!=null and room.classid!=0">AND c.classid=#{room.classid}</if>
-        <if test="room.createtime!=null and room.createtime!=0">AND
-            UNIX_TIMESTAMP(FROM_UNIXTIME(c.createtime,'%Y%m%d'))>=#{room.createtime}
+        <if test="room.createtime!=null and room.createtime!=0">
+            AND UNIX_TIMESTAMP(FROM_UNIXTIME(c.createtime,'%Y%m%d'))>=#{room.createtime}
+        </if>
+        <if test="room.endtime!=null and room.endtime!=0">
+            AND UNIX_TIMESTAMP(FROM_UNIXTIME(c.createtime,'%Y%m%d'))&lt;=#{room.endtime}
         </if>
-        <if test="room.endtime!=null and room.endtime!=0">AND UNIX_TIMESTAMP(FROM_UNIXTIME(c.createtime,'%Y%m%d'))&lt;=#{room.endtime}</if>
         ORDER BY c.createtime DESC
     </select>
     <select id="listAskTeachersForRoom" resultType="com.xhkjedu.sclass.vo.classroom.RoomAskTeacherVo">