Merge remote-tracking branch 'origin/ywx' into wn

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

@@ -25,7 +25,7 @@
         from t_paper p left join t_paper_class pg on p.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 pg.classid=c.classid
-        where p.paperstate=22 and p.schoolid=#{sparams.schoolid}
+        where p.paperstate=22 and p.schoolid=#{sparams.schoolid} and pg.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 p.subjectid=#{sparams.subjectid}
@@ -94,7 +94,7 @@
         count(distinct case when ggs.costtime!=0 then ggs.rgsid else null end)yxcomitnum
         from t_guide g left join t_guide_group_student ggs on ggs.guideid=g.guideid
         left join t_class c on c.classid=ggs.classid
-        where g.schoolid=#{sparams.schoolid}
+        where g.schoolid=#{sparams.schoolid} and ggs.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 g.subjectid=#{sparams.subjectid}
@@ -114,7 +114,7 @@
         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}
+        where r.schoolid=#{sparams.schoolid} and rs.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}

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

@@ -24,7 +24,8 @@
         LEFT JOIN t_paper_student ps1 ON p.paperid=ps1.paperid and ps1.classid=pg.classid
         LEFT JOIN t_class c ON pg.classid=c.classid
         LEFT JOIN T_USER U ON p.createid=u.userid
-        WHERE p.paperstate=22 AND p.schoolid=#{sparams.schoolid} AND c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year} AND u.userstate=1
+        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}
         </if>
@@ -43,7 +44,8 @@
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_paper_student ps1 on ps1.paperid=pg.paperid and ps1.classid=pg.classid
         left join t_class c on c.classid=pg.classid
-        where p.schoolid=#{sparams.schoolid} and p.paperstate=22 and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
+        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}
         </if>
@@ -65,7 +67,8 @@
          LEFT JOIN t_class c ON ggs.classid=c.classid
          LEFT JOIN t_subject s ON g.subjectid=s.subjectid
          LEFT JOIN T_USER U ON g.createid=u.userid
-         WHERE g.schoolid=#{sparams.schoolid} AND c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year} and u.userstate=1
+         WHERE g.schoolid=#{sparams.schoolid} AND ggs.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 g.createtime<![CDATA[ >= ]]>#{sparams.starttime}
         </if>
@@ -80,7 +83,8 @@
         count(distinct case when ggs.costtime!=0 then ggs.rgsid else null end) commitnum
         from t_guide g left join t_guide_group_student ggs on ggs.guideid=g.guideid
         left join t_class c on c.classid=ggs.classid
-        where g.schoolid=#{sparams.schoolid} and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
+        where g.schoolid=#{sparams.schoolid} and ggs.schoolid=#{sparams.schoolid}
+        and c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
         <if test="sparams.starttime!=null and sparams.starttime!=0">
             AND g.createtime<![CDATA[ >= ]]>#{sparams.starttime}
         </if>
@@ -103,7 +107,8 @@
          LEFT JOIN t_recite_student rs ON r.reciteid=rs.reciteid
          LEFT JOIN t_class c ON rs.classid=c.classid
          LEFT JOIN T_USER U ON r.createid=u.userid
-         WHERE r.recitestate=22 AND r.schoolid=#{sparams.schoolid} AND c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year} AND u.userstate=1
+         WHERE r.recitestate=22 AND r.schoolid=#{sparams.schoolid} AND rs.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}
         </if>
@@ -120,7 +125,8 @@
         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 c.gradeid=#{sparams.gradeid} and c.year=#{sparams.year}
+        where r.schoolid=#{sparams.schoolid} and r.recitestate=22 and rs.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}
         </if>

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

@@ -375,7 +375,8 @@
         from t_paper p left join t_paper_class pg on p.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 pg.classid=c.classid
-        where p.paperstate=22 and c.schoolid=#{paper.schoolid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
+        where p.paperstate=22 and p.schoolid=#{paper.schoolid} and pg.schoolid=#{paper.schoolid}
+        and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
         <if test="paper.starttime!=null and paper.starttime!=0">
             and pg.starttime>=#{paper.starttime}
         </if>

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

@@ -76,7 +76,7 @@
         <result property="ytjnum" column="ytjnum"></result>
         <result property="ypgnum" column="ypgnum"></result>
         <collection property="classes" ofType="com.xhkjedu.sstudy.vo.paper.PaperClassVo" javaType="java.util.List"
-                    select="listClass" column="{paperid=paperid,createid=createid,checkid=checkid,checktype=checktype,logschoolid=logschoolid}">
+                    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}">
@@ -124,7 +124,8 @@
         ,count(distinct case when ps.psstate!=0 then ps.psid else null end)ytjnum
         ,count(distinct case when ps.pschecked=1 then ps.psid else null end)ypgnum
         from t_paper_student ps left join t_class c on ps.classid=c.classid
-        where ps.paperid=#{paperid} and ps.schoolid=#{logschoolid} group by ps.classid order by c.gradeid,c.classtype,c.classorder
+        where ps.paperid=#{paperid} and ps.classid in (${classids})
+        group by ps.classid order by c.gradeid,c.classtype,c.classorder
     </select>
     <!--本校作业班级批阅人-->
     <select id="listPaperCheckStu" resultType="java.util.Map">
@@ -152,11 +153,12 @@
     <select id="listAll" resultMap="paperResult">
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.schoolid,p.hasreport,
         #{paper.schoolid} logschoolid,u.username createname,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.createid,#{paper.createid} checkid
+        ,group_concat(pg.classid) classids
         from t_paper p left join t_user u on p.createid=u.userid
         left join t_paper_class pg on p.paperid=pg.paperid
         where p.lsbid=#{paper.lsbid} and (p.createid=#{paper.createid} or pg.checkid=#{paper.createid} or
-        (p.hashb=1 and pg.classid in (${paper.classids})) or
-        (p.hashb=0 and pg.classid in (${paper.bxclassids})))
+        (p.hashb=1 and p.schoolid=#{paper.schoolid} and pg.classid in (${paper.classids})) or
+        (pg.classid in (${paper.bxclassids})))
         <if test="paper.directorid!=null and paper.directorid!='0'.toString() and paper.directorid!=''">
             and p.directorid=#{paper.directorid}
         </if>
@@ -203,6 +205,7 @@
     <select id="correctList" resultMap="paperResult">
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.createid,#{checkid} checkid,p.schoolid as logschoolid
         ,u.username createname,pg.starttime,pg.stoptime,p.papernum
+        ,group_concat(pg.classid) classids
         from t_paper p left join t_user u on p.createid=u.userid
         left join t_paper_class pg on p.paperid=pg.paperid
         left join t_paper_student ps on p.paperid=ps.paperid and pg.classid=ps.classid
@@ -261,11 +264,12 @@
     <select id="listPaper" resultMap="paperResult">
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime
         ,pg.starttime,pg.stoptime,p.papernum,p.createid,#{paper.teacherid} checkid,p.schoolid,#{paper.schoolid} logschoolid
-        ,pg.showtype,p.hasreport
+        ,pg.showtype,p.hasreport,group_concat(pg.classid) classids
         ,(select u.username from t_user u where u.userid=p.createid)createname
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         left join t_class c on pg.classid=c.classid
         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}
         </if>

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

@@ -32,8 +32,8 @@
         ,(select u.username from t_user u where u.userid=p.createid)createname
         from t_paper p left join t_paper_class pg on p.paperid=pg.paperid
         where (p.createid=#{paper.teacherid} or pg.checkid=#{paper.teacherid} or
-        (p.hashb=1 and pg.classid in (${paper.classids})) or
-        (p.hashb=0 and pg.classid in (${paper.bxclassids})))
+        (p.hashb=1 and p.schoolid=#{paper.schoolid} and pg.classid in (${paper.classids})) or
+        (pg.classid in (${paper.bxclassids})))
         <if test="paper.lsbid!=null and paper.lsbid!='0'.toString() and paper.lsbid!=''">
             and p.lsbid=#{paper.lsbid}
         </if>