试评任务删除markCount字段

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/TrialLibraryDao.java

@@ -22,7 +22,8 @@ public interface TrialLibraryDao extends JpaRepository<TrialLibrary, Integer>, J
     List<TrialLibrary> findUnMarked(Integer examId, String subjectCode, Integer groupNumber, Integer markerId,
             Pageable page);
 
-    @Query("select count(l) from TrialLibrary l where l.examId=?1 and l.subjectCode=?2 and l.groupNumber=?3 and l.markCount>0")
+    @Query("select count(l) from TrialLibrary l where l.examId=?1 and l.subjectCode=?2 and l.groupNumber=?3 "
+    		 + "and exists (select l2.pk.libraryId from TrialHistory l2 where l2.pk.libraryId=l.id )")
     long countMarked(Integer examId, String subjectCode, Integer groupNumber);
 
     @Query("select l from TrialLibrary l where l.studentId=?1 order by l.groupNumber ")
@@ -36,10 +37,6 @@ public interface TrialLibraryDao extends JpaRepository<TrialLibrary, Integer>, J
     @Query("select count(*) from TrialLibrary f where f.studentId=?1 and f.groupNumber=?2")
     long countByStudentIdAndGroupNumber(Integer studentId, Integer groupNumber);
 
-    @Modifying
-    @Query("update TrialLibrary l set l.markCount=?2 where l.id=?1")
-    void updateMarkCount(Integer id, int count);
-
     @Modifying
     @Query("delete TrialLibrary m where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3")
     void deleteByExamIdAndSubjectCodeAndGroupNumber(Integer examId, String subjectCode, Integer groupNumber);
@@ -48,8 +45,4 @@ public interface TrialLibraryDao extends JpaRepository<TrialLibrary, Integer>, J
     @Query("delete TrialLibrary m where m.studentId=?1")
     void deleteByStudentId(Integer studentId);
     
-    @Modifying(clearAutomatically = true)
-    @Query("update TrialLibrary m set m.markCount=0  where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3")
-	void resetByExamIdAndSubjectCodeAndGroupNumber(Integer examId,String subjectCode, Integer number);
-
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/TrialLibrary.java

@@ -7,6 +7,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * 试评任务表
@@ -63,8 +64,8 @@ public class TrialLibrary implements Serializable {
     /**
      * 已评人数
      */
-    @Column(name = "mark_count")
-    private Integer markCount;
+    @Transient
+    private Long markCount;
 
     public Integer getId() {
         return id;
@@ -122,11 +123,11 @@ public class TrialLibrary implements Serializable {
         this.groupNumber = groupNumber;
     }
 
-    public Integer getMarkCount() {
+    public Long getMarkCount() {
         return markCount;
     }
 
-    public void setMarkCount(Integer markCount) {
+    public void setMarkCount(Long markCount) {
         this.markCount = markCount;
     }
 

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

@@ -493,8 +493,6 @@ public class MarkServiceImpl implements MarkService {
                             trialTagDao.deleteByLibraryIdAndMarkerId(history.getLibraryId(), history.getMarkerId());
                             trialTagDao.save(result.getTagList(history));
                         }
-                        trialLibraryDao.updateMarkCount(library.getId(),
-                                (int) trialHistoryDao.countByLibraryId(library.getId()));
                         updateLibraryCount(group);
                         releaseLibrary(library, marker);
                         return true;
@@ -615,7 +613,6 @@ public class MarkServiceImpl implements MarkService {
             trialHistoryDao.deleteByLibraryId(library.getId());
             trialTrackDao.deleteByLibraryId(library.getId());
             trialTagDao.deleteByLibraryId(library.getId());
-            trialLibraryDao.updateMarkCount(library.getId(), 0);
             return true;
         } else {
             return false;
@@ -860,7 +857,6 @@ public class MarkServiceImpl implements MarkService {
             library.setCampusId(campus.getId());
             library.setStudentId(student.getId());
             library.setExamNumber(student.getExamNumber());
-            library.setMarkCount(0);
             trialLibraryDao.save(library);
             updateLibraryCount(group);
         }
@@ -910,8 +906,6 @@ public class MarkServiceImpl implements MarkService {
             trialTagDao.deleteByExamAndSubjectAndGroup(group.getExamId(), group.getSubjectCode(), group.getNumber());
             trialHistoryDao.deleteByExamIdAndSubjectCodeAndGroupNumber(group.getExamId(), group.getSubjectCode(),
                     group.getNumber());
-            trialLibraryDao.resetByExamIdAndSubjectCodeAndGroupNumber(group.getExamId(), group.getSubjectCode(),
-                    group.getNumber());
         }
         releaseByGroup(group);
     }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/TrialServiceImpl.java

@@ -72,11 +72,6 @@ public class TrialServiceImpl extends BaseQueryService<TrialLibrary> implements
         return libraryDao.countByExamIdAndSubjectCodeAndGroupNumber(examId, subjectCode, groupNumber);
     }
 
-    @Override
-    public long countMarkedLibrary(Integer examId, String subjectCode, Integer groupNumber) {
-        return libraryDao.countMarked(examId, subjectCode, groupNumber);
-    }
-
     @Override
     public List<TrialHistory> findHistory(Integer examId, String subjectCode, Integer groupNumber, Integer markerId,
             int pageNumber, int pageSize) {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/TrialService.java

@@ -19,8 +19,6 @@ public interface TrialService {
 
     long countLibrary(Integer examId, String subjectCode, Integer groupNumber);
 
-    long countMarkedLibrary(Integer examId, String subjectCode, Integer groupNumber);
-
     List<TrialHistory> findHistory(Integer libraryId);
 
     TrialHistory findHistory(Integer libraryId, Integer markerId);

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/thread/MarkQualityThread.java

@@ -42,10 +42,8 @@ public class MarkQualityThread implements Runnable {
 
         if (markers != null && markService != null) {
             for (Marker marker : markers) {
-                log.info("start update quality for marker: " + marker.getId());
                 try {
                     markService.updateQuality(marker);
-                    log.info("finish update quality for marker: " + marker.getId());
                 } catch (Exception e) {
                     log.error("marker quality thread error", e);
                 }

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

@@ -85,6 +85,9 @@ public class TrialController extends BaseExamController {
             }
             query.orderById();
             query = trialService.findLibrary(query);
+            for (TrialLibrary library : query.getResult()) {
+            	library.setMarkCount(trialService.countHistory(library.getId()));
+			}
             model.addAttribute("group",
                     groupService.findOne(query.getExamId(), query.getSubjectCode(), query.getGroupNumber()));
         }

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/qualityChart.jsp

@@ -98,7 +98,7 @@ $.post('${ctx}/admin/exam/quality/getChart', {subjectCode: subjectCode,groupNumb
 		    yAxis : [
 		        {
 		            type : 'value',
-		            name :'百分比',
+		            name :'百分比'
 		        }
 		    ],
 		    series : markerArray

stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -451,7 +451,6 @@ CREATE TABLE `m_trial_library` (
   `campus_id` int(11) NOT NULL COMMENT '学习中心ID',
   `student_id` int(11) NOT NULL COMMENT '考生ID',
   `exam_number` varchar(64) NOT NULL COMMENT '准考证号',
-  `mark_count` int(11) NOT NULL COMMENT '已评人数',
   PRIMARY KEY (`id`),
   KEY `index1` (`exam_id`,`subject_code`,`group_number`),
   KEY `index2` (`student_id`,`group_number`)