ting.yin 4 年之前
父節點
當前提交
3a850b0704

+ 1 - 1
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/MarkLibraryDao.java

@@ -143,7 +143,7 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
     MarkLibrary findByStudentIdAndGroupNumberAndTaskNumber(Integer studentId, Integer groupNumber, Integer taskNumber);
 
     @Modifying(clearAutomatically = true)
-    @Query("update MarkLibrary l set l.status=?2, l.markerId=?3, l.markerTime=?4, "
+    @Query("update MarkLibrary l set l.status=?2, l.markerId=?3, l.markerTime=?4,l.markerScore=0 "
             + "l.markerSpent=?5 where l.id=?1 and l.status in (?6) and (l.markerId=null or l.markerId=?3)")
     int updateProblemResult(Integer id, LibraryStatus newStatus, Integer markerId, Date markerTime, Integer spent,
             LibraryStatus... previousStatus);

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

@@ -640,8 +640,8 @@ public class MarkServiceImpl implements MarkService {
             return false;
         }
         // 是否多评情况下已处理过该考生评卷任务
-        if (libraryDao.countByStudentIdAndMarkerIdAndIdNotEqual(library.getStudentId(), library.getMarkerId(),
-                library.getId()) > 0) {
+        if (libraryDao
+                .countByStudentIdAndMarkerIdAndIdNotEqual(library.getStudentId(), marker.getId(), library.getId()) > 0) {
             return false;
         }
         // 尝试提交评卷结果

+ 24 - 21
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/groupEditSimple.jsp

@@ -25,7 +25,6 @@
                     }
                 }
             });
-
             var openDouble = "${group.doubleRate}";
             if (openDouble != null && openDouble > 0) {
                 $("#openDouble").prop("checked", true);
@@ -63,8 +62,10 @@
     <tags:message content="${message}"/>
     <form:hidden path="subjectCode"/>
     <form:hidden path="number"/>
+    <form:hidden path="doubleRate"/>
     <input type="hidden" id="rest" name="reset" value="false"/>
     <input type="hidden" id="intervalScoreList" name="intervalScoreList" value=""/>
+    
     <div class="control-group">
         <label class="control-label">名称</label>
         <div class="controls">
@@ -110,26 +111,28 @@
             </div>
         </div>
     </c:forEach>
-    <!-- <div class="control-group"> -->
-    <!-- <label class="control-label">双评</label> -->
-    <!-- <div class="controls"> -->
-    <!-- <input type="checkbox" id="openDouble">开启 -->
-    <!-- </div> -->
-    <!-- </div> -->
-    <!-- <div class="doubleDiv"> -->
-    <!-- <div class="control-group"> -->
-    <!-- <label class="control-label">双评比例</label> -->
-    <!-- <div class="controls"> -->
-    <%--                 <form:input path="doubleRate" htmlEscape="false" maxlength="100" class="required" type="number" id="doubleRate"/>*比例范围为0-1 --%>
-    <!-- </div> -->
-    <!-- </div> -->
-    <!-- <div class="control-group"> -->
-    <!-- <label class="control-label">仲裁阀值</label> -->
-    <!-- <div class="controls"> -->
-    <%--                 <form:input path="arbitrateThreshold" htmlEscape="false" maxlength="100" class="required" type="number" id="arbitrateThreshold"/>*阈值为分数 --%>
-    <!-- </div> -->
-    <!-- </div> -->
-    <!-- </div> -->
+<%-- 	<div class="control-group">
+		<label class="control-label">双评</label>
+		<div class="controls"> 
+		<input type="checkbox" id="openDouble">开启
+		</div> 
+	</div> 
+	<div class="doubleDiv">
+	<div class="control-group" >
+		<label class="control-label">双评比例</label>
+		<div class="controls"> 
+			<form:input path="doubleRate" htmlEscape="false" maxlength="100" class="required" type="number" id="doubleRate"/>*比例范围为0-1
+		</div> 
+	</div> --%>
+	<c:if test="${group.doubleRate>0}">
+    <div class="control-group">
+    	<label class="control-label">仲裁阀值</label>
+    	<div class="controls"> 
+			<form:input path="arbitrateThreshold" htmlEscape="false" maxlength="100" class="required" type="number" id="arbitrateThreshold"/>*阈值为分数 
+		</div>
+	</div> 
+	</c:if>
+<!-- 	</div>  -->
     <c:if test="${exam.type!='MULTI_MEDIA'}">
    		<c:if test="${exam.sheetView}">
         <div class="control-group">