Merge remote-tracking branch 'cloud-schoolapi/ywx'

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java

@@ -452,7 +452,7 @@ public class EPaperStudentService {
             //说明学生缺考更新状态
             EPaperStudent paperStudent = new EPaperStudent();
             paperStudent.setEpsid(pswvo.getEpsid());
-            paperStudent.setStupic(JSON.toJSONString(pswvo.getStupic()));
+            paperStudent.setStupic(pswvo.getStupic());
             paperStudent.setSstate(3);
             paperStudent.setBatchid(pswvo.getBatchid());
             if(N_Utils.isEmptyInteger(pswvo.getHasbad())){
@@ -490,7 +490,7 @@ public class EPaperStudentService {
             }
             EPaperStudent paperStudent = new EPaperStudent();
             paperStudent.setEpsid(pswvo.getEpsid());
-            paperStudent.setStupic(JSON.toJSONString(pswvo.getStupic()));
+            paperStudent.setStupic(pswvo.getStupic());
             paperStudent.setSstate(2);
             paperStudent.setStuscore(paperscore);
             paperStudent.setBatchid(pswvo.getBatchid());

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EScanbatchService.java

@@ -89,25 +89,30 @@ public class EScanbatchService {
         paper.put("ysznum", ysznum);
         paper.remove("scantronnum");
 
-        String alljson = paper.get("alljson").toString();
-        Map pamap = JSON.parseObject(alljson, Map.class);
-        List<Map> ranglist = (List<Map>) pamap.get("ranglist");
-        for (Map m : ranglist) {
-            String ptname = m.get("qtname").toString();
-            Integer num = Integer.parseInt(m.get("num").toString());
-            if ("客观题".equals(ptname)) {
-                paper.put("kgt", num);
-            } else {
-                paper.put("zgt", num);
+        if (N_Utils.isNotEmpty(paper.get("alljson"))) {
+            String alljson = paper.get("alljson").toString();
+            Map pamap = JSON.parseObject(alljson, Map.class);
+            List<Map> ranglist = (List<Map>) pamap.get("ranglist");
+            for (Map m : ranglist) {
+                String ptname = m.get("qtname").toString();
+                Integer num = Integer.parseInt(m.get("num").toString());
+                if ("客观题".equals(ptname)) {
+                    paper.put("kgt", num);
+                } else {
+                    paper.put("zgt", num);
+                }
             }
+        } else {
+            paper.put("kgt", 0);
+            paper.put("zgt", 0);
         }
         paper.remove("alljson");
 
         List<Map> batchlist = eScanbatchMapper.listScanBatchPapers(epid);
 
         Map rtnmap = new HashMap();
-        rtnmap.put("paper",paper);
-        rtnmap.put("scans",batchlist);
+        rtnmap.put("paper", paper);
+        rtnmap.put("scans", batchlist);
         return rtnmap;
     }
 

sexam/src/main/resources/mapper/paperstudent/EScanbatchMapper.xml

@@ -58,20 +58,19 @@
         select eps.epsid,u.username,u.examno,ec.classname,eps.batchid,eps.sstate,eps.stupic
         from e_paper_student eps left join e_class ec on eps.examid = ec.examid and eps.classid = ec.classid
         left join t_user u on eps.studentid = u.userid
-        <where>
-            <if test="classid!=null and classid!=0">
-                and eps.classid=#{classid}
-            </if>
-            <if test="sstate==1">
-                and eps.batchid is null
-            </if>
-            <if test="sstate==2">
-                and eps.batchid is not null
-            </if>
-            <if test="username!=null and username!=''">
-                and (u.username like '%${username}%' or u.examno like '%${username}%')
-            </if>
-        </where>
+        where eps.epid=#{epid}
+        <if test="classid!=null and classid!=0">
+            and eps.classid=#{classid}
+        </if>
+        <if test="sstate==1">
+            and eps.batchid is null
+        </if>
+        <if test="sstate==2">
+            and eps.batchid is not null
+        </if>
+        <if test="username!=null and username!=''">
+            and (u.username like '%${username}%' or u.examno like '%${username}%')
+        </if>
     </select>
     <!--试卷基础信息-->
     <select id="listByEpId" resultType="java.util.Map">