作业、预习、背诵统计完善

sapi/src/main/resources/mapper/analyze/SchoolSummaryMapper.xml

@@ -112,18 +112,19 @@
         select r.createid as userid, count(distinct r.reciteid)bsfbnum,
         count(distinct rs.rsid)bsstunum,
         count(distinct case when rs.rsstate!=0 then rs.rsid else null end)bscomitnum
-        from t_recite r left join t_recite_student rs on rs.reciteid=r.reciteid
-        left join t_class c on c.classid=rs.classid
-        where r.schoolid=#{sparams.schoolid} and rs.schoolid=#{sparams.schoolid}
+        from t_recite r left join t_recite_group rg on rg.reciteid=r.reciteid
+        left join t_recite_student rs on rs.reciteid=rg.reciteid and rs.classid=rg.classid
+        left join t_class c on c.classid=rg.classid
+        where r.schoolid=#{sparams.schoolid} and rg.schoolid=#{sparams.schoolid}
         and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and r.subjectid=#{sparams.subjectid}
         </if>
         <if test="sparams.starttime!=null and sparams.starttime!=0">
-            and r.createtime>=#{sparams.starttime}
+            and rg.starttime>=#{sparams.starttime}
         </if>
         <if test="sparams.stoptime!=null and sparams.stoptime!=0">
-            and r.createtime&lt;=#{sparams.stoptime}
+            and rg.starttime&lt;=#{sparams.stoptime}
         </if>
         group by r.createid
     </select>

sapi/src/main/resources/mapper/analyze/SchoolTaskMapper.xml

@@ -27,10 +27,10 @@
         WHERE p.paperstate=22 AND p.schoolid=#{sparams.schoolid} AND pg.schoolid=#{sparams.schoolid}
         AND c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year} AND u.userstate=1
         <if test="sparams.starttime!=null and sparams.starttime!=0">
-            AND p.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+            AND pg.starttime>=#{sparams.starttime}
         </if>
         <if test="sparams.stoptime!=null and sparams.stoptime!=0">
-            AND p.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+            AND pg.stoptime <![CDATA[ <= ]]>#{sparams.stoptime}
         </if>
         GROUP BY p.subjectid ORDER BY s.subjectorder
     </select>
@@ -47,10 +47,10 @@
         where p.schoolid=#{sparams.schoolid} and p.paperstate=22 and pg.schoolid=#{sparams.schoolid}
         and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
         <if test="sparams.starttime!=null and sparams.starttime!=0">
-            AND p.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+            AND pg.starttime>=#{sparams.starttime}
         </if>
         <if test="sparams.stoptime!=null and sparams.stoptime!=0">
-            AND p.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+            AND pg.starttime <![CDATA[ <= ]]>#{sparams.stoptime}
         </if>
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and p.subjectid=#{sparams.subjectid}
@@ -102,18 +102,18 @@
           SELECT r.subjectid,s.subjectname,count(distinct r.reciteid)fabunum,
          count(distinct rs.rsid) stunum,
          count(distinct case when rs.rsstate!=0 then rs.rsid else null end) commitnum
-         FROM t_recite r
+         FROM t_recite r left join t_recite_group rg on rg.reciteid=r.reciteid
           LEFT JOIN t_subject s ON r.subjectid=s.subjectid
-         LEFT JOIN t_recite_student rs ON r.reciteid=rs.reciteid
-         LEFT JOIN t_class c ON rs.classid=c.classid
+         LEFT JOIN t_recite_student rs ON rg.reciteid=rs.reciteid and rg.classid=rs.classid
+         LEFT JOIN t_class c ON rg.classid=c.classid
          LEFT JOIN T_USER U ON r.createid=u.userid
-         WHERE r.recitestate=22 AND r.schoolid=#{sparams.schoolid} AND rs.schoolid=#{sparams.schoolid}
+         WHERE r.recitestate=22 AND r.schoolid=#{sparams.schoolid} AND rg.schoolid=#{sparams.schoolid}
         AND c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year} AND u.userstate=1
         <if test="sparams.starttime!=null and sparams.starttime!=0">
-            AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+            AND rg.starttime>=#{sparams.starttime}
         </if>
         <if test="sparams.stoptime!=null and sparams.stoptime!=0">
-            AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+            AND rg.starttime <![CDATA[ <= ]]>#{sparams.stoptime}
         </if>
          GROUP BY r.subjectid ORDER BY s.subjectorder
     </select>
@@ -123,15 +123,16 @@
         select r.createid userid,count(distinct r.reciteid)fabunum,
         count(distinct rs.rsid) stunum,
         count(distinct case when rs.rsstate!=0 then rs.rsid else null end) commitnum
-        from t_recite r left join t_recite_student rs on rs.reciteid=r.reciteid
-        left join t_class c on c.classid=rs.classid
-        where r.schoolid=#{sparams.schoolid} and r.recitestate=22 and rs.schoolid=#{sparams.schoolid}
+        from t_recite r left join t_recite_group rg on rg.reciteid=r.reciteid
+        left join t_recite_student rs on rs.reciteid=rg.reciteid and rs.classid=rg.classid
+        left join t_class c on c.classid=rg.classid
+        where r.schoolid=#{sparams.schoolid} and r.recitestate=22 and rg.schoolid=#{sparams.schoolid}
         and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
         <if test="sparams.starttime!=null and sparams.starttime!=0">
-            AND r.createtime<![CDATA[ >= ]]>#{sparams.starttime}
+            AND rg.starttime>=#{sparams.starttime}
         </if>
         <if test="sparams.stoptime!=null and sparams.stoptime!=0">
-            AND r.createtime<![CDATA[ <= ]]>#{sparams.stoptime}
+            AND rg.starttime <![CDATA[ <= ]]>#{sparams.stoptime}
         </if>
         <if test="sparams.subjectid!=null and sparams.subjectid!='0'.toString() and sparams.subjectid!=''">
             and r.subjectid=#{sparams.subjectid}

sapi/src/main/resources/mapper/classreport/ClassReportMapper.xml

@@ -13,7 +13,7 @@
         from t_guide g left join t_guide_group gg on g.guideid=gg.guideid
         left join t_guide_group_student ggs on ggs.guideid=gg.guideid and ggs.classid=gg.classid
         left join t_class c on gg.classid=c.classid
-        left join t_school s on g.schoolid=s.schoolid
+        left join t_school s on g.schoolid=s.schoolid and gg.schoolid=s.schoolid
         where s.schoolstate=1 and s.year=c.year and c.classstate=1
         <if test="type.reporttype==1">and YEARWEEK(FROM_UNIXTIME(g.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)-#{type.basenum}</if>
         <if test="type.reporttype==2">and MONTH(FROM_UNIXTIME(g.createtime))=MONTH(now())-#{type.basenum}</if>
@@ -106,16 +106,16 @@
         ,sum(case when pg.starttime&lt;=#{type.createtime} then ps.paperscore else 0 end)pscore
         ,sum(ps.userscore)uscore
         ,ifnull(truncate(sum(ps.userscore)*100/sum(case when pg.starttime&lt;=#{type.createtime} then ps.paperscore else 0 end),2),0)zqrate
-        ,from_unixtime(p.createtime,'%Y-%m-%d')begindate,count(distinct p.paperid)fbnum
+        ,from_unixtime(pg.starttime,'%Y-%m-%d')begindate,count(distinct p.paperid)fbnum
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_paper_student ps on ps.paperid=p.paperid and ps.classid=pg.classid
         left join t_class c on pg.classid=c.classid
-        left join t_school s on p.schoolid=s.schoolid
+        left join t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
         where p.paperstate=22 and s.schoolstate=1 and s.year=c.year and c.classstate=1
-        <if test="type.reporttype==1">and YEARWEEK(FROM_UNIXTIME(p.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)-#{type.basenum}</if>
-        <if test="type.reporttype==2">and MONTH(FROM_UNIXTIME(p.createtime))=MONTH(now())-#{type.basenum}</if>
-        <if test="type.reporttype==3">and YEARWEEK(FROM_UNIXTIME(p.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)</if>
-        <if test="type.reporttype==4">and MONTH(FROM_UNIXTIME(p.createtime))=MONTH(now())</if>
+        <if test="type.reporttype==1">and YEARWEEK(FROM_UNIXTIME(pg.starttime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)-#{type.basenum}</if>
+        <if test="type.reporttype==2">and MONTH(FROM_UNIXTIME(pg.starttime))=MONTH(now())-#{type.basenum}</if>
+        <if test="type.reporttype==3">and YEARWEEK(FROM_UNIXTIME(pg.starttime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)</if>
+        <if test="type.reporttype==4">and MONTH(FROM_UNIXTIME(pg.starttime))=MONTH(now())</if>
         <if test="type.gradeid!=null">and c.gradeid=#{type.gradeid}</if>
         <if test="type.classtype!=null">and c.classtype=#{type.classtype}</if>
         <if test="type.subjectid!=null">and p.subjectid=#{type.subjectid}</if>
@@ -153,16 +153,16 @@
         ,sum(case when rs.rsstate!=0 then 1 else 0 end)*100 pscore
         ,sum(rs.userscore)uscore
         ,ifnull(truncate(sum(rs.userscore)*100/(sum(case when rs.rsstate!=0 then 1 else 0 end)*100),2),0)zqrate
-        ,from_unixtime(r.createtime,'%Y-%m-%d')begindate,count(distinct r.reciteid)fbnum
+        ,from_unixtime(rg.starttime,'%Y-%m-%d')begindate,count(distinct r.reciteid)fbnum
         from t_recite r left join t_recite_group rg on r.reciteid=rg.reciteid
         left join t_recite_student rs on rs.reciteid=r.reciteid and rs.classid=rg.classid
         left join t_class c on rg.classid=c.classid
-        left join t_school s on r.schoolid=s.schoolid
+        left join t_school s on r.schoolid=s.schoolid and rg.schoolid=s.schoolid
         where r.recitestate=22 and s.schoolstate=1 and s.year=c.year and c.classstate=1
-        <if test="type.reporttype==1">and YEARWEEK(FROM_UNIXTIME(r.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)-#{type.basenum}</if>
-        <if test="type.reporttype==2">and MONTH(FROM_UNIXTIME(r.createtime))=MONTH(now())-#{type.basenum}</if>
-        <if test="type.reporttype==3">and YEARWEEK(FROM_UNIXTIME(r.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)</if>
-        <if test="type.reporttype==4">and MONTH(FROM_UNIXTIME(r.createtime))=MONTH(now())</if>
+        <if test="type.reporttype==1">and YEARWEEK(FROM_UNIXTIME(rg.starttime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)-#{type.basenum}</if>
+        <if test="type.reporttype==2">and MONTH(FROM_UNIXTIME(rg.starttime))=MONTH(now())-#{type.basenum}</if>
+        <if test="type.reporttype==3">and YEARWEEK(FROM_UNIXTIME(rg.starttime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)</if>
+        <if test="type.reporttype==4">and MONTH(FROM_UNIXTIME(rg.starttime))=MONTH(now())</if>
         <if test="type.gradeid!=null">and c.gradeid=#{type.gradeid}</if>
         <if test="type.classtype!=null">and c.classtype=#{type.classtype}</if>
         <if test="type.subjectid!=null">and r.subjectid=#{type.subjectid}</if>

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

@@ -85,7 +85,7 @@
                 LEFT JOIN t_recite_group rg ON rs.reciteid=rg.reciteid AND rg.classid=rs.classid
                 where rg.starttime<=#{timestamp} and rs.studentid=#{todo.studentid} and rs.rsstate=0
                 <if test="todo.showtime!=null and todo.showtime!=0">
-                    and r.createtime>=#{todo.showtime}
+                    and rg.starttime>=#{todo.showtime}
                 </if>
                 <if test="todo.subjectid!=null and todo.subjectid!='0'.toString() and todo.subjectid!=''">
                     and r.subjectid=#{todo.subjectid}

sapi/src/main/resources/mapper/region/RPaperAnalyzeMapper.xml

@@ -5,7 +5,7 @@
     <!--作业数量统计——作业数量-->
     <select id="getRegionPaperNumPaper" resultType="java.lang.Integer">
       select count(DISTINCT pg.paperid) from t_paper_class pg left join t_paper p on pg.paperid=p.paperid
-        LEFT JOIN t_school s on p.schoolid=s.schoolid
+        LEFT JOIN t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
         left join t_class c on c.classid=pg.classid
         where s.schoollevel=#{param.level}
         <if test="param.begintime!=null and param.begintime!=0">
@@ -21,7 +21,7 @@
     <!--作业数量统计——预习数量-->
     <select id="getRegionPaperNumPreview" resultType="java.lang.Integer">
         select count(DISTINCT g.guideid) from t_guide_group gg left join t_guide g on gg.guideid=g.guideid
-        LEFT JOIN t_school s on g.schoolid=s.schoolid
+        LEFT JOIN t_school s on g.schoolid=s.schoolid and gg.schoolid=s.schoolid
         left join t_class c on c.classid=gg.classid
         where s.schoollevel=#{param.level}
         <if test="param.begintime!=null and param.begintime!=0">
@@ -37,7 +37,7 @@
     <!--作业数量统计——背诵数量-->
     <select id="getRegionPaperNumRecite" resultType="java.lang.Integer">
        select count(DISTINCT rg.reciteid) from t_recite_group rg left join t_recite r on rg.reciteid=r.reciteid
-        LEFT JOIN t_school s on r.schoolid=s.schoolid
+        LEFT JOIN t_school s on r.schoolid=s.schoolid and rg.schoolid=s.schoolid
         left join t_class c on c.classid=rg.classid
         where s.schoollevel=#{param.level}
         <if test="param.begintime!=null and param.begintime!=0">
@@ -93,7 +93,7 @@
         count(case when ps.psstate!=0 and ps.pschecked=1 then ps.psid else null end) checknum
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_paper_student ps on ps.paperid=p.paperid and ps.classid=pg.classid
-        left join t_school s on p.schoolid=s.schoolid
+        left join t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
         left join t_class c on c.classid=pg.classid
         where s.schoollevel=#{param.level}
         <if test="param.begintime!=null and param.begintime!=0">
@@ -115,7 +115,7 @@
         count(case when rs.rsstate=1 then rs.rsid else null end)commitasnum
         from t_recite r left join t_recite_group rg on r.reciteid=rg.reciteid
         left join t_recite_student rs on rs.reciteid=r.reciteid and rs.classid=rg.classid
-        left join t_school s on r.schoolid=s.schoolid
+        left join t_school s on r.schoolid=s.schoolid and rg.schoolid=s.schoolid
         left join t_class c on c.classid=rg.classid
         where s.schoollevel=#{param.level}
         <if test="param.begintime!=null and param.begintime!=0">
@@ -137,7 +137,7 @@
         from t_guide g
         left join t_guide_group gg on gg.guideid=g.guideid
         left join t_guide_group_student ggs on ggs.guideid=g.guideid and ggs.classid=gg.classid
-        left join t_school s on s.schoolid=g.schoolid
+        left join t_school s on s.schoolid=g.schoolid and s.schoolid=gg.schoolid
         left join t_class c on c.classid=gg.classid
         where s.schoollevel=#{param.level}
         <if test="param.begintime!=null and param.begintime!=0">
@@ -157,12 +157,13 @@
         select s.schoolid,s.schoolname,s.shortname,
         count(ps.psid) as stunum,
         ifnull(SUM(ps.costtime),0) costtime
-         from t_paper_student ps
-        left join t_school s on ps.schoolid=s.schoolid
-        left join t_class c on c.classid=ps.classid
+        from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
+        left join t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
+        left join t_paper_student ps on pg.paperid=ps.paperid and pg.classid=ps.classid and ps.psstate!=0
+        left join t_class c on c.classid=pg.classid
         where s.schoollevel=#{param.level}
         <if test="param.begintime!=null and param.begintime!=0">
-            and ps.stoptime between #{param.begintime} and #{param.endtime}
+            and pg.starttime between #{param.begintime} and #{param.endtime}
         </if>
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
@@ -170,7 +171,7 @@
         <if test="param.year==null || param.year==0">
             and c.year=s.year
         </if>
-        group by ps.schoolid order by ps.schoolid
+        group by s.schoolid order by s.schoolid
     </select>
     <!--人均用时——预习-->
     <select id="listRegionSchoolUsetimePreview" resultType="java.util.Map">
@@ -179,11 +180,11 @@
         sum(gs.costtime) costtime
         from t_guide_group_student gs
         left join t_guide g on gs.guideid=g.guideid
-        left join t_school s on g.schoolid=s.schoolid
+        left join t_school s on g.schoolid=s.schoolid and gs.schoolid=s.schoolid
         left join t_class c on c.classid=gs.classid
         where s.schoollevel=#{param.level} and gs.readtime>0
         <if test="param.begintime!=null and param.begintime!=0">
-            and gs.readtime between #{param.begintime} and #{param.endtime}
+            and g.createtime between #{param.begintime} and #{param.endtime}
         </if>
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}

sapi/src/main/resources/mapper/region/RegionAnalyzeMapper.xml

@@ -81,10 +81,11 @@
         count(distinct ps.psid)stunum,
         count(distinct case when ps.psstate!=0 then ps.psid else null end)commitnum,
         count(distinct case when ps.psstate!=0 and ps.pschecked=1 then ps.psid else null end)checknum
-        from t_paper_class pg
-        right join t_school s on pg.schoolid=s.schoolid and pg.pgstate=22
+        from t_paper p
+        right join t_school s on p.schoolid=s.schoolid and p.paperstate=22
+        left join t_paper_class pg on p.paperid = pg.paperid and pg.schoolid=s.schoolid
         and pg.starttime between #{param.begintime} and #{param.endtime}
-        left join t_paper_student ps on ps.paperid=pg.paperid
+        left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
         left join t_class c on c.classid=pg.classid
         where s.schoolstate=1
         <if test="param.year!=null and param.year!=0">
@@ -102,7 +103,7 @@
         count(distinct case when gs.readtime>0 then gs.rgsid else null end) commitnum
         from t_guide g right join t_school s on g.schoolid=s.schoolid
         and g.createtime between #{param.begintime} and #{param.endtime}
-        left join t_guide_group_student gs on gs.guideid=g.guideid
+        left join t_guide_group_student gs on gs.guideid=g.guideid and gs.schoolid=s.schoolid
         left join t_class c on c.classid=gs.classid
         where s.schoolstate=1
         <if test="param.year!=null and param.year!=0">
@@ -119,7 +120,8 @@
         select s.schoolid,s.schoolname,s.shortname,rg.reciteid as wid,
         count(distinct rs.rsid) stunum,
         count(distinct case when rs.rsstate!=0 then rs.rsid else null end) commitnum
-        from t_recite_group rg right join t_school s on rg.schoolid=s.schoolid
+        from t_recite r right join t_school s on r.schoolid=s.schoolid
+        left join t_recite_group rg on r.reciteid=rg.reciteid and rg.schoolid=s.schoolid
         and rg.starttime between #{param.begintime} and #{param.endtime}
         left join t_recite_student rs on rs.reciteid=rg.reciteid and rs.classid=rg.classid
         left join t_class c on c.classid=rg.classid
@@ -151,9 +153,11 @@
     <!--布置作业统计_布置作业次数-->
     <select id="listPapernumMonth" resultType="com.xhkjedu.sapi.vo.region.WorkVo">
         select s.schoolid,s.schoolname,s.shortname,count(distinct pg.paperid) num
-        from t_paper_class pg left join t_class c on c.classid=pg.classid
-        right join t_school s on pg.schoolid=s.schoolid and pg.pgstate=22
-        and pg.createtime between #{param.begintime} and #{param.endtime}
+        from t_paper p
+        right join t_school s on p.schoolid=s.schoolid and p.paperstate=22
+        left join t_paper_class pg on p.paperid=pg.paperid and s.schoolid=pg.schoolid
+        and pg.starttime between #{param.begintime} and #{param.endtime}
+        left join t_class c on c.classid=pg.classid
         where s.schoolstate=1
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}

sapi/src/main/resources/mapper/region/SAnalyzeMapper.xml

@@ -71,8 +71,8 @@
         from t_paper_class pg right join t_paper p on pg.paperid=p.paperid
         left join t_subject s on p.subjectid=s.subjectid
         left join t_class c on pg.classid=c.classid
-        left join t_paper_student ps on ps.paperid=pg.paperid
-        where c.year=#{param.year} and p.schoolid=#{param.schoolid} and pg.pgstate=22
+        left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
+        where c.year=#{param.year} and p.schoolid=#{param.schoolid} and pg.pgstate=22 and pg.schoolid=#{param.schoolid}
         and pg.starttime between #{param.begintime} and #{param.endtime}
         group by c.gradeid,p.subjectid
     </select>
@@ -83,7 +83,7 @@
         from t_guide g left join t_subject s on g.subjectid=s.subjectid
         left join t_guide_group_student gs on gs.guideid=g.guideid
         left join t_class c on gs.classid=c.classid
-        where c.year=#{param.year} and g.schoolid=#{param.schoolid}
+        where c.year=#{param.year} and g.schoolid=#{param.schoolid} and gs.schoolid=#{param.schoolid}
         and g.createtime between #{param.begintime} and #{param.endtime}
         group by c.gradeid,g.subjectid
     </select>

sstudy/src/main/resources/mapper/paper/PaperAnalyzeMapper.xml

@@ -313,7 +313,7 @@
         from t_paper_class pg left join t_class c on pg.classid = c.classid
         left join t_school s on c.schoolid = s.schoolid
         where pg.paperid=#{paperid}
-        group by pg.classid order by c.schoolid <![CDATA[ <> ]]> #{schoolid},c.gradeid,c.classtype,c.classorder
+        group by pg.classid order by case c.schoolid when #{schoolid} then 0 else c.schoolid end,c.gradeid,c.classtype,c.classorder
     </select>
     <!--作业班级学生列表-->
     <select id="listPaperClassStudent" resultType="com.xhkjedu.sstudy.vo.gradeclass.CStudentVo">

sstudy/src/main/resources/mapper/paper/PaperMapper.xml

@@ -79,7 +79,7 @@
                     select="listClass" column="{paperid=paperid,createid=createid,checkid=checkid,checktype=checktype,logschoolid=logschoolid,classids=classids}">
         </collection>
         <collection property="checklist" ofType="java.util.Map" javaType="java.util.List"
-                    select="listPaperCheckStu" column="{paperid=paperid,checktype=checktype,logschoolid=logschoolid}">
+                    select="listPaperCheckStu" column="{paperid=paperid,checktype=checktype,logschoolid=logschoolid,classids=classids}">
             <result property="userid" column="userid"></result>
             <result property="username" column="username"></result>
             <result property="classid" column="classid"></result>
@@ -134,7 +134,8 @@
         <if test="classids!=null and classids!=''">
             and ps.classid in(${classids})
         </if>
-        group by ps.classid order by c.gradeid,c.classtype,c.classorder
+        group by ps.classid
+        order by case c.schoolid when #{logschoolid} then 0 else c.schoolid end,c.gradeid,c.classtype,c.classorder
     </select>
     <!--本校作业班级批阅人-->
     <resultMap id="checkUserResult" type="java.util.Map">
@@ -158,17 +159,25 @@
            from t_paper_class pg left join t_school s on pg.schoolid=s.schoolid
            left join t_user u on pg.checkid=u.userid
            left join t_class c on pg.classid=c.classid
-           where pg.paperid=#{paperid} and pg.schoolid=#{logschoolid}
-           order by c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
+           where pg.paperid=#{paperid}
+             <if test="classids!=null and classids!=''">
+                 and pg.classid in(${classids})
+             </if>
+             order by case c.schoolid when #{logschoolid} then 0 else c.schoolid end,
+             c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
        </if>
        <if test="checktype==3">
            select ps.checkid userid,u.username,c.classid,c.classname,c.gradeid,ps.schoolid,s.schoolname
            from t_paper_student ps left join t_school s on ps.schoolid=s.schoolid
            left join t_user u on ps.checkid=u.userid
            left join t_class c on ps.classid=c.classid
-           where ps.paperid=#{paperid} and ps.schoolid=#{logschoolid}
+           where ps.paperid=#{paperid}
+           <if test="classids!=null and classids!=''">
+               and ps.classid in(${classids})
+           </if>
            group by ps.classid,ps.checkid
-           order by c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
+           order by case c.schoolid when #{logschoolid} then 0 else c.schoolid end,
+           c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
        </if>
         <if test="checktype!=1 and checktype!=3">
             select checktype from t_paper where paperid=#{paperid}
@@ -297,10 +306,10 @@
         where p.createid=#{paper.teacherid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
         and pg.schoolid=#{paper.schoolid}
         <if test="paper.starttime!=null and paper.starttime!=0">
-            and p.createtime>=#{paper.starttime}
+            and pg.starttime>=#{paper.starttime}
         </if>
         <if test="paper.stoptime!=null and paper.stoptime!=0">
-            and p.createtime&lt;=#{paper.stoptime}
+            and pg.starttime&lt;=#{paper.stoptime}
         </if>
         <if test="paper.classid!=null and paper.classid!=0">
             and c.classid=#{paper.classid}
@@ -358,7 +367,8 @@
         <if test="checkid!=null and checkid!=0">
             and pg.checkid=#{checkid}
         </if>
-        group by pg.classid order by c.schoolid <![CDATA[ <> ]]> #{schoolid},c.gradeid,c.classtype,c.classorder
+        group by pg.classid
+        order by case c.schoolid when #{schoolid} then 0 else c.schoolid end,c.gradeid,c.classtype,c.classorder
     </select>
     <!--根据作业id获取作业分类-->
     <select id="getPaperTypeById" resultType="java.lang.Integer">

sstudy/src/main/resources/mapper/paper/PaperTeaAppMapper.xml

@@ -82,7 +82,7 @@
             and pg.checkid=#{checkid}
         </if>-->
         group by pg.classid
-        order by pg.schoolid <![CDATA[ <> ]]> #{schoolid},c.classtype,c.classorder,c.classid
+        order by case c.schoolid when #{schoolid} then 0 else c.schoolid,c.classtype,c.classorder,c.classid
     </select>
 
     <!--作业报告-->

sstudy/src/main/resources/mapper/resource/GuideGroupMapper.xml

@@ -66,6 +66,6 @@
             and gg.classid in(${guide.classids})
         </if>
         group by gg.classid
-        order by s.schoolid <![CDATA[ <> ]]> #{guide.schoolid},c.gradeid,c.classtype,c.classorder
+        order by case c.schoolid when #{guide.schoolid} then 0 else c.schoolid end,c.gradeid,c.classtype,c.classorder
     </select>
 </mapper>

suser/src/main/resources/mapper/system/UserMapper.xml

@@ -156,7 +156,7 @@
         <if test="classtype==null or classtype==0">
             and c.classtype!=99
         </if>
-        order by c.schoolid <![CDATA[ <> ]]> #{schoolid},c.gradeid,c.classtype,c.classorder
+        order by case c.schoolid when #{schoolid} then 0 else c.schoolid end,c.gradeid,c.classtype,c.classorder
     </select>
     <!--教师基本信息-->
     <select id="getTeacherInfo" resultMap="teacherInfoMap">