From 70dcf4e610a0ec5fd6ca2c3daf9edf4957b30529 Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期二, 25 二月 2025 16:34:46 +0800 Subject: [PATCH] 考试制证修改 --- exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml | 7 +++++-- exam-system/src/main/java/com/gkhy/exam/institutionalaccess/model/query/ThStudyDetailQuery.java | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/model/query/ThStudyDetailQuery.java b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/model/query/ThStudyDetailQuery.java index ce50c8e..2da6511 100644 --- a/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/model/query/ThStudyDetailQuery.java +++ b/exam-system/src/main/java/com/gkhy/exam/institutionalaccess/model/query/ThStudyDetailQuery.java @@ -12,9 +12,9 @@ private String idcard; private String name; private String courseUuid; - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; //0 全部 1正常记录 2异常记录 diff --git a/exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml b/exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml index c557339..b583c95 100644 --- a/exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml +++ b/exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml @@ -32,10 +32,10 @@ and d.course_uuid = #{query.courseUuid} </if> <if test="query.startTime != null"><!-- 开始时间检索 --> - and date_format(d.create_time,'%y-%m-%d') >= date_format(#{query.startTime},'%y-%m-%d') + and date_format(d.start_time,'%y-%m-%d %H:%i:%s') >= date_format(#{query.startTime},'%y-%m-%d %H:%i:%s') </if> <if test="query.endTime != null"><!-- 结束时间检索 --> - and date_format(d.create_time,'%y-%m-%d') <= date_format(#{query.endTime},'%y-%m-%d') + and date_format(d.start_time,'%y-%m-%d %H:%i:%s') <= date_format(#{query.endTime},'%y-%m-%d %H:%i:%s') </if> <if test="query.status == 0"></if> <if test="query.status == 1"> @@ -44,6 +44,9 @@ <if test="query.status == 2"> and (d.duration-TIMESTAMPDIFF(SECOND, start_time, finish_time)) > 30 </if> + <if test="query.institutionId !=null"> + and institution_id = #{query.institutionId} + </if> ORDER BY d.id DESC -- Gitblit v1.9.2