学生作业报告优化

sstudy/src/main/resources/mapper/paperreport/PaperStudentReportMapper.xml

@@ -25,55 +25,55 @@
     </select>
     <!--作业分析-->
     <select id="getPaperAnalyze" resultType="java.util.Map">
-        select p.paperid,p.papertype,p.papername,pa.pointjson,ifnull(ps.showanswer,0)showanswer,ps.psid
+        select p.paperid,p.papertype,p.papername,pa.pointjson,ifnull(ps.showanswer,0) as showanswer,ps.psid
         ,(select pc.showtype from t_paper_class pc where pc.paperid=ps.paperid and pc.classid=ps.classid)showtype
         from t_paper p left join t_paper_analyze pa on p.paperid = pa.paperid
         left join t_paper_student ps on p.paperid = ps.paperid
         where p.paperid=#{paperid} and ps.classid=#{classid} and ps.studentid=#{studentid}
     </select>
     <resultMap id="typeResult" type="java.util.Map">
-        <result property="ptid" column="ptid"></result>
-        <result property="ptorder" column="ptorder"></result>
-        <result property="qtypename" column="qtypename"></result>
+        <result property="ptid" column="ptid"/>
+        <result property="ptorder" column="ptorder"/>
+        <result property="qtypename" column="qtypename"/>
         <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
-            <result property="ptqid" column="ptqid"></result>
-            <result property="qn" column="qn"></result>
-            <result property="qorder" column="qorder"></result>
-            <result property="qscore" column="qscore"></result>
-            <result property="answerjson" column="answerjson"></result>
-            <result property="ctype" column="ctype"></result>
-            <result property="questionid" column="questionid"></result>
-            <result property="classavgscore" column="classavgscore"></result>
-            <result property="classscorerate" column="classscorerate"></result>
-            <result property="stuscore" column="stuscore"></result>
-            <result property="scorerate" column="scorerate"></result>
-            <result property="answertype" column="answertype"></result>
-            <result property="useranswer" column="useranswer"></result>
-            <result property="converted" column="converted"></result>
-            <result property="useranswertxt" column="useranswertxt"></result>
-            <result property="good" column="good"></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="qlevel" column="qlevel"></result>
-            <result property="optionnum" column="optionnum"></result>
-            <result property="ptqid" column="ptqid"></result>
-            <result property="checkcomm" column="checkcomm"></result>
-            <result property="answered" column="answered"></result>
+            <result property="ptqid" column="ptqid"/>
+            <result property="qn" column="qn"/>
+            <result property="qorder" column="qorder"/>
+            <result property="qscore" column="qscore"/>
+            <result property="answerjson" column="answerjson"/>
+            <result property="ctype" column="ctype"/>
+            <result property="questionid" column="questionid"/>
+            <result property="classavgscore" column="classavgscore"/>
+            <result property="classscorerate" column="classscorerate"/>
+            <result property="stuscore" column="stuscore"/>
+            <result property="scorerate" column="scorerate"/>
+            <result property="answertype" column="answertype"/>
+            <result property="useranswer" column="useranswer"/>
+            <result property="converted" column="converted"/>
+            <result property="useranswertxt" column="useranswertxt"/>
+            <result property="good" column="good"/>
+            <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="qlevel" column="qlevel"/>
+            <result property="optionnum" column="optionnum"/>
+            <result property="ptqid" column="ptqid"/>
+            <result property="checkcomm" column="checkcomm"/>
+            <result property="answered" column="answered"/>
         </collection>
     </resultMap>
     <!--题库作业试题-->
     <select id="listTkSt" resultMap="typeResult">
-        select pq.qtypename,pq.ptid,pq.ptorder,psq.qorder,sum(psq.qscore)qscore,tq.ctype,
-        (case when tq.qlevel=1 then pqq.qn else pqq.ptqorder end)qn,
-        pqq.questionpid questionid,tq.qtypename qqtypename
+        select pq.qtypename,pq.ptid,pq.ptorder,psq.qorder,sum(psq.qscore) as qscore,tq.ctype,
+        (if(tq.qlevel=1, pqq.qn, pqq.ptqorder)) as qn,
+        pqq.questionpid as questionid,tq.qtypename qqtypename
         <if test="showanswer==1">
-            ,q.classavgscore,q.classscorerate,truncate(sum(psq.stuscore)*100/sum(psq.qscore),2)scorerate
-            ,sum(psq.stuscore)stuscore,psq.good,tq.qanswer,tq.qanalyze
-            ,(case when tq.qlevel=1 then psq.checkcomm else '' end)checkcomm
+            ,q.classavgscore,q.classscorerate,truncate(sum(psq.stuscore)*100/sum(psq.qscore),2) as scorerate
+            ,sum(psq.stuscore) as stuscore,psq.good,tq.qanswer,tq.qanalyze
+            ,(if(tq.qlevel=1, psq.checkcomm, '')) as checkcomm
         </if>
         ,psq.answered,psq.answertype,psq.useranswer,psq.converted,psq.useranswertxt
         ,tq.qstem,tq.qoption,tq.hashear,tq.hearfile,tq.qlevel
@@ -87,8 +87,8 @@
     </select>
     <!--附件作业试题-->
     <select id="listFjSt" resultMap="typeResult">
-        select pq.qtypename,pq.psqtypeid ptid,pq.pstorder ptorder,ps.qn,ps.psorder qorder,ps.psscore qscore,ps.ctype,
-        ps.optionnum,ps.pscaid ptqid,ps.qtypename qqtypename
+        select pq.qtypename,pq.psqtypeid as ptid,pq.pstorder as ptorder,ps.qn,ps.psorder as qorder
+        ,ps.psscore as qscore,ps.ctype,ps.optionnum,ps.pscaid as ptqid,ps.qtypename as qqtypename
         <if test="showanswer==1">
             ,q.classavgscore,q.classscorerate,truncate(pss.stuscore*100/pss.qscore,2)scorerate
             ,pss.stuscore,pss.good,pss.checkcomm,ps.psanswer qanswer
@@ -106,7 +106,7 @@
         select q.questionid,q.questionpid,q.qscore,q.qn
         ,q.answered,q.answertype,q.useranswer,q.converted,q.useranswertxt
         <if test="showanswer==1">
-            ,q.stuscore,q.good,ifnull(q.checkcomm,'')checkcomm,tq.qanswer,tq.qanalyze
+            ,q.stuscore,q.good,ifnull(q.checkcomm,'') as checkcomm,tq.qanswer,tq.qanalyze
         </if>
         ,tq.sorder,tq.qstem,tq.qoption,tq.ctype,tq.qtypename
         from t_question tq right join t_paper_student_question q on tq.questionid=q.questionid
@@ -116,28 +116,28 @@
     </select>
     <!--优秀作答-->
     <resultMap id="answerResult" type="java.util.Map">
-        <result property="ptid" column="ptid"></result>
-        <result property="qorder" column="qorder"></result>
-        <result property="qn" column="mqn"></result>
+        <result property="ptid" column="ptid"/>
+        <result property="qorder" column="qorder"/>
+        <result property="qn" column="mqn"/>
         <collection property="students" ofType="java.util.Map" javaType="java.util.List">
-            <result property="studentid" column="studentid"></result>
-            <result property="username" column="username"></result>
-            <result property="headpic" column="headpic"></result>
-            <result property="qorder" column="qorder"></result>
-            <result property="psid" column="psid"></result>
+            <result property="studentid" column="studentid"/>
+            <result property="username" column="username"/>
+            <result property="headpic" column="headpic"/>
+            <result property="qorder" column="qorder"/>
+            <result property="psid" column="psid"/>
             <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
-                <result property="studentid" column="studentid"></result>
-                <result property="qn" column="qn"></result>
-                <result property="qorder" column="qorder"></result>
-                <result property="psqid" column="psqid"></result>
-                <result property="questionpid" column="questionpid"></result>
-                <result property="stuscore" column="stuscore"></result>
-                <result property="answertype" column="answertype"></result>
-                <result property="useranswer" column="useranswer"></result>
-                <result property="converted" column="converted"></result>
-                <result property="useranswertxt" column="useranswertxt"></result>
-                <result property="checkcomm" column="checkcomm"></result>
-                <result property="checkid" column="checkid"></result>
+                <result property="studentid" column="studentid"/>
+                <result property="qn" column="qn"/>
+                <result property="qorder" column="qorder"/>
+                <result property="psqid" column="psqid"/>
+                <result property="questionpid" column="questionpid"/>
+                <result property="stuscore" column="stuscore"/>
+                <result property="answertype" column="answertype"/>
+                <result property="useranswer" column="useranswer"/>
+                <result property="converted" column="converted"/>
+                <result property="useranswertxt" column="useranswertxt"/>
+                <result property="checkcomm" column="checkcomm"/>
+                <result property="checkid" column="checkid"/>
             </collection>
         </collection>
     </resultMap>
@@ -152,9 +152,9 @@
     </select>
     <!--作业基本信息-->
     <select id="getPaper" resultType="java.util.Map">
-        select p.papername,p.papertype,p.paperclass,p.createtime,p.hasfile,p.committype,p.timetype
+        select p.papername,p.papertype,p.paperclass,p.createtime,p.hasfile,p.hearfile,p.committype,p.timetype
         ,pg.starttime,pg.stoptime,pg.showtype,ps.papernum,ps.paperscore,ps.showanswer
-        ,(case when ps.showanswer=1 then ps.userscore else 0 end)userscore
+        ,(if(ps.showanswer=1, ps.userscore, 0)) as userscore
         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
         where p.paperid=#{paperid} and pg.classid=#{classid} and ps.studentid=#{studentid}

sstudy/src/main/resources/mapper/paperstudent/PaperStudedntScantronMapper.xml

@@ -17,7 +17,7 @@
     <select id="listPaperStudentScantronsNoAnswer" resultType="java.util.Map">
         SELECT pss.pssid,pss.paperid,pss.studentid,pss.psid,pss.qn,pss.qorder,pss.answered,pss.answertype,
         pss.useranswer,pss.converted,pss.useranswertxt,pss.qscore,pss.pscaid,pss.checkcomm,
-        psc.qtypeid,psc.qtypename,psc.ctype,psc.optionnum,0 costtime,0 stuscore,psc.psanswer
+        psc.qtypeid,psc.qtypename,psc.ctype,psc.optionnum,0 as costtime,0 as stuscore,'[]' as psanswer
         FROM t_paper_student_scantron pss
         LEFT JOIN t_paper_scantron psc ON pss.pscaid = psc.pscaid
         WHERE pss.psid=#{psid} order by pss.qorder
@@ -117,7 +117,7 @@
 
     <!--获取学生未提交试题集合-->
     <select id="listPSQByNotDo" resultType="com.xhkjedu.sstudy.model.paperstudent.TPaperStudentScantron">
-        SELECT pss.pscaid,pss.qscore,ps.qtypeid,ps.psorder qorder
+        SELECT pss.pscaid,pss.qscore,ps.qtypeid,ps.psorder as qorder
         FROM t_paper_student_scantron pss left join t_paper_scantron ps on pss.pscaid = ps.pscaid
         WHERE pss.pscaid=#{psid} AND pss.checked=0 AND pss.answered=0
     </select>
@@ -194,23 +194,23 @@
 
     <!--附件作业 按题批阅列表-->
     <resultMap id="questionResult" type="java.util.Map">
-        <result property="qscore" column="qscore"></result>
-        <result property="qorder" column="qorder"></result>
-        <result property="qn" column="qn"></result>
+        <result property="qscore" column="qscore"/>
+        <result property="qorder" column="qorder"/>
+        <result property="qn" column="qn"/>
         <collection property="students" ofType="java.util.Map" javaType="java.util.List">
-            <result property="stuscore" column="stuscore"></result>
-            <result property="answered" column="answered"></result>
-            <result property="checked" column="checked"></result>
-            <result property="checkcomm" column="checkcomm"></result>
-            <result property="psid" column="psid"></result>
-            <result property="pssid" column="pssid"></result>
-            <result property="answertype" column="answertype"></result>
-            <result property="useranswer" column="useranswer"></result>
-            <result property="converted" column="converted"></result>
-            <result property="useranswertext" column="useranswertext"></result>
-            <result property="useranswertxt" column="useranswertxt"></result>
-            <result property="good" column="good"></result>
-            <result property="studentname" column="username"></result>
+            <result property="stuscore" column="stuscore"/>
+            <result property="answered" column="answered"/>
+            <result property="checked" column="checked"/>
+            <result property="checkcomm" column="checkcomm"/>
+            <result property="psid" column="psid"/>
+            <result property="pssid" column="pssid"/>
+            <result property="answertype" column="answertype"/>
+            <result property="useranswer" column="useranswer"/>
+            <result property="converted" column="converted"/>
+            <result property="useranswertext" column="useranswertext"/>
+            <result property="useranswertxt" column="useranswertxt"/>
+            <result property="good" column="good"/>
+            <result property="studentname" column="username"/>
         </collection>
     </resultMap>
     <select id="sqcorrectList" resultMap="questionResult">
@@ -258,30 +258,29 @@
 
 
     <resultMap id="typeSQuestion" type="com.xhkjedu.sstudy.vo.paperstudent.StudentPaperTypeVo">
-        <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="qtypename" column="qtypename"/>
+        <result property="ptorder" column="ptorder"/>
+        <result property="ptscore" column="ptscore"/>
+        <result property="ptnum" column="ptnum"/>
         <collection property="scantrons" ofType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentScantronVo">
-            <result property="pssid" column="pssid"></result>
-            <result property="paperid" column="paperid"></result>
-            <result property="studentid" column="studentid"></result>
-            <result property="psid" column="psid"></result>
-            <result property="pscaid" column="pscaid"></result>
-            <result property="qn" column="qn"></result>
-            <result property="qorder" column="qorder"></result>
-            <result property="answered" column="answered"></result>
-            <result property="answertype" column="answertype"></result>
-            <result property="useranswer" column="useranswer"></result>
-            <result property="converted" column="converted"></result>
-            <result property="useranswertxt" column="useranswertxt"></result>
-            <result property="answertype" column="answertype"></result>
-            <result property="qscore" column="qscore"></result>
-            <result property="qtypeid" column="qtypeid"></result>
-            <result property="qtypename" column="qtypename"></result>
-            <result property="ctype" column="ctype"></result>
-            <result property="optionnum" column="optionnum"></result>
-            <result property="checkcomm" column="checkcomm"></result>
+            <result property="pssid" column="pssid"/>
+            <result property="paperid" column="paperid"/>
+            <result property="studentid" column="studentid"/>
+            <result property="psid" column="psid"/>
+            <result property="pscaid" column="pscaid"/>
+            <result property="qn" column="qn"/>
+            <result property="qorder" column="qorder"/>
+            <result property="answered" column="answered"/>
+            <result property="answertype" column="answertype"/>
+            <result property="useranswer" column="useranswer"/>
+            <result property="converted" column="converted"/>
+            <result property="useranswertxt" column="useranswertxt"/>
+            <result property="qscore" column="qscore"/>
+            <result property="qtypeid" column="qtypeid"/>
+            <result property="qtypename" column="qtypename"/>
+            <result property="ctype" column="ctype"/>
+            <result property="optionnum" column="optionnum"/>
+            <result property="checkcomm" column="checkcomm"/>
         </collection>
     </resultMap>
     <!--学生作答时作业试题-->