fixbugs

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

@@ -71,4 +71,8 @@ public interface MarkerDao extends PagingAndSortingRepository<Marker, Integer>,
     @Query(value = "update eb_marker m set m.reject_count=?2 where m.id=?1", nativeQuery = true)
     public void updateRejectCountById(Integer markerId, Integer rejectCount);
 
+    @Modifying
+    @Query(value = "update Marker m set m.enable=?2 where m.userId=?1")
+    public void updateEnableByUserId(Integer userId, boolean enable);
+
 }

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

@@ -44,4 +44,6 @@ public interface MarkerService {
 
     void updateRejectCountById(Integer markerId);
 
+    void updateEnableByUserId(Integer userId, boolean enable);
+
 }

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

@@ -246,4 +246,10 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
         markerDao.updateRejectCountById(markerId, rejectCount);
 
     }
+
+    @Transactional
+    @Override
+    public void updateEnableByUserId(Integer userId, boolean enable) {
+        markerDao.updateEnableByUserId(userId, enable);
+    }
 }

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

@@ -156,7 +156,8 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                             query.getQuestionScore() + ",%");
                     Predicate predicate2 = cb.like(root.get("markerScoreList").as(String.class),
                             "%," + query.getQuestionScore());
-                    predicates.add(cb.or(predicate1, predicate2));
+                    Predicate predicate3 = cb.equal(root.get("markerScoreList"), query.getQuestionScore());
+                    predicates.add(cb.or(predicate1, predicate2, predicate3));
                 }
                 if (query.getHeaderId() != null) {
                     predicates.add(cb.equal(root.get("headerId"), query.getHeaderId()));

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

@@ -1362,7 +1362,8 @@ public class MarkServiceImpl implements MarkService {
             if (library.getStatus() == LibraryStatus.MARKED || library.getStatus() == LibraryStatus.INSPECTED) {
                 validCount++;
             }
-            double score = library.getMarkerScore() != null ? library.getMarkerScore() : 0;
+            double score = library.getMarkerScore() != null && library.getMarkerScore() != UN_SELECTIVE_SCORE ? library
+                    .getMarkerScore() : 0;
             int spent = library.getMarkerSpent() != null ? library.getMarkerSpent() : 0;
 
             sumScore += score;

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

@@ -140,14 +140,17 @@ public class LibraryController extends BaseExamController {
         model.addAttribute("groupList", groupList);
         model.addAttribute("statusList", LibraryStatus.getOptionList());
         model.addAttribute("status", status);
-        MarkerSearchQuery mQuery = new MarkerSearchQuery();
-        mQuery.setExamId(examId);
-        mQuery.setSubjectCode(query.getSubjectCode());
-        mQuery.setGroupNumber(query.getGroupNumber());
-        mQuery.setPageSize(Integer.MAX_VALUE);
-        List<Marker> markerList = markerService.findByQuery(mQuery).getResult();
-        for (Marker marker : markerList) {
-            marker.setLoginName(userService.findById(marker.getUserId()).getLoginName());
+        List<Marker> markerList = new ArrayList<Marker>();
+        if (query.getGroupNumber() != null) {
+            MarkerSearchQuery mQuery = new MarkerSearchQuery();
+            mQuery.setExamId(examId);
+            mQuery.setSubjectCode(query.getSubjectCode());
+            mQuery.setGroupNumber(query.getGroupNumber());
+            mQuery.setPageSize(Integer.MAX_VALUE);
+            markerList = markerService.findByQuery(mQuery).getResult();
+            for (Marker marker : markerList) {
+                marker.setLoginName(userService.findById(marker.getUserId()).getLoginName());
+            }
         }
         model.addAttribute("markerList", markerList);
         Exam exam = examService.findById(examId);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -184,6 +184,9 @@ public class UserController extends BaseExamController {
                     subjectUserService.updateByUserId(user.getId(),
                             getSubjectCodeSetByCollege(examId, user.getDescription()));
                 }
+                if (user.getRole() == Role.MARKER) {
+                    markerService.updateEnableByUserId(previous.getId(), previous.isEnable());
+                }
                 previous.setUpdatedTime(new Date());
                 userService.save(previous);
             } else {

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

@@ -178,7 +178,7 @@
             <%-- 			    <%@include file="/WEB-INF/views/include/picConfig.jsp" %> --%>
         </div>
         <div id="footer" class="row-fluid">
-            Copyright &copy; 2012-2014 云阅卷(高校版) - Powered By <a href="http://www.qmth.com.cn" target="_blank">启明软件</a> V1.0
+            Copyright &copy; 2021 云阅卷 - Powered By <a href="http://www.qmth.com.cn" target="_blank">启明泰和 v1.3.8</a>
         </div>
     </div>
 </div>

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

@@ -288,6 +288,9 @@
         if (subjectCode == '') {
             return;
         }
+        if (groupNumber == '') {
+            return;
+        }
         $.post('${ctx}/admin/exam/marker/query', {subjectCode: subjectCode, groupNumber: groupNumber}, function (result) {
             var parent = $('#marker-select');
             var first = '';

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

@@ -69,7 +69,7 @@
 				<td>${marker.rejectCount}</td>
 				<td>
 				<c:choose>
-		        <c:when test="${marker.finishCount!=null && marker.rejectCount!=null && marker.finishCount>0}">
+		        <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:otherwise>0%</c:otherwise>

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp

@@ -104,7 +104,7 @@
 				</div>
 			</div>
 		    <div id="footer" class="row-fluid">
-	            Copyright &copy; 2012-2014 云阅卷(高校版) - Powered By <a href="http://www.qmth.com.cn" target="_blank">启明软件</a> V1.0
+	            Copyright &copy; 2021 云阅卷 - Powered By <a href="http://www.qmth.com.cn" target="_blank">启明泰和 v1.3.8</a>
 			</div>
 		</div>
 	</div>