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

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectAccessRecordServiceImpl.java

@@ -1,25 +1,27 @@
 package com.zd.laboratory.service.impl;
 
-import com.zd.common.core.utils.StringUtils;
-import com.zd.exam.api.feign.RemoteExamService;
-import com.zd.laboratory.domain.*;
-import com.zd.laboratory.domain.vo.ElPassConfigdetailVO;
-import com.zd.laboratory.domain.vo.ViolationNewVo;
-import com.zd.laboratory.mapper.LabViolationScoreSiteMapper;
-import com.zd.laboratory.service.ILabBlacklistService;
-import com.zd.model.domain.R;
-import com.zd.model.domain.ResultData;
-import com.zd.model.domain.per.PerPrefix;
+import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.annotation.DataScope;
+import com.zd.common.core.utils.StringUtils;
+import com.zd.exam.api.feign.RemoteExamService;
+import com.zd.laboratory.domain.LabOnepc;
+import com.zd.laboratory.domain.LabSubjectAccessRecord;
+import com.zd.laboratory.domain.LabViolationScoreSite;
+import com.zd.laboratory.domain.vo.ElPassConfigdetailVO;
 import com.zd.laboratory.domain.vo.LabSubjectAccessRecordVo;
+import com.zd.laboratory.domain.vo.ViolationNewVo;
 import com.zd.laboratory.mapper.LabSubjectAccessRecordMapper;
+import com.zd.laboratory.mapper.LabViolationScoreSiteMapper;
 import com.zd.laboratory.mqtt.enums.BigViewDataType;
 import com.zd.laboratory.mqtt.service.impl.SubMessageSendManager;
+import com.zd.laboratory.service.ILabBlacklistService;
 import com.zd.laboratory.service.ILabOnepcService;
 import com.zd.laboratory.service.ILabSubjectAccessRecordService;
+import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
+import com.zd.model.domain.per.PerPrefix;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;