1
0
ting.yin 2 лет назад
Родитель
Сommit
3e2c4cba03

+ 1 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -1139,6 +1139,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         return studentDao.findMinInspectCountByExamIdAndSubjectCode(examId, subjectCode);
     }
 
+    @Transactional
     @Override
     public void updateInspectCount(Integer studentId, Integer inspectCount) {
         studentDao.updateInspectCount(studentId, inspectCount);

+ 2 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/InspectedServiceImpl.java

@@ -11,6 +11,7 @@ import javax.persistence.Query;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import cn.com.qmth.stmms.biz.common.BaseQueryService;
 import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
@@ -235,6 +236,7 @@ public class InspectedServiceImpl extends BaseQueryService<ExamStudent> implemen
         return student.getExamId() + "_" + student.getSubjectCode();
     }
 
+    @Transactional
     @Override
     public boolean inspect(Integer studentId, Integer userId) {
         ExamStudent student = studentService.findById(studentId);

+ 3 - 2
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.stmms.biz.mark.service.Impl;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -1687,7 +1688,7 @@ public class MarkServiceImpl implements MarkService {
                     for (int i = 0; i < sList.size(); i++) {
                         ScoreItem scoreItem = sList.get(i);
                         if (scoreItem.getScore() != null) {
-                            markerScoreList.add(scoreItem.getScore());
+                            markerScoreList.add(new DecimalFormat("####.###").format(scoreItem.getScore()));
                         } else {
                             markerScoreList.add("#");
                         }
@@ -1784,7 +1785,7 @@ public class MarkServiceImpl implements MarkService {
         for (int i = 0; i < sList.size(); i++) {
             ScoreItem scoreItem = sList.get(i);
             if (scoreItem.getScore() != null) {
-                markerScoreList.add(scoreItem.getScore());
+                markerScoreList.add(new DecimalFormat("####.###").format(scoreItem.getScore()));
             } else {
                 markerScoreList.add("#");
             }

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/qualityList.jsp

@@ -77,7 +77,7 @@
 		        <c:when test="${marker.finishCount!=null && marker.rejectCount!=null && marker.finishCount>0 && (marker.finishCount-marker.rejectCount)>0}">
 		        	<fmt:formatNumber type="percent" maxIntegerDigits="3" value="${(marker.finishCount-marker.rejectCount)/marker.finishCount}" />
 		        </c:when>
-		        <c:when test="${marker.rejectCount==null || marker.rejectCount==0">
+		        <c:when test="${(marker.rejectCount==null||marker.rejectCount==0) && marker.finishCount!=null}">
 		        	100%
 		        </c:when>
 		        <c:otherwise>0%</c:otherwise>

+ 1 - 0
stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -289,6 +289,7 @@ CREATE TABLE `eb_exam_student`
     `upload_time`           datetime     DEFAULT NULL COMMENT '上传时间',
     `inspect_time`          datetime     DEFAULT NULL COMMENT '复核时间',
     `inspector_id`          int(11)      DEFAULT NULL COMMENT '复核人ID',
+    `inspect_count`         int(11)      NOT NULL COMMENT '复核次数',
     `objective_score`       double       DEFAULT NULL COMMENT '客观总分',
     `objective_score_list`  text COMMENT '客观得分明细',
     `subjective_status`     varchar(16) NOT NULL COMMENT '主观题状态',