Merge remote-tracking branch 'origin/dev' into dev

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

@@ -209,7 +209,7 @@ public class WarningServiceImpl implements WarningService {
         photoUrls.add(photoUrl);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("PHOTOS", photoUrls);
-        jsonObject.put("MIN_CREATE_TIME", (Date) map.get("createTime"));
+        jsonObject.put("MIN_CREATE_TIME", map.get("createTime"));
         TEExamStudentLog teExamStudentLog = new TEExamStudentLog(tIeInvigilateWarnInfo.getType().name(), tIeInvigilateWarnInfo.getType().getCode(), jsonObject.toJSONString(), examStudentCacheBean.getStudentId(), examStudentCacheBean.getId(), recordId);
         teExamStudentLogService.saveOrUpdate(teExamStudentLog);
     }

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

@@ -424,7 +424,7 @@ public class MqLogicServiceImpl implements MqLogicService {
         String tag = mqDto.getTag();
         if (Objects.equals(tag, MqTagEnum.EXAM_RECORD_UPDATE.name())) {//单字段更新
             Map<String, Object> param = (Map<String, Object>) mqDto.getBody();
-            Long recordId = (Long) param.get("recordId");
+            Long recordId = Long.parseLong(String.valueOf(param.get("recordId")));
             String colName = (String) param.get("colName");
             Object colValue = param.get("colValue");
             examRecordService.dataUpdate(recordId, colName, colValue);