新增删除题目验证，修复前端markerTime名称问题

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/ArbitrationDTO.java

@@ -8,7 +8,7 @@ public class ArbitrationDTO {
 
     private String markerName;
 
-    private Date markTime;
+    private Date markerTime;
 
     private Double totalScore;
 
@@ -16,7 +16,7 @@ public class ArbitrationDTO {
 
     public ArbitrationDTO(MarkLibrary library, Marker marker) {
         markerName = marker.getUser().getName();
-        markTime = library.getMarkerTime();
+        markerTime = library.getMarkerTime();
         totalScore = library.getMarkerScore();
         scoreList = library.getMarkerScoreList();
     }
@@ -29,12 +29,12 @@ public class ArbitrationDTO {
         this.markerName = markerName;
     }
 
-    public Date getMarkTime() {
-        return markTime;
+    public Date getMarkerTime() {
+        return markerTime;
     }
 
-    public void setMarkTime(Date markTime) {
-        this.markTime = markTime;
+    public void setMarkerTime(Date markerTime) {
+        this.markerTime = markerTime;
     }
 
     public Double getTotalScore() {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/Task.java

@@ -88,7 +88,7 @@ public class Task implements Serializable {
     /**
      * 评卷时间
      */
-    private Date markTime;
+    private Date markerTime;
 
     /**
      * 是否自评
@@ -240,12 +240,12 @@ public class Task implements Serializable {
         this.markerScore = markerScore;
     }
 
-    public Date getMarkTime() {
-        return markTime;
+    public Date getMarkerTime() {
+        return markerTime;
     }
 
-    public void setMarkTime(Date markTime) {
-        this.markTime = markTime;
+    public void setMarkerTime(Date markerTime) {
+        this.markerTime = markerTime;
     }
 
     public boolean isSelf() {

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

@@ -1564,6 +1564,11 @@ public class MarkServiceImpl implements MarkService {
     @Transactional
     @Override
     public boolean deleteByQuestion(ExamQuestion question) {
+        SelectiveGroup selectiveGroup = selectiveGroupService.findOne(question.getExamId(), question.getSubjectCode(),
+                question.getMainNumber());
+        if (question.isSelective() && selectiveGroup != null) {
+            return false;
+        }
         if (!question.isObjective() && question.getGroupNumber() != null) {
             return false;
         } else {

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

@@ -120,7 +120,7 @@ public class TaskServiceImpl implements TaskService {
         if (StringUtils.isNotBlank(student.getObjectiveScoreList())) {
             task.setObjectiveScore(student.getObjectiveScore());
         }
-        task.setMarkTime(history.getUpdateTime());
+        task.setMarkerTime(history.getUpdateTime());
         if (history.getTotalScore() != null) {
             task.setMarkerScore(history.getTotalScore());
         }
@@ -189,7 +189,7 @@ public class TaskServiceImpl implements TaskService {
         if (StringUtils.isNotBlank(student.getObjectiveScoreList())) {
             task.setObjectiveScore(student.getObjectiveScore());
         }
-        task.setMarkTime(library.getMarkerTime());
+        task.setMarkerTime(library.getMarkerTime());
         if (library.getStatus() == LibraryStatus.REJECTED) {
             task.setRejected(true);
         }
@@ -230,7 +230,7 @@ public class TaskServiceImpl implements TaskService {
         }
         if (library.getMarkerId() != null) {
             task.setSpecialTagList(getTrialTagList(library));
-            task.setMarkTime(library.getMarkerTime());
+            task.setMarkerTime(library.getMarkerTime());
             task.setMarkerScore(library.getMarkerScore());
             task.setPrevious(true);
         }

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

@@ -499,7 +499,7 @@ public class PaperController extends BaseExamController {
         if (markService.deleteByQuestion(question)) {
             addMessage(redirectAttributes, "删除成功");
         } else {
-            addMessage(redirectAttributes, "删除失败，该题目已有分组");
+            addMessage(redirectAttributes, "删除失败，该题目已有分组或选做题存在选做题分组");
         }
         return "redirect:/admin/exam/paper/detail?subjectCode=" + subjectCode;
     }