소스 검색

情况统计按场次结束时间统计缺考

wangliang 1 년 전
부모
커밋
c28f8c644d

+ 2 - 1
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamController.java

@@ -438,6 +438,7 @@ public class TEExamController {
     @ApiOperation(value = "监考端获取考试批次提醒接口")
     @RequestMapping(value = "/list/count", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试批次信息", response = Result.class)})
+    @RedisLimitAnnotation(key = "listCount", period = 1, count = 1)
     public Result listCount(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         return ResultUtil.ok(teExamService.examList(userId, tbUser.getOrgId()));
@@ -446,7 +447,7 @@ public class TEExamController {
     @ApiOperation(value = "考试属性统计接口")
     @RequestMapping(value = "/prop/count", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试属性信息", response = ExamPropCountDto.class)})
-    @RedisLimitAnnotation(key = "propCount", period = 1, count = 1)
+//    @RedisLimitAnnotation(key = "propCount", period = 1, count = 1)
     public Result propCount(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                             @ApiParam(value = "考试场次id") @RequestParam(required = false) Long examActivityId) {
 //        long start = System.currentTimeMillis();

+ 1 - 1
themis-admin/src/main/java/com/qmth/themis/admin/api/TIeInvigilateWarnInfoController.java

@@ -103,7 +103,7 @@ public class TIeInvigilateWarnInfoController {
     @ApiOperation(value = "预警消息接口")
     @RequestMapping(value = "/message", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "预警通知信息", response = TIeWarningNotifyDto.class)})
-    @RedisLimitAnnotation(key = "warnMessage", period = 1, count = 1)
+//    @RedisLimitAnnotation(key = "warnMessage", period = 1, count = 1)
     public Result warningMessage(@ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long examId) {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         AuthDto authDto = themisCacheService.addAccountAuthCache(tbUser.getId());

+ 5 - 1
themis-business/src/main/resources/db/log/1.2.8.log

@@ -1,2 +1,6 @@
 ALTER TABLE t_b_user ADD pwd_force TINYINT DEFAULT 0
-		COMMENT '强制修改密码,0:未修改,1:已修改' NOT NULL after remark;
+		COMMENT '强制修改密码,0:未修改,1:已修改' NOT NULL after remark;
+
+UPDATE t_b_user
+SET org_id=NULL, login_name='sysadmin', name='sysadmin', password='cW10aDIwMjIpKCo=', mobile_number=NULL, enable=1, create_time=1600932652000, update_time=1600932652000, remark='系统管理员', pwd_force=1, create_id=0, update_id=1
+WHERE id=1;

+ 2 - 2
themis-business/src/main/resources/mapper/TEExamStudentMapper.xml

@@ -102,12 +102,12 @@
         teea.code as examActivityCode,
         tee.monitor_status as monitorStatus,
         count(toer.exam_student_id) as actualExamTotal,
-        if(tee.monitor_status = 'FINISHED',count(1)- count(distinct toer.exam_student_id),0) as deficiencyExamTotal
+        if(teea.finish_time <![CDATA[ <= ]]> (unix_timestamp(current_timestamp()) * 1000),count(1)- count(distinct toer.exam_student_id),0) as deficiencyExamTotal
         from t_e_exam_student t
         left join t_e_student h on t.student_id = h.id
         left join t_e_exam_activity teea on teea.id = t.exam_activity_id
         join t_e_exam tee on tee.id = t.exam_id
-        left join t_oe_exam_record toer on toer.exam_student_id = t.id and toer.first_start_time is not null
+        left join t_oe_exam_record toer on toer.exam_student_id = t.id and toer.exam_id = tee.id and toer.exam_activity_id = teea.id and toer.first_start_time is not null
         where t.exam_id = #{examId}
         <if test="orgId != null">
             and h.org_id=#{orgId}