update

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/ExamStudent.java

@@ -71,14 +71,14 @@ public class ExamStudent implements Serializable {
      * 科目代码
      */
     @Column(name = "subject_code", length = 32, nullable = false)
-    @ExcelField(title = "课程代码", align = 2, sort = 20)
+    @ExcelField(title = "课程代码*", align = 2, sort = 20)
     private String subjectCode;
 
     /**
      * 科目名称
      */
     @Column(name = "subject_name", length = 32, nullable = false)
-    @ExcelField(title = "课程名称", align = 2, sort = 30)
+    @ExcelField(title = "课程名称*", align = 2, sort = 30)
     private String subjectName;
 
     /**
@@ -91,14 +91,14 @@ public class ExamStudent implements Serializable {
      * 准考证号
      */
     @Column(name = "exam_number", length = 64, nullable = false)
-    @ExcelField(title = "准考证号", align = 2, sort = 40)
+    @ExcelField(title = "准考证号*", align = 2, sort = 40)
     private String examNumber;
 
     /**
      * 学号
      */
     @Column(name = "student_code", length = 64, nullable = false)
-    @ExcelField(title = "学号", align = 2, sort = 50)
+    @ExcelField(title = "学号*", align = 2, sort = 50)
     private String studentCode;
 
     /**
@@ -111,7 +111,7 @@ public class ExamStudent implements Serializable {
      * 姓名
      */
     @Column(name = "name", length = 64, nullable = false)
-    @ExcelField(title = "姓名", align = 2, sort = 60)
+    @ExcelField(title = "姓名*", align = 2, sort = 60)
     private String name;
 
     /**
@@ -248,21 +248,21 @@ public class ExamStudent implements Serializable {
     /**
      * 学院
      */
-    @ExcelField(title = "学院", align = 2, sort = 130)
+    @ExcelField(title = "学院*", align = 2, sort = 130)
     @Column(name = "college", length = 64, nullable = false)
     private String college;
 
     /**
      * 班级
      */
-    @ExcelField(title = "班级", align = 2, sort = 140)
+    @ExcelField(title = "班级*", align = 2, sort = 140)
     @Column(name = "class_name", length = 64, nullable = false)
     private String className;
 
     /**
      * 任课老师
      */
-    @ExcelField(title = "任课老师", align = 2, sort = 150)
+    @ExcelField(title = "任课老师*", align = 2, sort = 150)
     @Column(name = "teacher", length = 64, nullable = false)
     private String teacher;
 

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ExamStudentDTO.java

@@ -39,21 +39,24 @@ public class ExamStudentDTO {
     private double subjectiveScore;
 
     @ExcelField(title = "总分", align = 2, sort = 110)
-    private double totalScore;
+    private String totalScore;
 
-    @ExcelField(title = "评分明细", align = 2, sort = 120)
+    @ExcelField(title = "违纪", align = 2, sort = 120)
+    private String breach;
+
+    @ExcelField(title = "评分明细", align = 2, sort = 130)
     private String subjectiveScoreList;
 
-    @ExcelField(title = "备注", align = 2, sort = 130)
+    @ExcelField(title = "备注", align = 2, sort = 140)
     private String remark;
 
-    @ExcelField(title = "班级", align = 2, sort = 140)
+    @ExcelField(title = "班级", align = 2, sort = 150)
     private String className;
 
-    @ExcelField(title = "学院", align = 2, sort = 150)
+    @ExcelField(title = "学院", align = 2, sort = 160)
     private String college;
 
-    @ExcelField(title = "任课老师", align = 2, sort = 160)
+    @ExcelField(title = "任课老师", align = 2, sort = 170)
     private String teacher;
 
     private List<ScoreItem> objectiveList;
@@ -73,7 +76,16 @@ public class ExamStudentDTO {
         setObjectiveScore(student.getObjectiveScore());
         setSubjectiveScore(student.getSubjectiveScore());
         setSubjectiveScoreList(StringUtils.trimToEmpty(student.getSubjectiveScoreList()));
-        setTotalScore(student.getTotalScore());
+        if (!student.isUpload() || student.isAbsent()) {
+            setTotalScore("-");
+        } else {
+            setTotalScore(String.valueOf(student.getTotalScore()));
+        }
+        if (student.isBreach()) {
+            setBreach("是");
+        } else {
+            setBreach("否");
+        }
         setRemark(StringUtils.trimToEmpty(student.getRemark()));
         setClassName(student.getClassName());
         setCollege(student.getCollege());
@@ -127,11 +139,11 @@ public class ExamStudentDTO {
         this.examNumber = examNumber;
     }
 
-    public double getTotalScore() {
+    public String getTotalScore() {
         return totalScore;
     }
 
-    public void setTotalScore(double totalScore) {
+    public void setTotalScore(String totalScore) {
         this.totalScore = totalScore;
     }
 
@@ -223,4 +235,12 @@ public class ExamStudentDTO {
         this.subjectiveList = subjectiveList;
     }
 
+    public String getBreach() {
+        return breach;
+    }
+
+    public void setBreach(String breach) {
+        this.breach = breach;
+    }
+
 }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ImportQueryController.java

@@ -158,9 +158,13 @@ public class ImportQueryController extends BaseExamController {
                         if (SubjectiveStatus.MARKED.equals(examStudent.getSubjectiveStatus())
                                 || SubjectiveStatus.INSPECTED.equals(examStudent.getSubjectiveStatus())) {
                             successStudent.add(examStudent.getId());
+                            successNum++;
+                        } else {
+                            failureStudent
+                                    .add(studentVO.getSubjectCode() + DB_ITEM_JOINER + studentVO.getStudentCode());
+                            failureNum++;
                         }
                     }
-                    successNum++;
                 } else {
                     failureStudent.add(studentVO.getSubjectCode() + DB_ITEM_JOINER + studentVO.getStudentCode());
                     failureNum++;

stmms-web/src/main/webapp/WEB-INF/tags/message.tag

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <%@ attribute name="content" type="java.lang.String" required="true" description="消息内容"%>
 <%@ attribute name="type" type="java.lang.String" description="消息类型：info、success、warning、error、loading"%>
-<script type="text/javascript">$.jBox.closeTip();</script>
+<script type="text/javascript">top.$.jBox.closeTip();</script>
 <c:if test="${not empty content}">
 	<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${fn:indexOf(content,'失败') eq -1?'success':'error'}"/></c:if>
 	<div id="messageBox" class="alert alert-${ctype} hide"><button data-dismiss="alert" class="close">×</button>${content}</div>