完善模块相关排序、组件考试报告数据

sapi/src/main/java/com/xhkjedu/sapi/mapper/component/ComponentMapper.java

@@ -102,22 +102,26 @@ public interface ComponentMapper {
     List<Map<String,Object>> listExamPaperCheck(@Param("params")ComponentParams params);
     //考试-待监考
     List<Map<String,Object>> listExamInvigilate(@Param("params")ComponentParams params);
+
     //考试-校级报告-获取最近一次生成报告的考试
     Map<String,Object> getExamReportSchoolBase(@Param("schoolid")Integer schoolid);
     //考试-校级报告-成绩概况
     List<Map<String,Object>> listExamReportSchoolStatistic(@Param("examid")Integer examid);
+
     //考试-班级报告-考试信息
     ExamInfoVo getExamReportClassInfo(@Param("params")ComponentParams params);
     //考试-班级报告-学科成绩对比
     List<Map<String,Object>> listExamReportClassScore(@Param("params")ComponentParams params);
     //考试-考试报告-参与班级
     List<Map<String,Object>> listExamReportClass(@Param("examid")Integer examid,@Param("userid")Integer userid);
+
     //考试-单科报告-单科考试信息
     ExamInfoVo getExamReportSingleInfo(@Param("params")ComponentParams params);
     //考试-单科报告-单科概况
     Map<String,Object> getExamReportSingleBase(@Param("params")ComponentParams params);
     //考试-单科报告-成绩等级分布
     List<Map<String,Object>> listExamReportSingleRank(@Param("params")ComponentParams params);
+
     //考试-阅卷进度-考试信息
     ExamInfoVo getExamCheckProgressBase(@Param("params")ComponentParams params);
     //考试-阅卷进度-试卷

sapi/src/main/resources/mapper/component/ComponentMapper.xml

@@ -520,7 +520,7 @@
     <select id="getExamReportSchoolBase" resultType="java.util.Map">
         select re.classnum,re.stunum,re.missnum,re.subjectnum,re.maxscore,re.avgscore,re.mixscore,
         e.examid,e.teashowrank,e.examstate,e.examname from e_base e left join e_rbase re on e.examid=re.examid
-        where e.schoolid=#{schoolid} and e.deleted=1 and e.examstate=3 order by examdate desc limit 1
+        where e.schoolid=#{schoolid} and e.deleted=1 order by examdate desc limit 1
     </select>
     <!--考试-校级报告-成绩概况-->
     <select id="listExamReportSchoolStatistic" resultType="java.util.Map">
@@ -542,7 +542,7 @@
         select e.examid,e.examname,e.teashowrank,e.examstate,c.classid,c.classname
         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.deleted=1 and e.examstate=3 and c.schoolid=#{params.schoolid} and ct.teacherid=#{params.userid}
+        where e.deleted=1 and e.schoolid=#{params.schoolid} and ct.teacherid=#{params.userid}
         group by e.examid order by e.examdate desc,e.examid desc,c.ecid limit 1
     </select>
     <!--考试-班级报告-学科成绩对比-->
@@ -564,7 +564,7 @@
         left join t_teacher_powersb tp on tp.teacherid=#{params.userid} and tp.subjectid=s.subjectid
         left join e_class c on e.examid=c.examid
         left join t_class_teacher ct on c.classid=ct.classid and tp.teacherid=ct.teacherid
-        where e.deleted=1 and e.examstate=3 and c.schoolid=#{params.schoolid} and ct.teacherid=#{params.userid}
+        where e.deleted=1 and e.schoolid=#{params.schoolid} and ct.teacherid=#{params.userid}
         group by e.examid order by e.examdate desc,e.examid desc,c.ecid limit 1
     </select>
     <!--考试-单科报告-单科概况-->

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

@@ -12,14 +12,14 @@
         <if test="module.belongcode!=null and module.belongcode==1">and m.belongcode in (1,3)</if>
         <if test="module.belongcode!=null and module.belongcode==2">and m.belongcode in (2,3)</if>
         <if test="module.display!=null">and m.display=#{module.display}</if>
-        ORDER BY m.morder,m.moduleid
+        ORDER BY m.level,m.morder,m.moduleid
     </select>
 
     <!-- 获取供第一层模块 -->
     <select id="listLevelModule" resultType="com.xhkjedu.sapi.vo.system.ModuleSelVo">
         SELECT moduleid,modulename,LEVEL FROM t_module
         WHERE schoolid=#{schoolid} and LEVEL=1 and display=1 and belong=#{belong}
-        order by morder,moduleid
+        order by level,morder,moduleid
     </select>
 
     <update id="updateOrder">
@@ -48,7 +48,7 @@
         FROM t_module m WHERE m.schoolid=#{schoolid} and m.level!=1 and m.belong=#{belong}
         <if test="belongcode!=null and belongcode==1">and m.belongcode in (1,3)</if>
         <if test="belongcode!=null and belongcode==2">and m.belongcode in (2,3)</if>
-        and m.display=1 ORDER BY m.morder,m.moduleid
+        and m.display=1 ORDER BY m.level,m.morder,m.moduleid
     </select>
     <!--删除默认模块关联的学校模块-->
     <delete id="deleteByDefaultId">

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

@@ -10,19 +10,19 @@
         <if test="belongcode!=null and belongcode==2">and m.belongcode in (2,3)</if>
 
         <if test="display!=null">and m.display=#{display}</if>
-        group by m.moduleid ORDER BY m.morder,m.moduleid
+        group by m.moduleid ORDER BY m.level,m.morder,m.moduleid
     </select>
 
     <!--获取所有模块-->
     <select id="listAllModules" resultType="com.xhkjedu.sapi.model.system.TModule">
         SELECT m.moduleid,m.modulename,m.moduleurl,m.moduleico,m.modulepid,m.morder,m.minout
         ,m.comm,m.mclass,m.level,m.mabbrevname,m.mdefault,m.belong,m.belongcode,m.display
-        FROM t_moduledefault m ORDER BY m.morder
+        FROM t_moduledefault m ORDER BY m.level,m.morder,m.moduleid
     </select>
     <!-- 获取供第一层模块 -->
     <select id="listLevelModule" resultType="com.xhkjedu.sapi.vo.system.ModuleSelVo">
         SELECT moduleid,modulename,LEVEL FROM t_moduledefault WHERE LEVEL=1 and display=1
-        and belong=#{belong} order by morder,moduleid
+        and belong=#{belong} order by level,morder,moduleid
     </select>
     <!--获取学校id集合-->
     <select id="listSchoolId" resultType="java.lang.Integer">

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

@@ -6,7 +6,7 @@
     <select id="listRoleModules" resultType="com.xhkjedu.suser.vo.system.RoleModuleVo">
         SELECT rm.moduleid,rm.belongcode,m.modulename,m.moduleurl,m.moduleico,m.modulepid,m.minout,m.mclass,m.level
         FROM t_role_module rm LEFT JOIN t_module m ON rm.moduleid=m.moduleid
-        WHERE rm.roleid=#{roleid} and m.display=1 ORDER BY m.morder
+        WHERE rm.roleid=#{roleid} and m.display=1 ORDER BY m.level,m.morder,m.moduleid
     </select>
 
     <!-- 批量保存角色模块信息 -->