fix bugs

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

@@ -56,7 +56,6 @@ public class InspectedServiceImpl extends BaseQueryService<ExamStudent> implemen
                 if (e.getInspectorId() != null) {
                     e.setInspector(userService.findById(e.getInspectorId()));
                 }
-                e.setSubjectiveScoreList(e.getSubjectiveScoreList().replace("-1", "/"));
                 resultList.add(e);
             }
         }

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

@@ -100,6 +100,7 @@ public class ImportQueryController extends BaseExamController {
                     if (importQuery.getTagIdList().contains(id)) {
                         student.setTagValue("1");
                     }
+                    student.setSubjectiveScoreList(student.getSubjectiveScoreList().replace("-1", "/"));
                     list.add(student);
                 }
             }

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

@@ -87,6 +87,9 @@ public class InspectedController extends BaseExamController {
         }
         List<ExamStudent> list = inspectedService.findByQuery(query, status, mainNumber, mainStartScore, mainEndScore,
                 questionScore, unselective);
+        for (ExamStudent e : list) {
+            e.setSubjectiveScoreList(e.getSubjectiveScoreList().replace("-1", "/"));
+        }
         Integer totalCount = inspectedService.countByQuery(query, null, mainNumber, mainStartScore, mainEndScore,
                 questionScore, unselective);
         Integer inspectCount = inspectedService.countByQuery(query, SubjectiveStatus.MARKED, mainNumber,

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

@@ -473,9 +473,6 @@ public class MarkGroupController extends BaseExamController {
                 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) {
-                    subjectService.updateTrialCount(examId, subjectCode, trialCount);
-                }
                 if (sheetView != null) {
                     groupService.updateSheetView(examId, subjectCode, number, sheetView);
                 }
@@ -581,17 +578,19 @@ public class MarkGroupController extends BaseExamController {
                             selective = true;
                         }
                     }
+                    if (trialCount != null && trialCount > 0) {
+                        subjectService.updateTrialCount(examId, subjectCode, trialCount);
+                    }
+                    ExamSubject subject = subjectService.find(examId, subjectCode);
                     group = new MarkGroup(examId, subjectCode, number, picConfigList, totalScore, doubleRate,
-                            arbitrateThreshold, scorePolicy, markMode, trialCount, sheetView, enableAllZero,
-                            thirdPolicy, selective);
+                            arbitrateThreshold, scorePolicy, markMode, subject.getTrialCount(), sheetView,
+                            enableAllZero, thirdPolicy, selective);
                     // clear and replace exam_question
                     questionService.save(list);
                     groupService.save(group);
+
                     studentService.updateSubjectiveStatusAndScoreAndInspectorId(examId, subjectCode,
                             SubjectiveStatus.UNMARK, 0, null, null, null);
-                    if (trialCount != null) {
-                        subjectService.updateTrialCount(examId, subjectCode, trialCount);
-                    }
                     redirectAttributes.addAttribute("subjectCode", subjectCode);
                     return "redirect:/admin/exam/group";
                 } else {
@@ -703,7 +702,12 @@ public class MarkGroupController extends BaseExamController {
         int examId = getSessionExamId(request);
         ExamSubject subject = subjectService.find(examId, subjectCode);
         JSONObject obj = new JSONObject();
-        if (subject != null && subject.getTrialCount() <= trialCount) {
+        if(subject == null ){
+            obj.accumulate("success", false);
+            obj.accumulate("message", "科目不能为空");
+            return obj;
+        }
+        if (subject.getTrialCount() <= trialCount) {
             subjectService.updateTrialCount(examId, subjectCode, trialCount);
             obj.accumulate("success", true);
         } else {

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

@@ -110,6 +110,12 @@ public class TrialController extends BaseExamController {
             }
             query.orderById();
             query = trialService.findLibrary(query);
+            for (TrialLibrary library : query.getResult()) {
+                if (library.getMarkerId() != null) {
+                    Marker marker = markerService.findById(library.getMarkerId());
+                    library.setMarkerLoginName(userService.findById(marker.getUserId()).getLoginName());
+                }
+            }
             for (MarkGroup group : groupList) {
                 group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
                         group.getSubjectCode(), false, group.getNumber()));

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

@@ -23,7 +23,7 @@
 <form id="searchForm" action="${ctx}/admin/exam/group" method="post" class="breadcrumb form-search">
     <div>
         <label>科目</label>
-        <select class="input-large subjectCode" name="subjectCode">
+        <select class="input-large subjectCode" name="subjectCode" id="subjectCode">
             <c:forEach items="${subjectList}" var="item">
                 <option value="${item.code}" <c:if test="${item.code==subject.code}">selected</c:if>>${item.code}-${item.name}</option>
             </c:forEach>
@@ -132,7 +132,7 @@
     <div class="task-header">
         <p class="title">设置试评数</p>
         <p class="image-close"><img src="${ctxStatic}/mark-new/images/images-close.png"/></p></div>
-    <div class="task-content"><input type="text" class="trial-count" placeholder="请输入试评数"/><i class="wrong"></i></div>
+    <div class="task-content"><input type="text" class="trial-count" placeholder="请输入试评数" value="${subject.trialCount }"/><i class="wrong"></i></div>
     <a href="#" class="btn btn-small btn-info save-btn">确定</a>
 </div>
 </form>
@@ -214,7 +214,7 @@
                 return false;
             }
         }
-        var subjectCode = $('.subjectCode').val();
+        var subjectCode = $('#subjectCode').val();
         $.post('${ctx}/admin/exam/group/updateTrialCount', {subjectCode: subjectCode, trialCount: trialCount}, function (result) {
             if (result.success == true) {
                 alert('修改成功');

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

@@ -55,6 +55,9 @@
         <th>准考证号</th>
         <th>考生编号</th>
         <th>评卷员</th>
+        <th>评卷总分</th>
+        <th>给分明细</th>
+        <th>评卷时间</th>
         <th>操作</th>
     </tr>
     </thead>
@@ -72,10 +75,34 @@
 	            </c:if>
             </td>
             <td>${result.secretNumber}</td>
-            <td>${result.markCount}</td>
+            <td>${result.markerLoginName}</td>
+             <td>
+                <c:if test="${result.markerScore!=null}">
+                	<c:if test="${result.markerScore==-1}">未选做</c:if>
+                    <c:if test="${result.markerScore!=-1}"><fmt:formatNumber pattern="###.#" value="${result.markerScore}"/></c:if>
+                </c:if>
+                <c:if test="${result.markerScore==null}">
+                    &nbsp;
+                </c:if>
+            </td>
+            <td>
+                <c:if test="${result.markerScoreList!=null}">
+                    ${result.markerScoreList}
+                </c:if>
+                <c:if test="${result.markerScoreList==null}">
+                    &nbsp;
+                </c:if>
+            </td>
+            <td>
+                <c:if test="${result.markerTime!=null}">
+                    <fmt:formatDate value="${result.markerTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                </c:if>
+                <c:if test="${result.markerTime==null}">
+                    &nbsp;
+                </c:if>
+            </td>
             <td>
-                <c:if test="${result.markCount>0}">
-                    <a href="##" class="detail-link" data-title="试评给分详情" data-id="${result.id}">详情</a>
+                <c:if test="${result.markerTime!=null}">
                     <c:if test="${group!=null && group.status==TRIAL}">
                         &nbsp;
                         <a href="##" class="reset-link" data-id="${result.id}">重置</a>

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/reset.jsp

@@ -68,7 +68,7 @@
     <div class="middle cl">
         <div class="left">
             <div class="logo"><img src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/></div>
-            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright &#169武汉启明软件 2012-2020</p></a>
+            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright &#169 2021 启明泰和 v1.3.2</p></a>
         </div>
         <div class="right">
             <div class="title">

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

@@ -76,7 +76,7 @@
     <div class="middle cl">
         <div class="left">
             <div class="logo"><img src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/></div>
-            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright &#169武汉启明软件 2012-2020</p></a>
+            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright &#169 2021 启明泰和 v1.3.2</p></a>
         </div>
         <div class="right">
             <div class="title">