直播状态、背诵状态搜索

slive/src/main/java/com/xhkjedu/slive/mapper/liveplay/CourseMapper.java

@@ -58,7 +58,7 @@ public interface CourseMapper extends TkMapper<LCourse> {
     List<SectionDateVo> listSectionDateForStu(Integer studentid, String timestr);
 
     //指定日期的课节列表
-    List<CourseSectionVo> listSectionsByDate(Integer studentid,String timestr,Integer cstate);
+    List<CourseSectionVo> listSectionsByDate(@Param("cp")CourseParams cp);
 
     //教师指定月份课程日期数量
     List<SectionDateVo> listSectionDateForTeacher(@Param("course") CourseParams course);

slive/src/main/java/com/xhkjedu/slive/service/liveplay/CourseService.java

@@ -538,7 +538,7 @@ public class CourseService {
 
     //指定日期的课节列表
     public List<CourseSectionVo> listSectionsByDate(CourseParams p){
-        return courseMapper.listSectionsByDate(p.getStudentid(),p.getTimestr(),p.getCstate());
+        return courseMapper.listSectionsByDate(p);
     }
 
     public List<SectionDateVo> listSectionDateForTeacher(CourseParams p) {

slive/src/main/resources/mapper/liveplay/CourseMapper.xml

@@ -296,17 +296,16 @@
         left join t_class_student s on c.classid=s.classid
         left join t_user u on u.userid=cs.teacherid
         left join t_subject st on c.subjectid=st.subjectid
-        where s.studentid=#{studentid} and c.deleted=1
-        <if test="timestr!=null and timestr!=''">
-            and cs.sectiondate=#{timestr}
+        where s.studentid=#{cp.studentid} and c.deleted=1
+        <if test="cp.subjectid!=null and cp.subjectid!='0'.toString() and cp.subjectid!=''">
+            and c.subjectid=#{cp.subjectid}
         </if>
-        <if test="cstate!=null and cstate!=3">
-            and cs.sectionstate=#{cstate}
+        <if test="cp.timestr!=null and cp.timestr!=''">
+            and cs.sectiondate=#{cp.timestr}
         </if>
-        <if test="cstate!=null and cstate==3">
-            and cs.sectionstate in(3,4)
+        <if test="cp.cstate!=null and cp.cstate!=-1">
+            and cs.sectionstate=#{cp.cstate}
         </if>
-
         group by cs.sectionid
         order by cs.sectionstate,abs(UNIX_TIMESTAMP(concat(cs.sectiondate,' ',cs.planbegintime))-UNIX_TIMESTAMP(now())),cs.sectionid
     </select>

sstudy/src/main/resources/mapper/recite/ReciteStudentMapper.xml

@@ -18,6 +18,12 @@
         LEFT JOIN t_subject s ON r.subjectid = s.subjectid
         LEFT JOIN t_user u ON r.createid=u.userid
         WHERE rs.studentid=#{rs.studentid} AND rg.starttime<=UNIX_TIMESTAMP()
+        <if test="rs.rsstate==1">
+            and rs.rsstate=0
+        </if>
+        <if test="rs.rsstate==2">
+            and rs.rsstate!=0
+        </if>
         <if test="rs.recitetitle!=null and rs.recitetitle!=''">
             and rs.recitetitle like '%${rs.recitetitle}%'
         </if>