Merge remote-tracking branch 'origin/release_1.3.3' into dev_1.3.4

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

@@ -1048,6 +1048,8 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     @Override
     public ExamStudent randomStudent(Integer examId, String code) {
         ExamStudentSearchQuery query = new ExamStudentSearchQuery();
+        query.setExamId(examId);
+        query.setSubjectCode(code);
         query.setAbsent(false);
         query.setUpload(true);
         query.setBreach(false);

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

@@ -8,7 +8,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -574,22 +573,28 @@ public class MarkServiceImpl implements MarkService {
             if (library != null && library.getExamId().equals(group.getExamId())
                     && library.getSubjectCode().equals(group.getSubjectCode())
                     && library.getGroupNumber().equals(group.getNumber())
-                    && result.getMarkerScore() <= group.getTotalScore()
-                    && StringUtils.isNotBlank(result.getScoreList())) {
+                    && result.getMarkerScore() <= group.getTotalScore()) {
                 if ((library.getMarkerId() == null && !hasApplied(library, marker))
                         || (library.getMarkerId() != null && !library.getMarkerId().equals(marker.getId()))) {
                     return SubmitResult.faile();
                 }
                 library.setMarkerId(marker.getId());
                 library.setMarkerTime(new Date());
+                // 未选做
+                if (result.isUnselective() && group.isSelective()) {
+                    result.setMarkerScore(UN_SELECTIVE_SCORE);
+                    result.setScoreList(new Double[0]);
+                    trialTrackDao.deleteByLibraryIdAndMarkerId(library.getId(), library.getMarkerId());
+                    trialTagDao.deleteByLibraryIdAndMarkerId(library.getId(), library.getMarkerId());
+                }
                 library.setMarkerScore(result.getMarkerScore());
                 library.setMarkerScoreList(result.getScoreList());
                 library = trialLibraryDao.save(library);
-                if (result.getTrackList() != null) {
+                if (result.getTrackList() != null && !result.isUnselective()) {
                     trialTrackDao.deleteByLibraryIdAndMarkerId(library.getId(), library.getMarkerId());
                     trialTrackDao.save(result.getTrackList(library));
                 }
-                if (result.getSpecialTagList() != null) {
+                if (result.getSpecialTagList() != null && !result.isUnselective()) {
                     trialTagDao.deleteByLibraryIdAndMarkerId(library.getId(), library.getMarkerId());
                     trialTagDao.save(result.getTagList(library));
                 }

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

@@ -87,6 +87,8 @@
         <th>科目</th>
         <th>考生编号</th>
         <th>状态</th>
+        <th>客观分</th>
+        <th>主观分</th>
         <th>试卷总分</th>
         <th>得分明细</th>
         <th>复核人</th>
@@ -100,6 +102,8 @@
             <td>${result.subjectCode}-${result.subjectName}</td>
             <td>${result.secretNumber}</td>
             <td>${result.subjectiveStatus.name}</td>
+            <td>${result.objectiveScoreString}</td>
+            <td>${result.subjectiveScoreString}</td>
             <td>${result.totalScore}</td>
             <td>${result.subjectiveScoreList}</td>
             <td><c:if test="${result.inspectorId!=null }">