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

themis-backend/src/main/resources/application.properties

@@ -65,7 +65,7 @@ spring.datasource.connect-properties=druid.stat.mergeSql=true;druid.stat.slowSql
 spring.main.allow-bean-definition-overriding=false
 
 #\u65E5\u5FD7\u914D\u7F6E
-logging.level.root=info
+logging.level.root=debug
 
 # MyBatis-Plus\u914D\u7F6E
 mybatis-plus.typeAliasesPackage=com.qmth.themis.business.entity

themis-backend/src/main/resources/logback-spring.xml

@@ -32,7 +32,7 @@
         <appender-ref ref="STDOUT" />
     </logger>
 
-    <root level="INFO">
+    <root level="DEBUG">
         <appender-ref ref="DEBUG_APPENDER" />
         <appender-ref ref="STDOUT" />
     </root>

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

@@ -188,11 +188,10 @@ public class TIeReportServiceImpl implements TIeReportService {
 
         // 缺考
         List<Long> absentActivityIds = new ArrayList<>();
-        Date now = new Date();
         for (Long acid : activityIds) {
             ExamActivityCacheBean ac = examActivityService.getExamActivityCacheBean(acid);
-            Long end = ac.getStartTime() + (ac.getOpeningSeconds() * 1000);
-            if (now.getTime() > end) {// 场次开考时间结束,未开考的都是缺考
+       	 	ExamCacheBean exam=examService.getExamCacheBean(ac.getExamId());
+            if (InvigilateMonitorStatusEnum.FINISHED.equals(exam.getMonitorStatus())) {// 结束监考的，未考试的都是缺考
                 absentActivityIds.add(acid);
             }
         }
@@ -232,10 +231,9 @@ public class TIeReportServiceImpl implements TIeReportService {
         List<TEExamActivity> acs = examActivityService.findByExamIdAndOrgId(examId,orgId);
         
         List<Long> absentActivityIds = new ArrayList<>();
-        Date now = new Date();
         for (TEExamActivity ac : acs) {
-            Long end = ac.getStartTime() + (ac.getOpeningSeconds() * 1000L);
-            if (now.getTime() > end) {// 场次开考时间结束,未开考的都是缺考
+        	ExamCacheBean exam=examService.getExamCacheBean(ac.getExamId());
+            if (InvigilateMonitorStatusEnum.FINISHED.equals(exam.getMonitorStatus())) {// 结束监考的，未考试的都是缺考
                 absentActivityIds.add(ac.getId());
             }
         }

themis-exam/src/main/resources/application.properties

@@ -61,7 +61,7 @@ spring.datasource.connect-properties=druid.stat.mergeSql=true;druid.stat.slowSql
 spring.main.allow-bean-definition-overriding=false
 
 #\u65E5\u5FD7\u914D\u7F6E
-logging.level.root=info
+logging.level.root=debug
 
 # MyBatis-Plus\u914D\u7F6E
 mybatis-plus.typeAliasesPackage=com.qmth.themis.business.entity

themis-exam/src/main/resources/logback-spring.xml

@@ -32,7 +32,7 @@
         <appender-ref ref="STDOUT" />
     </logger>
 
-    <root level="INFO">
+    <root level="DEBUG">
         <appender-ref ref="DEBUG_APPENDER" />
         <appender-ref ref="STDOUT" />
     </root>

themis-task/src/main/resources/application.properties

@@ -61,7 +61,7 @@ spring.datasource.connect-properties=druid.stat.mergeSql=true;druid.stat.slowSql
 spring.main.allow-bean-definition-overriding=false
 
 #\u65E5\u5FD7\u914D\u7F6E
-logging.level.root=info
+logging.level.root=debug
 
 # MyBatis-Plus\u914D\u7F6E
 mybatis-plus.typeAliasesPackage=com.qmth.themis.business.entity

themis-task/src/main/resources/logback-spring.xml

@@ -32,7 +32,7 @@
         <appender-ref ref="STDOUT" />
     </logger>
 
-    <root level="INFO">
+    <root level="DEBUG">
         <appender-ref ref="DEBUG_APPENDER" />
         <appender-ref ref="STDOUT" />
     </root>