fix bugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamStudentDao.java

@@ -69,9 +69,9 @@ public interface ExamStudentDao extends PagingAndSortingRepository<ExamStudent,
     public void updateSubjectiveStatusAndScore(Integer id, SubjectiveStatus status, double score, String scoreList);
 
     @Modifying
-    @Query("update ExamStudent s set s.subjectiveStatus=?3, s.subjectiveScore=?4, s.subjectiveScoreList=?5 where s.examId=?1 and s.subjectCode=?2")
+    @Query("update ExamStudent s set s.subjectiveStatus=?3, s.subjectiveScore=?4, s.subjectiveScoreList=?5,s.inspectTime=?6 where s.examId=?1 and s.subjectCode=?2")
     public void updateSubjectiveStatusAndScore(Integer examId, String subjetCode, SubjectiveStatus status,
-            double score, String scoreList);
+            double score, String scoreList, Date inspectTime);
 
     @Modifying
     @Query("update ExamStudent s set s.subjectiveStatus=?3 where s.examId=?1 and s.subjectCode=?2 and not exists "

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

@@ -64,7 +64,7 @@ public interface ExamStudentService {
     void updateSubjectInfo(ExamSubject subject);
 
     void updateSubjectiveStatusAndScore(Integer examId, String subjectCode, SubjectiveStatus status, double score,
-            String scoreList);
+            String scoreList, Date inspectTime);
 
     void updateSubjectiveStatusAndScore(Integer id, SubjectiveStatus status, double score, String scoreList);
 

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

@@ -439,8 +439,8 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     @Override
     @Transactional
     public void updateSubjectiveStatusAndScore(Integer examId, String subjectCode, SubjectiveStatus status,
-            double score, String scoreList) {
-        studentDao.updateSubjectiveStatusAndScore(examId, subjectCode, status, score, scoreList);
+            double score, String scoreList, Date inspectTime) {
+        studentDao.updateSubjectiveStatusAndScore(examId, subjectCode, status, score, scoreList, inspectTime);
     }
 
     @Override

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

@@ -1199,7 +1199,7 @@ public class MarkServiceImpl implements MarkService {
         groupStudentDao.updateStatusByExamIdAndSubjectCodeAndGroupNumber(examId, subjectCode, groupNumber,
                 SubjectiveStatus.UNMARK);
         scoreDao.deleteByExamIdAndSubjectCodeAndGroupNumber(examId, subjectCode, groupNumber);
-        studentService.updateSubjectiveStatusAndScore(examId, subjectCode, SubjectiveStatus.UNMARK, 0, null);
+        studentService.updateSubjectiveStatusAndScore(examId, subjectCode, SubjectiveStatus.UNMARK, 0, null, null);
     }
 
     private void updateStudentGroupStatus(Integer studentId, Integer examId, String subjectCode, Integer groupNumber,

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -138,7 +138,7 @@ public class MarkController extends BaseController {
         Set<String> subjectSet = new HashSet<>();
         JSONArray array = new JSONArray();
         for (Marker marker : list) {
-            if (!subjectSet.contains(marker.getSubjectCode())) {
+            if (!subjectSet.contains(marker.getSubjectCode()) && marker.isEnable()) {
                 ExamSubject subject = subjectService.find(marker.getExamId(), marker.getSubjectCode());
                 if (subject != null) {
                     JSONObject item = new JSONObject();
@@ -505,7 +505,7 @@ public class MarkController extends BaseController {
         } else if (group != null && group.getStatus() == MarkStatus.TRIAL) {
             // 试评查找给分历史记录
             List<TrialHistory> historyList = new ArrayList<TrialHistory>();
-            if (secretNumber != null) {
+            if (StringUtils.isNotBlank(secretNumber)) {
                 historyList = trialService.findHistory(marker.getExamId(), marker.getSubjectCode(),
                         marker.getGroupNumber(), marker.getId(), secretNumber, pageNumber, pageSize, querySort);
             } else {

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

@@ -126,6 +126,7 @@
     <div>
         <label>科目</label>
         <select class="input-large" id="subject-select" name="subjectCode">
+        	<option value="">请选择</option>
             <c:forEach items="${subjectList}" var="subject">
                 <option value="${subject.code}"
                         <c:if test="${subject.code==query.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>

stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -684,8 +684,8 @@ CREATE TABLE `s_basic_class_group`
     `group_number`         int(11)      DEFAULT NULL COMMENT '大题号',
     `question_count`       int(11)      DEFAULT NULL COMMENT '题目数量',
     `total_score`          double       DEFAULT NULL COMMENT '总分',
-    `difficulity_level`    varchar(128) DEFAULT NULL COMMENT '难度分布',
-    `discrimination_level` varchar(128) DEFAULT NULL COMMENT '区分度分布',
+    `difficulity_level`    text			DEFAULT NULL COMMENT '难度分布',
+    `discrimination_level` text			DEFAULT NULL COMMENT '区分度分布',
     `coefficient`          double       DEFAULT NULL COMMENT '差异系数',
     `difficulty`           double       DEFAULT NULL COMMENT '难度',
     `paper_type`           varchar(8)   DEFAULT NULL COMMENT '试卷类型',
@@ -720,8 +720,8 @@ CREATE TABLE `s_basic_group`
     `discrimination`       double       DEFAULT NULL COMMENT '区分度',
     `question_count`       int(11)      DEFAULT NULL COMMENT '题目数量',
     `reality_count`        int(11)      DEFAULT NULL COMMENT '有效数量',
-    `difficulity_level`    varchar(128) DEFAULT NULL COMMENT '难度分布',
-    `discrimination_level` varchar(128) DEFAULT NULL COMMENT '区分度分布',
+    `difficulity_level`    text			DEFAULT NULL COMMENT '难度分布',
+    `discrimination_level` text			DEFAULT NULL COMMENT '区分度分布',
     `paper_type`           varchar(8)   DEFAULT NULL COMMENT '试卷类型',
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`)
@@ -786,9 +786,9 @@ CREATE TABLE `s_basic_subject`
     `total_count`          int(11)      DEFAULT NULL COMMENT '总人数',
     `score_range`          text COMMENT '分数分布',
     `options`              varchar(16)  DEFAULT NULL COMMENT '选项',
-    `difficulity_level`    varchar(128) DEFAULT NULL COMMENT '难度分布',
-    `discrimination_level` varchar(128) DEFAULT NULL COMMENT '区分度分布',
-    `range_level`          varchar(128) DEFAULT NULL COMMENT '高低分段统计',
+    `difficulity_level`    text			DEFAULT NULL COMMENT '难度分布',
+    `discrimination_level` text			DEFAULT NULL COMMENT '区分度分布',
+    `range_level`          text			DEFAULT NULL COMMENT '高低分段统计',
     `coefficient`          double       DEFAULT NULL COMMENT '差异系数',
     `difficulty`           double       DEFAULT NULL COMMENT '难度',
     `discrimination`       double       DEFAULT NULL COMMENT '区分度',
@@ -825,9 +825,9 @@ CREATE TABLE `s_basic_subject_class`
     `difficulty`           double       DEFAULT NULL COMMENT '难度',
     `score_range`          text         DEFAULT NULL COMMENT '分数分布',
     `stdev`                double       DEFAULT NULL COMMENT '方差',
-    `difficulity_level`    varchar(128) DEFAULT NULL COMMENT '难度分布',
-    `discrimination_level` varchar(128) DEFAULT NULL COMMENT '区分度分布',
-    `range_level`          varchar(128) DEFAULT NULL COMMENT '高低分分布',
+    `difficulity_level`    text			DEFAULT NULL COMMENT '难度分布',
+    `discrimination_level` text			DEFAULT NULL COMMENT '区分度分布',
+    `range_level`          text			DEFAULT NULL COMMENT '高低分分布',
     `reality_count`        int(11)      DEFAULT NULL COMMENT '有效数量',
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`)