Browse Source

BUG修复

wangliang 2 years ago
parent
commit
77007d4dd5

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/entity/TEExam.java

@@ -110,7 +110,7 @@ public class TEExam extends BaseEntity {
 
 
     @ApiModelProperty(value = "是否归档,0:不归档,1:归档")
     @ApiModelProperty(value = "是否归档,0:不归档,1:归档")
     @TableField(value = "archived")
     @TableField(value = "archived")
-    private Integer archived = 1;
+    private Integer archived = 0;
 
 
     @ApiModelProperty(value = "允许开考开放时长(分钟),相当于迟到时间")
     @ApiModelProperty(value = "允许开考开放时长(分钟),相当于迟到时间")
     @TableField(value = "opening_seconds")
     @TableField(value = "opening_seconds")

+ 0 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEOpenServiceImpl.java

@@ -14,7 +14,6 @@ import com.qmth.themis.business.cache.bean.ExamPaperCacheBean;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.response.TEExamStudentDto;
 import com.qmth.themis.business.dto.response.TEExamStudentDto;
 import com.qmth.themis.business.entity.TEExam;
 import com.qmth.themis.business.entity.TEExam;
-import com.qmth.themis.business.entity.TOeExamRecord;
 import com.qmth.themis.business.enums.InvigilateMonitorStatusEnum;
 import com.qmth.themis.business.enums.InvigilateMonitorStatusEnum;
 import com.qmth.themis.business.enums.RecordSelectStrategyEnum;
 import com.qmth.themis.business.enums.RecordSelectStrategyEnum;
 import com.qmth.themis.business.service.*;
 import com.qmth.themis.business.service.*;

+ 1 - 1
themis-business/src/main/resources/mapper/TEExamStudentLogMapper.xml

@@ -5,7 +5,7 @@
 	<select id="getExamStudentLogList" resultType="com.qmth.themis.business.bean.admin.ExamStudentLogDetailListBean">
 	<select id="getExamStudentLogList" resultType="com.qmth.themis.business.bean.admin.ExamStudentLogDetailListBean">
 		select
 		select
 			f.create_time createTime,
 			f.create_time createTime,
-			f.title type,
+            (case when JSON_VALID(f.title) = 1 then CONVERT((f.title->>'$.title') USING utf8) else f.title end) as type,
 			f.info remark
 			f.info remark
 		from
 		from
 			t_e_exam_student_log f
 			t_e_exam_student_log f

+ 3 - 1
themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

@@ -172,6 +172,7 @@ public class MqLogicServiceImpl implements MqLogicService {
                 Long objId = null;
                 Long objId = null;
                 Integer breachLogStatus = null;
                 Integer breachLogStatus = null;
                 JSONObject jsonObject = new JSONObject();
                 JSONObject jsonObject = new JSONObject();
+                String title = systemOperationEnum.getTitle();
                 if (systemOperationEnum == SystemOperationEnum.BREACH_HANDLE || systemOperationEnum == SystemOperationEnum.BREACH_REVOKE) {
                 if (systemOperationEnum == SystemOperationEnum.BREACH_HANDLE || systemOperationEnum == SystemOperationEnum.BREACH_REVOKE) {
                     if (systemOperationEnum == SystemOperationEnum.BREACH_HANDLE) {
                     if (systemOperationEnum == SystemOperationEnum.BREACH_HANDLE) {
                         remark = BreachTypeEnum.valueOf(remark).getCode();
                         remark = BreachTypeEnum.valueOf(remark).getCode();
@@ -195,12 +196,13 @@ public class MqLogicServiceImpl implements MqLogicService {
                         }
                         }
                         teExamStudentLogService.saveOrUpdateBatch(teExamStudentLogList);
                         teExamStudentLogService.saveOrUpdateBatch(teExamStudentLogList);
                     }
                     }
+                    title = jsonObject.toJSONString();
                 }
                 }
                 teExamStudentLog = new TEExamStudentLog(String.valueOf(mqDto.getBody()), info, remark,
                 teExamStudentLog = new TEExamStudentLog(String.valueOf(mqDto.getBody()), info, remark,
                         Long.parseLong(String.valueOf(mqDto.getObjId())),
                         Long.parseLong(String.valueOf(mqDto.getObjId())),
                         Long.parseLong(String.valueOf(mqDto.getProperties().get(SystemConstant.EXAM_STUDENT_ID))),
                         Long.parseLong(String.valueOf(mqDto.getProperties().get(SystemConstant.EXAM_STUDENT_ID))),
                         Long.parseLong(String.valueOf(mqDto.getProperties().get(SystemConstant.EXAM_RECORD_ID))),
                         Long.parseLong(String.valueOf(mqDto.getProperties().get(SystemConstant.EXAM_RECORD_ID))),
-                        jsonObject.toJSONString());
+                        title);
                 teExamStudentLog.setObjId(objId);
                 teExamStudentLog.setObjId(objId);
             } else {
             } else {
                 teExamStudentLog = new TEExamStudentLog(String.valueOf(mqDto.getBody()),
                 teExamStudentLog = new TEExamStudentLog(String.valueOf(mqDto.getBody()),