打回试卷只能评卷人取到，新增评卷时间设置

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

@@ -22,13 +22,13 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
     List<MarkLibrary> findByExamIdAndSubjectCodeAndGroupNumberAndStatusIn(Integer examId, String subjectCode,
             Integer groupNumber, Set<LibraryStatus> statusSet, Pageable page);
 
-    @Query("select l1 from MarkLibrary l1 where l1.examId=?1 and l1.subjectCode=?2 and l1.groupNumber=?3 and l1.status in (?5) "
-            + "and not exists (select l2 from MarkLibrary l2 where l2.studentId=l1.studentId and l2.id!=l1.id and l2.markerId=?4)")
+    @Query("select l1 from MarkLibrary l1 where l1.examId=?1 and l1.subjectCode=?2 and l1.groupNumber=?3 and l1.status in (?5) and (l1.markerId=?4 or l1.markerId is null ) "
+            + "and not exists (select l2 from MarkLibrary l2 where l2.studentId=l1.studentId and l2.id!=l1.id and l2.markerId=?4 and l2.markerScore is not null) ")
     List<MarkLibrary> findUnMarked(Integer examId, String subjectCode, Integer groupNumber, Integer markerId,
             Set<LibraryStatus> statusSet, Pageable page);
 
-    @Query("select l1 from MarkLibrary l1 where l1.examId=?1 and l1.subjectCode=?2 and l1.groupNumber=?3 and l1.status in (?6) "
-            + "and not exists (select l2 from MarkLibrary l2 where l2.studentId=l1.studentId and l2.id!=l1.id and l2.markerId=?4) "
+    @Query("select l1 from MarkLibrary l1 where l1.examId=?1 and l1.subjectCode=?2 and l1.groupNumber=?3 and l1.status in (?6) and (l1.markerId=?4 or l1.markerId is null ) "
+            + "and not exists (select l2 from MarkLibrary l2 where l2.studentId=l1.studentId and l2.id!=l1.id and l2.markerId=?4 and l2.markerScore is not null) "
             + "and exists (select mc.id from MarkerClass mc, ExamStudent s where l1.studentId=s.id and mc.userId=?5 and s.className=mc.className)")
     List<MarkLibrary> findUnMarkedFilterClass(Integer examId, String subjectCode, Integer groupNumber,
             Integer markerId, Integer userId, Set<LibraryStatus> statusSet, Pageable page);

stmms-web/src/main/webapp/WEB-INF/application.properties

@@ -1,12 +1,12 @@
 #\u6570\u636e\u5e93\u914d\u7f6e
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/stmms_ft_20200828?useUnicode=true&characterEncoding=UTF-8
-jdbc.username=root
-jdbc.password=root
+jdbc.url=jdbc:mysql://192.168.10.223:3309/stmms_ft_new?useUnicode=true&characterEncoding=UTF-8
+jdbc.username=stmms
+jdbc.password=stmms
 jdbc.maxActive=50
 jdbc.initSize=5
 ##\u6587\u4ef6\u5b58\u50a8\u914d\u7f6e
-file.server=http://192.168.10.224:9000/
+file.server=http://192.168.10.223:9000/
 file.store=/Users/ting.yin/work/static/stmms-ft
 ##\u88c1\u5207\u56fe\u9ed8\u8ba4\u5207\u5272\u89c4\u5219
 slice.split.config=0,0.55,0.45,0.55

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

@@ -12,8 +12,15 @@
             window.localStorage.setItem("pictureConfig", pictureConfig);
             $("#inputForm").validate({
                 submitHandler: function (form) {
-                    loading('正在提交，请稍等...');
-                    form.submit();
+                	var endTime = new Date($("#endTime").val()).getTime();
+					var startTime = new Date($("#startTime").val()).getTime();
+					if(startTime>=endTime){
+						alert("评卷结束时间必须晚于开始时间");
+						return;
+					}else{
+						loading('正在提交，请稍等...');
+						form.submit();
+					}
                 },
                 errorContainer: "#messageBox",
                 errorPlacement: function (error, element) {
@@ -76,6 +83,22 @@
                    onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
         </div>
     </div>
+    <div class="control-group">
+			<label class="control-label">评卷开始日期:</label>
+			<div class="controls">
+				<input name="startTime" type="text" readonly="readonly" maxlength="30" class="Wdate " id="startTime"
+					value="<fmt:formatDate value="${exam.startTime}" pattern="yyyy-MM-dd HH:mm:ss" />"
+					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+			</div>
+	</div>
+	<div class="control-group">
+			<label class="control-label">评卷结束日期:</label>
+			<div class="controls">
+				<input name="endTime" type="text" readonly="readonly" maxlength="30" class="Wdate " id="endTime"
+					value="<fmt:formatDate value="${exam.endTime}" pattern="yyyy-MM-dd HH:mm:ss" />"
+					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+			</div>
+	</div>
     <c:if test="${exam.type!='MULTI_MEDIA'}">
         <div class="control-group">
             <label class="control-label">强制标记</label>

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

@@ -10,8 +10,15 @@
             $("#name").focus();
             $("#inputForm").validate({
                 submitHandler: function (form) {
-                    loading('正在提交，请稍等...');
-                    form.submit();
+                	var endTime = new Date($("#endTime").val()).getTime();
+					var startTime = new Date($("#startTime").val()).getTime();
+					if(startTime>=endTime){
+						alert("评卷结束时间必须晚于开始时间");
+						return;
+					}else{
+						loading('正在提交，请稍等...');
+						form.submit();
+					}
                 },
                 errorContainer: "#messageBox",
                 errorPlacement: function (error, element) {
@@ -75,6 +82,22 @@
                    onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
         </div>
     </div>
+    <div class="control-group">
+			<label class="control-label">评卷开始日期:</label>
+			<div class="controls">
+				<input name="startTime" type="text" readonly="readonly" maxlength="30" class="Wdate " id="startTime"
+					value="<fmt:formatDate value="${exam.startTime}" pattern="yyyy-MM-dd HH:mm:ss" />"
+					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+			</div>
+	</div>
+	<div class="control-group">
+			<label class="control-label">评卷结束日期:</label>
+			<div class="controls">
+				<input name="endTime" type="text" readonly="readonly" maxlength="30" class="Wdate " id="endTime"
+					value="<fmt:formatDate value="${exam.endTime}" pattern="yyyy-MM-dd HH:mm:ss" />"
+					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+			</div>
+	</div>
     <div id="forceSpecialTagDiv">
         <div class="control-group">
             <label class="control-label">强制标记</label>