ting.yin 4 years ago
parent
commit
1b694e7865

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

@@ -312,7 +312,10 @@ public class MarkServiceImpl implements MarkService {
         groupDao.updateThirdPolicy(group.getExamId(), group.getSubjectCode(), group.getNumber(), third);
         subjectService.updateScore(group.getExamId(), group.getSubjectCode(), false,
                 sumTotalScore(group.getExamId(), group.getSubjectCode()));
+        libraryDao.deleteByExamIdAndSubjectCodeAndGroupNumber(group.getExamId(), group.getSubjectCode(),
+                group.getNumber());
         resetGroup(group);
+        groupDao.updateBuildTime(group.getExamId(), group.getSubjectCode(), group.getNumber(), null);
     }
 
     /**
@@ -543,6 +546,8 @@ public class MarkServiceImpl implements MarkService {
                     // 未评完
                     resetStudentGroup(library.getStudentId(), library.getExamId(), library.getSubjectCode(),
                             library.getGroupNumber());
+                    trackDao.deleteByLibraryId(library.getId());
+                    specialTagDao.deleteByLibraryId(library.getId());
                     return SubmitResult.success(library);
                 }
             }

+ 2 - 6
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkGroupController.java

@@ -429,12 +429,8 @@ public class MarkGroupController extends BaseExamController {
                 if (list != null && !list.isEmpty()) {
                     groupService.updatePicList(examId, subjectCode, number, list);
                 }
-                if (doubleRate != null && doubleRate >= 0 && doubleRate <= 1) {
-                    groupService.updateDoubleRate(examId, subjectCode, number, doubleRate);
-                }
-                if (arbitrateThreshold != null && arbitrateThreshold >= 0) {
-                    groupService.updateArbitrateThreshold(examId, subjectCode, number, arbitrateThreshold);
-                }
+                groupService.updateDoubleRate(examId, subjectCode, number, doubleRate);
+                groupService.updateArbitrateThreshold(examId, subjectCode, number, arbitrateThreshold);
                 groupService.updateMarkMode(examId, subjectCode, number, markMode);
                 if (trialCount != null && trialCount > 0 && group.getStatus() == MarkStatus.TRIAL) {
                     groupService.updateTrialCount(examId, subjectCode, number, trialCount);

+ 5 - 3
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/groupEditFull.jsp

@@ -28,7 +28,6 @@
             var openDouble = "${group.doubleRate}";
             if (openDouble != null && openDouble > 0) {
                 $("#openDouble").prop("checked", true);
-                $("#openDouble").attr("disabled", "disabled");
                 $(".doubleDiv").show();
             } else {
                 $("#doubleRate").attr("value", "");
@@ -220,7 +219,7 @@
     <div class="control-group">
         <label class="control-label">重要提示</label>
         <div class="controls">
-            <span class="label label-important"><h5>保存后分组关联所有评卷任务都将重置</h5></span>
+            <span class="label label-important"><h5>保存后分组关联所有评卷任务都将删除,并生成新的分组任务</h5></span>
         </div>
     </div>
     <div class="form-actions">
@@ -246,7 +245,10 @@
             alert('请选择题目');
             return false;
         }
-        $('#inputForm').submit();
+    	var r=confirm("是否确定删除原分组任务,生成新的分组任务?");
+        if (r==true){
+	        $('#inputForm').submit();
+        }
     });
 
     $('.delete-button').click(function () {

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

@@ -26,6 +26,7 @@
 			<a class="btn" href="${ctx}/admin/exam/paper">返回</a>
 		</div>
 	</form>
+	<tags:message content="${message}"/>
 	<table id="contentTable" class="table table-striped table-bordered table-condensed">
 		<thead>
 			<tr>

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

@@ -86,7 +86,7 @@
                     <a class="json-link" href="${ctx}/admin/exam/library/getJson?studentId=${result.id}&groupNumber=${result.number}" target="_blank">原图</a>
                 </c:if>
                 <c:if test="${examType!='MULTI_MEDIA'}">
-                  	<a href="${ctx}/web/admin/exam/track/library?libraryId=${result.id}" target="_blank">轨迹图</a>
+                  	<a href="${ctx}/web/admin/exam/track/library?libraryId=${result.libraryId}" target="_blank">轨迹图</a>
                 </c:if>
                 &nbsp;
                 <a href="##" data-id="${result.libraryId}" class="back-link">打回</a>

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

@@ -33,7 +33,7 @@
 				<c:forEach items="${scores}" var="score">
 					<td>
 					<c:if test="${marker.scoreCount[score]!=null}">
-					<a href="##" onclick="openTab(${marker.subjectCode},${marker.id},${score})">${marker.scoreCount[score] }</a></c:if>
+					<a href="##" onclick="openTab(${subjectCode},${marker.id},${score})">${marker.scoreCount[score] }</a></c:if>
 					<c:if test="${marker.scoreCount[score]==null }">0</c:if>
 					</td>
 				</c:forEach>
@@ -110,7 +110,7 @@ $.post('${ctx}/admin/exam/quality/getChart', {subjectCode: subjectCode,groupNumb
 });
 function openTab(subjectCode,markerId,markerScore){
     window.open('${ctx}/web/admin/exam/quality?subjectCode='+subjectCode+'&markerId='+markerId+'&markerScore='+markerScore,"_blank");    
-};
+}
 </script>	
 </body>
 </html>

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/subjectSelect.jsp

@@ -102,7 +102,7 @@
                     </div>
                     <c:if test="${message != null }">
                         <div class="point <c:if test="${message != null }"></c:if><c:if test="${message == null }">hide</c:if>">
-                            <em class="error">${message }"</em>
+                            <em class="error">${message }</em>
                         </div>
                     </c:if>
                     <div class="login-btn">