校级报告和班级报告

sexam/src/main/resources/mapper/report/EReportClassMapper.xml

@@ -102,23 +102,22 @@
         <result property="gradeid" column="gradeid"></result>
         <result property="examtype" column="examtype"></result>
         <result property="exammode" column="exammode"></result>
-        <collection property="subjects" ofType="java.util.Map" javaType="java.util.List">
-            <result property="esid" column="esid"></result>
-            <result property="subjectid" column="subjectid"></result>
-            <result property="subjectname" column="subjectname"></result>
+        <collection property="subjects" ofType="java.util.Map" javaType="java.util.List"
+                    select="listExamSubjects" column="examid">
         </collection>
     </resultMap>
     <select id="listEndExamsForClassTeacher" resultMap="listExamEndResult">
         select e.examid,e.examname,e.examdate,e.gradeid,e.examtype,e.exammode,e.monitored
-             ,s.esid,s.subjectid,s.subjectname
-        from e_base e left join e_subject s on e.examid=s.examid left join e_class c on e.examid=c.examid
+        from e_base e left join e_class c on e.examid=c.examid
         left join t_class_teacher ct on c.classid=ct.classid
-        where e.examstate=3 and e.deleted=1 and s.pstate=2
-          and ct.teacherid=#{paramsVo.userid}
+        where e.examstate=3 and e.deleted=1 and ct.teacherid=#{paramsVo.userid}
         <if test="paramsVo.begindate!=null and paramsVo.begindate!=''">
             and e.examdate between #{paramsVo.begindate} and #{paramsVo.enddate}
         </if>
-        group by s.esid order by e.examdate desc, s.esid asc
+        group by e.examid order by e.examdate desc
+    </select>
+    <select id="listExamSubjects" resultType="java.util.Map">
+        select esid,subjectid,subjectname from e_subject where examid=#{examid} and pstate=2 order by esid
     </select>
 
     <!--考试教师权限下班级-->

sexam/src/main/resources/mapper/report/EReportSchoolMapper.xml

@@ -64,24 +64,23 @@
         <result property="gradeid" column="gradeid"></result>
         <result property="examtype" column="examtype"></result>
         <result property="exammode" column="exammode"></result>
-        <collection property="subjects" ofType="java.util.Map" javaType="java.util.List">
-            <result property="esid" column="esid"></result>
-            <result property="subjectid" column="subjectid"></result>
-            <result property="subjectname" column="subjectname"></result>
+        <collection property="subjects" ofType="java.util.Map" javaType="java.util.List"
+                    select="listExamSubjects" column="examid">
         </collection>
     </resultMap>
     <select id="listEndExams" resultMap="listExamEndResult">
         select e.examid,e.examname,e.examdate,e.gradeid,e.examtype,e.exammode,e.monitored
-             ,s.esid,s.subjectid,s.subjectname
-        from e_base e left join e_subject s on e.examid=s.examid
-        where e.schoolid=#{ebase.schoolid} and e.examstate=3 and e.deleted=1 and s.pstate=2
+        from e_base e where e.schoolid=#{ebase.schoolid} and e.examstate=3 and e.deleted=1
         <if test="ebase.gradeid!=null and ebase.gradeid!=0">
             and e.gradeid=#{ebase.gradeid}
         </if>
         <if test="ebase.begindate!=null and ebase.begindate!=''">
             and e.examdate between #{ebase.begindate} and #{ebase.enddate}
         </if>
-        order by e.examdate desc, s.esid asc
+        order by e.examdate desc
+    </select>
+    <select id="listExamSubjects" resultType="java.util.Map">
+        select esid,subjectid,subjectname from e_subject where examid=#{examid} and pstate=2 order by esid
     </select>
     <!--行为分析-班级-->
     <select id="listXwBjByExamId" resultType="java.util.Map">