fix

install/mysql/init/stmms_ft.sql

@@ -354,8 +354,8 @@ CREATE TABLE `eb_inspect_history`
 	`exam_id`	INT (11) NOT NULL COMMENT '考试ID',
 	`subject_code` 	VARCHAR (32) NOT NULL COMMENT '科目代码',
 	`inspect_time` 	DATETIME NOT NULL COMMENT '复核时间',
-	`inspector_id` 	INT (11) DEFAULT NULL COMMENT '复核人ID',
-	`student_id` 	INT (11) DEFAULT NULL COMMENT '考生ID',
+	`inspector_id` 	INT (11) NOT NULL COMMENT '复核人ID',
+	`student_id` 	INT (11) NOT NULL COMMENT '考生ID',
 	`inspect_round` 	INT (11) NOT NULL COMMENT '复核轮数',
 	PRIMARY KEY (`id`),
 	UNIQUE KEY `index1` (`student_id`, `inspect_round`)
@@ -660,7 +660,8 @@ CREATE TABLE `m_reject_history`
 	`reason` 	varchar(128) DEFAULT NULL COMMENT '打回原因',
     `create_time`   datetime    NOT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`),
-    KEY `index1` (`exam_id`, `subject_code`, `group_number`)
+    KEY `index1` (`exam_id`, `subject_code`, `group_number`),
+    KEY `index2` (`library_id`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='打回记录表';
   

install/mysql/upgrade/1.3.15.sql

@@ -0,0 +1,7 @@
+-- 1.3.15
+
+USE `stmms_ft`;
+
+ALTER TABLE m_reject_history ADD INDEX index2(`library_id`);
+ALTER TABLE eb_inspect_history MODIFY column inspector_id INT (11) NOT NULL COMMENT '复核人ID';
+ALTER TABLE eb_inspect_history MODIFY column  student_id INT (11) NOT NULL COMMENT '考生ID';

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/MarkerDao.java

@@ -77,4 +77,8 @@ public interface MarkerDao extends PagingAndSortingRepository<Marker, Integer>,
 
     public List<Marker> findByExamIdAndSubjectCode(Integer examId, String subjectCode);
 
+    @Modifying
+    @Query(value = "update eb_marker m set m.reject_count=ifnull(m.reject_count,0)+1 where m.id=?1", nativeQuery = true)
+	public void addRejectCountById(Integer markerId);
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/MarkerServiceImpl.java

@@ -24,7 +24,6 @@ import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
 import cn.com.qmth.stmms.biz.exam.model.Marker;
 import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
 import cn.com.qmth.stmms.biz.exam.service.ExamService;
-import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
 import cn.com.qmth.stmms.biz.exam.service.MarkerService;
 import cn.com.qmth.stmms.biz.mark.dao.MarkLibraryDao;
 import cn.com.qmth.stmms.biz.user.dao.UserDao;
@@ -43,8 +42,8 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
     @Autowired
     private MarkLibraryDao libraryDao;
 
-    @Autowired
-    private MarkGroupService groupService;
+//    @Autowired
+//    private MarkGroupService groupService;
 
     @Autowired
     private UserDao userDao;
@@ -253,12 +252,13 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
 
     @Override
     public void updateRejectCountById(Integer markerId) {
-        Marker marker = markerDao.findOne(markerId);
-        int rejectCount = 1;
-        if (marker.getRejectCount() != null) {
-            rejectCount = marker.getRejectCount() + 1;
-        }
-        markerDao.updateRejectCountById(markerId, rejectCount);
+//        Marker marker = markerDao.findOne(markerId);
+//        int rejectCount = 1;
+//        if (marker.getRejectCount() != null) {
+//            rejectCount = marker.getRejectCount() + 1;
+//        }
+//        markerDao.updateRejectCountById(markerId, rejectCount);
+        markerDao.addRejectCountById(markerId);
 
     }