BUG修改

themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamQueryDto.java

@@ -77,6 +77,39 @@ public class TEExamQueryDto implements Serializable {
     @ApiModelProperty(value = "预警条数")
     private Integer warnCount;
 
+    @ApiModelProperty(value = "是否允许考生发起语音通话，false：否，true：是")
+    private Boolean examStudentCallEnable = true;
+
+    @ApiModelProperty(value = "是否推送客观分，0：否，1：是")
+    private Boolean objectiveScorePush = false;
+
+    @ApiModelProperty(value = "是否推送违纪考生，0：否，1：是")
+    private Boolean examStudentBreachPush = false;
+
+    public Boolean getExamStudentCallEnable() {
+        return examStudentCallEnable;
+    }
+
+    public void setExamStudentCallEnable(Boolean examStudentCallEnable) {
+        this.examStudentCallEnable = examStudentCallEnable;
+    }
+
+    public Boolean getObjectiveScorePush() {
+        return objectiveScorePush;
+    }
+
+    public void setObjectiveScorePush(Boolean objectiveScorePush) {
+        this.objectiveScorePush = objectiveScorePush;
+    }
+
+    public Boolean getExamStudentBreachPush() {
+        return examStudentBreachPush;
+    }
+
+    public void setExamStudentBreachPush(Boolean examStudentBreachPush) {
+        this.examStudentBreachPush = examStudentBreachPush;
+    }
+
     public Integer getWarnCount() {
         return warnCount;
     }

themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java

@@ -181,7 +181,7 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                 }
             });
             if (!CollectionUtils.isEmpty(tbExamInvigilateUserList)) {
-                tbExamInvigilateUserService.saveBatch(tbExamInvigilateUserList);
+                tbExamInvigilateUserService.saveOrUpdateBatch(tbExamInvigilateUserList);
             }
             if (count.get() > 0) {
                 txtList.add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->创建了" + count + "条考场数据");

themis-business/src/main/resources/mapper/TEExamMapper.xml

@@ -46,7 +46,10 @@
         t.enableIpLimit,
         t.monitorVideoSource,
         t.monitorRecord,
-        t.monitorStatus
+        t.monitorStatus,
+        t.examStudentCallEnable,
+        t.objectiveScorePush,
+        t.examStudentBreachPush
         <if test="type != null and type != '' and type == 'monitor'">
             ,group_concat(distinct tees.room_code) as roomCode,
             group_concat(distinct tees.room_name) as roomName
@@ -80,7 +83,10 @@
         from
         t_b_user t1
         where
-        t1.id = t.update_id) as updateName
+        t1.id = t.update_id) as updateName,
+        t.exam_student_call_enable as examStudentCallEnable,
+        t.objective_score_push as objectiveScorePush,
+        t.exam_student_breach_push as examStudentBreachPush
         from t_e_exam t
         <where>1 = 1
             <if test="type != null and type != '' and type == 'monitor'">