学年升级记录

sapi/src/main/resources/mapper/system/SchoolMapper.xml

@@ -116,9 +116,23 @@
         order by s2.createtime desc
     </select>
     <!--学校升级记录-->
-    <select id="listUpgrade" resultType="java.util.Map">
-        select su.suid,uptype,oldyear,newyear,uptime,upresult
-        ,classxznum,classxnnum,stuupnum,stubynum,u.username
+    <resultMap id="upResult" type="java.util.Map">
+        <result property="suid" column="suid"></result>
+        <result property="uptype" column="uptype"></result>
+        <result property="oldyear" column="oldyear"></result>
+        <result property="newyear" column="newyear"></result>
+        <result property="uptime" column="uptime"></result>
+        <result property="upresult" column="upresult"></result>
+        <result property="username" column="username"></result>
+        <collection property="histories" javaType="java.util.List" select="listHistory" column="suid">
+        </collection>
+    </resultMap>
+    <select id="listHistory" resultType="java.util.Map">
+        select gradeid,classyxznum,classsxznum,classyxnnum,classsxnnum,stuyupnum,stusupnum
+        from t_school_upgrade_history where suid=#{suid} order by suhid desc
+    </select>
+    <select id="listUpgrade" resultMap="upResult">
+        select su.suid,uptype,oldyear,newyear,uptime,upresult,u.username
         from t_school_upgrade su left join t_user u on su.upuserid=u.userid
         where su.schoolid=#{schoolid} order by su.suid desc
     </select>