登录日志、作业学生完善

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

@@ -2,34 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sstudy.mapper.paper.PaperMapper">
     <resultMap id="typeResult" type="com.xhkjedu.sstudy.vo.paper.PaperQtypeVo">
-        <result property="qtypeid" column="qtypeid"></result>
-        <result property="qtypename" column="qtypename"></result>
-        <result property="ptorder" column="ptorder"></result>
-        <result property="ptscore" column="ptscore"></result>
-        <result property="ptnum" column="ptnum"></result>
-        <result property="ctype" column="pctype"></result>
+        <result property="qtypeid" column="qtypeid"/>
+        <result property="qtypename" column="qtypename"/>
+        <result property="ptorder" column="ptorder"/>
+        <result property="ptscore" column="ptscore"/>
+        <result property="ptnum" column="ptnum"/>
+        <result property="ctype" column="pctype"/>
         <collection property="questions" ofType="com.xhkjedu.sstudy.vo.question.QuestionVo">
-            <result property="questionid" column="questionid"></result>
-            <result property="questionpid" column="questionpid"></result>
-            <result property="qlevel" column="qlevel"></result>
-            <result property="score" column="score"></result>
-            <result property="ptqorder" column="ptqorder"></result>
-            <result property="ctype" column="ctype"></result>
-            <result property="qstem" column="qstem"></result>
-            <result property="qoption" column="qoption"></result>
-            <result property="qanswer" column="qanswer"></result>
-            <result property="qanalyze" column="qanalyze"></result>
-            <result property="hashear" column="hashear"></result>
-            <result property="hearfile" column="hearfile"></result>
-            <result property="qn" column="qn"></result>
-            <result property="complexity" column="complexity"></result>
-            <result property="qtypename" column="typename"></result>
+            <result property="questionid" column="questionid"/>
+            <result property="questionpid" column="questionpid"/>
+            <result property="qlevel" column="qlevel"/>
+            <result property="score" column="score"/>
+            <result property="ptqorder" column="ptqorder"/>
+            <result property="ctype" column="ctype"/>
+            <result property="qstem" column="qstem"/>
+            <result property="qoption" column="qoption"/>
+            <result property="qanswer" column="qanswer"/>
+            <result property="qanalyze" column="qanalyze"/>
+            <result property="hashear" column="hashear"/>
+            <result property="hearfile" column="hearfile"/>
+            <result property="qn" column="qn"/>
+            <result property="complexity" column="complexity"/>
+            <result property="qtypename" column="typename"/>
         </collection>
     </resultMap>
     <!--获取作业题型列表-->
     <select id="listPaperType" resultMap="typeResult">
-        select pt.qtypeid,pt.qtypename,pt.ptorder,pt.ptscore,pt.ptnum,ptq.questionid,ptq.ptqscore score,ptq.ptqorder,ptq.qn
-        ,q.questionid,ifnull(q.questionpid,q.questionid)questionpid,q.qlevel,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze
+        select pt.qtypeid,pt.qtypename,pt.ptorder,pt.ptscore,pt.ptnum,ptq.questionid,ptq.ptqscore as score,ptq.ptqorder,ptq.qn
+        ,q.questionid,ifnull(q.questionpid,q.questionid)as questionpid,q.qlevel,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze
         ,q.hashear,q.hearfile,q.complexity,q.qtypename typename,pt.ctype pctype
         from t_paper_qtype pt left join t_paper_qtype_question ptq on pt.ptid = ptq.ptid
         left join t_question q on ptq.questionid = q.questionid
@@ -61,52 +61,52 @@
 
     <!--作业列表-->
     <resultMap id="paperResult" type="com.xhkjedu.sstudy.vo.paper.PaperListVo">
-        <result property="paperid" column="paperid"></result>
-        <result property="papername" column="papername"></result>
-        <result property="papertype" column="papertype"></result>
-        <result property="paperclass" column="paperclass"></result>
-        <result property="paperstate" column="paperstate"></result>
-        <result property="checktype" column="checktype"></result>
-        <result property="createid" column="createid"></result>
-        <result property="createtime" column="createtime"></result>
-        <result property="createname" column="createname"></result>
-        <result property="starttime" column="starttime"></result>
-        <result property="stoptime" column="stoptime"></result>
-        <result property="papernum" column="papernum"></result>
-        <result property="timetype" column="timetype"></result>
-        <result property="showtype" column="showtype"></result>
-        <result property="schoolid" column="schoolid"></result>
-        <result property="logschoolid" column="logschoolid"></result>
-        <result property="classnum" column="classnum"></result>
-        <result property="ytjnum" column="ytjnum"></result>
-        <result property="ypgnum" column="ypgnum"></result>
+        <result property="paperid" column="paperid"/>
+        <result property="papername" column="papername"/>
+        <result property="papertype" column="papertype"/>
+        <result property="paperclass" column="paperclass"/>
+        <result property="paperstate" column="paperstate"/>
+        <result property="checktype" column="checktype"/>
+        <result property="createid" column="createid"/>
+        <result property="createtime" column="createtime"/>
+        <result property="createname" column="createname"/>
+        <result property="starttime" column="starttime"/>
+        <result property="stoptime" column="stoptime"/>
+        <result property="papernum" column="papernum"/>
+        <result property="timetype" column="timetype"/>
+        <result property="showtype" column="showtype"/>
+        <result property="schoolid" column="schoolid"/>
+        <result property="logschoolid" column="logschoolid"/>
+        <result property="classnum" column="classnum"/>
+        <result property="ytjnum" column="ytjnum"/>
+        <result property="ypgnum" column="ypgnum"/>
         <collection property="schools" ofType="java.util.Map" javaType="java.util.List"
                     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,classids=classids}">
-            <result property="userid" column="userid"></result>
-            <result property="username" column="username"></result>
-            <result property="classid" column="classid"></result>
-            <result property="classname" column="classname"></result>
-            <result property="gradeid" column="gradeid"></result>
+            <result property="userid" column="userid"/>
+            <result property="username" column="username"/>
+            <result property="classid" column="classid"/>
+            <result property="classname" column="classname"/>
+            <result property="gradeid" column="gradeid"/>
         </collection>
     </resultMap>
     <resultMap id="classResult" type="java.util.Map">
-        <result property="schoolid" column="schoolid"></result>
-        <result property="schoolname" column="schoolname"></result>
+        <result property="schoolid" column="schoolid"/>
+        <result property="schoolname" column="schoolname"/>
         <collection property="classes" ofType="com.xhkjedu.sstudy.vo.paper.PaperClassVo" javaType="java.util.List">
-            <result property="schoolid" column="schoolid"></result>
-            <result property="classid" column="classid"></result>
-            <result property="classname" column="classname"></result>
-            <result property="gradeid" column="gradeid"></result>
-            <result property="classnum" column="classnum"></result>
-            <result property="ytjnum" column="ytjnum"></result>
-            <result property="ypgnum" column="ypgnum"></result>
-            <result property="studentname" column="studentname"></result>
-            <result property="checkid" column="checkid"></result>
-            <result property="teachername" column="teachername"></result>
-            <result property="checked" column="checked"></result>
+            <result property="schoolid" column="schoolid"/>
+            <result property="classid" column="classid"/>
+            <result property="classname" column="classname"/>
+            <result property="gradeid" column="gradeid"/>
+            <result property="classnum" column="classnum"/>
+            <result property="ytjnum" column="ytjnum"/>
+            <result property="ypgnum" column="ypgnum"/>
+            <result property="studentname" column="studentname"/>
+            <result property="checkid" column="checkid"/>
+            <result property="teachername" column="teachername"/>
+            <result property="checked" column="checked"/>
         </collection>
     </resultMap>
     <!--<select id="listClass" resultMap="classResult">
@@ -130,9 +130,9 @@
     </select>-->
     <!--本校作业班级-->
     <select id="listClass" resultMap="classResult">
-        select count(*) classnum,ps.classid,c.classname,c.gradeid,c.schoolid,s.schoolname
-        ,count(distinct case when ps.psstate in (1,2) then ps.psid else null end)ytjnum
-        ,count(distinct case when ps.pschecked=1 then ps.psid else null end)ypgnum
+        select count(*) as classnum,ps.classid,c.classname,c.gradeid,c.schoolid,s.schoolname
+        ,count(distinct if(ps.psstate in (1,2), ps.psid, null))ytjnum
+        ,count(distinct if(ps.pschecked=1, ps.psid, null))ypgnum
         from t_paper_student ps left join t_class c on ps.classid=c.classid
         left join t_school s on c.schoolid = s.schoolid
         where ps.paperid=#{paperid}
@@ -140,27 +140,28 @@
             and ps.classid in(${classids})
         </if>
         group by ps.classid
-        order by case c.schoolid when #{logschoolid} then 0 else c.schoolid end,c.gradeid,c.classtype,c.classorder
+        order by if(c.schoolid = #{logschoolid}, 0, c.schoolid)
+        ,c.gradeid,c.classtype,c.classorder
     </select>
     <!--本校作业班级批阅人-->
     <resultMap id="checkUserResult" type="java.util.Map">
-        <result property="schoolid" column="schoolid"></result>
-        <result property="schoolname" column="schoolname"></result>
-        <result property="checktype" column="checktype"></result>
+        <result property="schoolid" column="schoolid"/>
+        <result property="schoolname" column="schoolname"/>
+        <result property="checktype" column="checktype"/>
         <collection property="classes" ofType="java.util.Map" javaType="java.util.List">
-            <result property="schoolid" column="schoolid"></result>
-            <result property="classid" column="classid"></result>
-            <result property="classname" column="classname"></result>
-            <result property="gradeid" column="gradeid"></result>
+            <result property="schoolid" column="schoolid"/>
+            <result property="classid" column="classid"/>
+            <result property="classname" column="classname"/>
+            <result property="gradeid" column="gradeid"/>
             <collection property="users" ofType="java.util.Map" javaType="java.util.List">
-                <result property="userid" column="userid"></result>
-                <result property="username" column="username"></result>
+                <result property="userid" column="userid"/>
+                <result property="username" column="username"/>
             </collection>
         </collection>
     </resultMap>
     <select id="listPaperCheckStu" resultMap="checkUserResult">
          <if test="checktype==1">
-           select pg.checkid userid,u.username,c.classid,c.classname,c.gradeid,pg.schoolid,s.schoolname
+           select pg.checkid as userid,u.username,c.classid,c.classname,c.gradeid,pg.schoolid,s.schoolname
            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
@@ -168,11 +169,11 @@
              <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,
+             order by if(c.schoolid = #{logschoolid}, 0, c.schoolid),
              c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
-       </if>
+         </if>
        <if test="checktype==3">
-           select ps.checkid userid,u.username,c.classid,c.classname,c.gradeid,ps.schoolid,s.schoolname
+           select ps.checkid as 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
@@ -181,7 +182,7 @@
                and ps.classid in(${classids})
            </if>
            group by ps.classid,ps.checkid
-           order by case c.schoolid when #{logschoolid} then 0 else c.schoolid end,
+           order by IF(c.schoolid = #{logschoolid}, 0, c.schoolid),
            c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
        </if>
         <if test="checktype!=1 and checktype!=3">
@@ -192,7 +193,7 @@
     <!--教师作业列表-->
     <select id="listAll" resultMap="paperResult">
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.schoolid,p.hasreport,p.timetype,
-        #{paper.schoolid} logschoolid,u.username createname,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.createid,#{paper.createid} checkid
+        #{paper.schoolid} logschoolid,u.username createname,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.createid,#{paper.createid} as 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
@@ -244,7 +245,7 @@
     </select>
     <!--教师批阅列表-->
     <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
+        select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.createid,#{checkid} as 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
@@ -259,20 +260,20 @@
     </update>
     <!--获取批改学生列表-->
     <resultMap id="checkResult" type="com.xhkjedu.sstudy.vo.paper.CheckClassVo">
-        <result property="classid" column="classid"></result>
-        <result property="classname" column="classname"></result>
-        <result property="classnum" column="classnum"></result>
-        <result property="ytjnum" column="ytjnum"></result>
-        <result property="ypynum" column="ypynum"></result>
+        <result property="classid" column="classid"/>
+        <result property="classname" column="classname"/>
+        <result property="classnum" column="classnum"/>
+        <result property="ytjnum" column="ytjnum"/>
+        <result property="ypynum" column="ypynum"/>
         <collection property="students" ofType="com.xhkjedu.sstudy.vo.paperstudent.StudentVo"
                     javaType="java.util.List" select="listStudent" column="{paperid=paperid,classid=classid}">
         </collection>
     </resultMap>
     <resultMap id="studentResult" type="com.xhkjedu.sstudy.vo.paperstudent.StudentVo">
-        <result property="psid" column="psid"></result>
-        <result property="studentid" column="studentid"></result>
-        <result property="studentname" column="studentname"></result>
-        <result property="pschecked" column="pschecked"></result>
+        <result property="psid" column="psid"/>
+        <result property="studentid" column="studentid"/>
+        <result property="studentname" column="studentname"/>
+        <result property="pschecked" column="pschecked"/>
     </resultMap>
     <select id="listStudent" resultMap="studentResult">
         select ps.psid,ps.studentid,u.username studentname,ps.pschecked
@@ -281,11 +282,11 @@
         order by ps.pschecked,convert(u.username using gbk),u.userid
     </select>
     <select id="listStudentsByPaperIdCheckId" resultMap="checkResult">
-        select ps.classid,c.classname,c.gradeid,count(*)classnum,ps.paperid
-        ,count(distinct case when ps.psstate in(1,2) then ps.psid else null end)ytjnum
-        ,count(distinct case when ps.pschecked=1 then ps.psid else null end)ypynum
-        from t_paper_student ps left join t_class c on ps.classid=c.classid
-        where ps.paperid=#{paperid} and ps.classid=#{classid}
+        select ps.classid,c.classname,c.gradeid,count(*) as classnum,ps.paperid
+        ,count(distinct IF(ps.psstate in (1, 2), ps.psid, null)) ytjnum
+        ,count(distinct IF(ps.pschecked = 1, ps.psid, null)) ypynum
+        from t_paper_student ps left join t_class c on ps.classid = c.classid
+        where ps.paperid = #{paperid} and ps.classid = #{classid}
     </select>
     <!--作业附件列表-->
     <select id="listPaperFile" resultType="com.xhkjedu.sstudy.model.paper.TPaperFile">
@@ -298,7 +299,7 @@
     <!--获取年级下教师发布作业列表-->
     <select id="listPaper" resultMap="paperResult">
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.timetype
-        ,pg.starttime,pg.stoptime,p.papernum,p.createid,#{paper.teacherid} checkid,p.schoolid,#{paper.schoolid} logschoolid
+        ,pg.starttime,pg.stoptime,p.papernum,p.createid,#{paper.teacherid} as checkid,p.schoolid,#{paper.schoolid} as logschoolid
         ,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
@@ -347,14 +348,14 @@
 
     <!--获取批阅班级-->
     <resultMap id="schoolMap" type="java.util.Map">
-        <result property="schoolid" column="schoolid"></result>
-        <result property="schoolname" column="schoolname"></result>
+        <result property="schoolid" column="schoolid"/>
+        <result property="schoolname" column="schoolname"/>
         <collection property="classes" ofType="java.util.Map" javaType="java.util.List">
-            <result property="classid" column="classid"></result>
-            <result property="classname" column="classname"></result>
-            <result property="gradeid" column="gradeid"></result>
-            <result property="schoolid" column="schoolid"></result>
-            <result property="checked" column="checked"></result>
+            <result property="classid" column="classid"/>
+            <result property="classname" column="classname"/>
+            <result property="gradeid" column="gradeid"/>
+            <result property="schoolid" column="schoolid"/>
+            <result property="checked" column="checked"/>
         </collection>
     </resultMap>
     <select id="listPaperClass" resultMap="schoolMap">
@@ -367,7 +368,8 @@
             and pg.checkid=#{checkid}
         </if>
         group by pg.classid
-        order by ps.pschecked,case c.schoolid when #{schoolid} then 0 else c.schoolid end,c.gradeid,c.classtype,c.classorder
+        order by ps.pschecked,if(c.schoolid = #{schoolid}, 0, c.schoolid)
+        ,c.gradeid,c.classtype,c.classorder
     </select>
     <!--根据作业id获取作业分类-->
     <select id="getPaperTypeById" resultType="java.lang.Integer">
@@ -440,17 +442,17 @@
         group by ct.teacherid order by c.classtype,c.classorder, convert(u.username using gbk)
     </select>
     <resultMap id="paperStudentList" type="java.util.Map">
-        <result property="schoolid" column="schoolid"></result>
-        <result property="schoolname" column="schoolname"></result>
+        <result property="schoolid" column="schoolid"/>
+        <result property="schoolname" column="schoolname"/>
         <collection property="classlist" ofType="java.util.Map" javaType="java.util.List">
-            <result property="classid" column="classid"></result>
-            <result property="classname" column="classname"></result>
-            <result property="gradeid" column="gradeid"></result>
-            <result property="classnum" column="classnum"></result>
+            <result property="classid" column="classid"/>
+            <result property="classname" column="classname"/>
+            <result property="gradeid" column="gradeid"/>
+            <result property="classnum" column="classnum"/>
             <collection property="students" ofType="java.util.Map" javaType="java.util.List">
-                <result property="studentid" column="studentid"></result>
-                <result property="studentname" column="studentname"></result>
-                <result property="headpic" column="headpic"></result>
+                <result property="studentid" column="studentid"/>
+                <result property="studentname" column="studentname"/>
+                <result property="headpic" column="headpic"/>
             </collection>
         </collection>
     </resultMap>
@@ -458,7 +460,7 @@
     <select id="listPaperStudentsByPaperid" resultMap="paperStudentList">
         select u.schoolid,s.schoolname, pg.classid,c.classname,c.gradeid,c.classnum,cs.studentid,u.username studentname
         from t_paper_class pg left join t_class c on pg.classid=c.classid
-        left join t_class_student cs on c.classid = cs.classid
+        left join t_paper_student cs on pg.paperid=cs.paperid and pg.classid=cs.classid
         left join t_user u on cs.studentid=u.userid
         left join t_school s on s.schoolid=u.schoolid
         where pg.paperid=#{paperid} order by s.createtime desc, c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -414,6 +414,10 @@ public class UserService extends JedisUtil {
         } else {
             if(N_Utils.isNotEmpty(result.getObj())){
                 userVo = (UserVo) result.getObj();
+            } else {
+                userVo = new UserVo();
+                userVo.setLoginname(user.getLoginname());
+                userVo.setLoginpwd(loginpwd);
             }
             userLog.setLoginstate(2);
             if(result.getMsg().contains("密码错误")){