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

sexam/src/main/resources/mapper/exam/ESubjectInvigilateMapper.xml

@@ -36,13 +36,19 @@
         from e_subject_invigilate ei left join e_subject es on ei.esid=es.esid
         left join e_base eb on eb.examid = es.examid
         left join e_class ec on eb.examid = ec.examid
-        where eb.deleted=1 and eb.examstate!=0 and eb.exammode=1 and eb.monitored=1 and es.pstate=#{esstate}
+        where eb.deleted=1 and eb.examstate!=0 and eb.exammode=1 and eb.monitored=1
         <if test="teacherid!=null and teacherid!=0">
             and ei.teacherid=#{teacherid}
         </if>
         <if test="examid!=null and examid!=0">
             and es.examid=#{examid}
         </if>
+        <if test="esstate==1">
+            and subdate(concat(es.sdate,' ',es.begintime),interval 5 minute)&lt;=now() and es.pstate!=2
+        </if>
+        <if test="esstate==2">
+            and es.pstate=2
+        </if>
         group by es.esid
         )es left join e_paper_student eps on es.esid = eps.esid and find_in_set(eps.classid,es.classids)
         group by es.esid

suser/src/main/java/com/xhkjedu/suser/utils/PoiUtils.java

@@ -151,7 +151,8 @@ public class PoiUtils {
                             }
                         }
                     } else if (y == 5) {//准考证号
-                        user.setExamno(getCellValue(cell));
+                        String examno = getCellValue(cell);
+                        if (N_Utils.isNotEmpty(examno)) user.setExamno(examno);
                     }
                 }
 
@@ -168,8 +169,12 @@ public class PoiUtils {
             resultMap.put("users", users);
         } catch (Exception e) {
             resultMap.put("code", 1);
-            resultMap.put("msg", e.getMessage());
-            throw new Exception(e.getMessage());
+            String msg=e.getMessage();
+            resultMap.put("msg", msg);
+            if (msg.contains("Invalid ")) {
+                msg = "格式不正确";
+            }
+            throw new Exception(msg);
         }
         return resultMap;
     }
@@ -305,8 +310,12 @@ public class PoiUtils {
             resultMap.put("users", users);
         } catch (Exception e) {
             resultMap.put("code", 1);
-            resultMap.put("msg", e.getMessage());
-            throw new Exception(e.getMessage());
+            String msg=e.getMessage();
+            resultMap.put("msg", msg);
+            if (msg.contains("Invalid ")) {
+                msg = "格式不正确";
+            }
+            throw new Exception(msg);
         }
 
         return resultMap;