From 521869585e89abff0582d63fc3775501fee5190f Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Wed, 5 Jul 2023 20:16:01 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseStudentSigninSetting.java   | 11 +++++++++++
 ...TeacherOpenCourseStudentSigninLogService.java | 16 ++++++++++++++--
 ...acherOpenCourseStudentSigninSettingQuery.java |  4 ++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java
index ce6687b8..9cab3195 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java
@@ -99,6 +99,9 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
 
     private Date teacherOpenCourseStudentSigninSettingEndTime ;
 
+    // 学生签到时间
+    private Date teacherOpenCourseStudentSigninSettingSigninTime ;
+
 
     @DictEnum
     //开始状态
@@ -404,4 +407,12 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
     public void setTeacherOpenCourseIdText(String teacherOpenCourseIdText) {
         this.teacherOpenCourseIdText = teacherOpenCourseIdText;
     }
+
+    public Date getTeacherOpenCourseStudentSigninSettingSigninTime() {
+        return teacherOpenCourseStudentSigninSettingSigninTime;
+    }
+
+    public void setTeacherOpenCourseStudentSigninSettingSigninTime(Date teacherOpenCourseStudentSigninSettingSigninTime) {
+        this.teacherOpenCourseStudentSigninSettingSigninTime = teacherOpenCourseStudentSigninSettingSigninTime;
+    }
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
index 5073580e..bfb65e51 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
@@ -365,10 +365,14 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
         if (ObjectUtil.isNotNull(single)){
             single.setTeacherOpenCourseStudentSigninLogRemark(null);
             single.setTeacherOpenCourseStudentSigninLogTag(SIGN_IN);
-            single.setTeacherOpenCourseStudentSigninLogAddTime(new Date());
+            single.setTeacherOpenCourseStudentSigninLogAddTime(time);
             single.setTeacherOpenCourseStudentSigninLogIp(myIpAddress);
             teacherOpenCourseStudentSigninLogDao.upsertByTemplate(single);
         }else {
+            TeacherOpenCourseStudentSigninSetting studentSigninSetting = new TeacherOpenCourseStudentSigninSetting();
+            studentSigninSetting.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
+            studentSigninSetting.setTeacherOpenCourseStudentSigninSettingSigninTime(time);
+            teacherOpenCourseStudentSigninSettingDao.updateTemplateById(studentSigninSetting);
             // 学生签到记录添加
             add(signinLogQuery);
         }
@@ -410,6 +414,10 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
             signinLogQuery.setTeacherOpenCourseStudentSigninLogRemark(signinDTO.getTeacherOpenCourseStudentSigninLogRemark());
         }
         // 学生签到记录添加
+        TeacherOpenCourseStudentSigninSetting studentSigninSetting = new TeacherOpenCourseStudentSigninSetting();
+        studentSigninSetting.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
+        studentSigninSetting.setTeacherOpenCourseStudentSigninSettingSigninTime(new Date());
+        teacherOpenCourseStudentSigninSettingDao.updateTemplateById(studentSigninSetting);
         add(signinLogQuery);
     }
 
@@ -473,9 +481,13 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
         if (ObjectUtil.isNotNull(single)){
             single.setTeacherOpenCourseStudentSigninLogRemark(null);
             single.setTeacherOpenCourseStudentSigninLogTag(SIGN_IN);
-            single.setTeacherOpenCourseStudentSigninLogAddTime(new Date());
+            single.setTeacherOpenCourseStudentSigninLogAddTime(time);
             teacherOpenCourseStudentSigninLogDao.upsertByTemplate(single);
         }else {
+            TeacherOpenCourseStudentSigninSetting studentSigninSetting = new TeacherOpenCourseStudentSigninSetting();
+            studentSigninSetting.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
+            studentSigninSetting.setTeacherOpenCourseStudentSigninSettingSigninTime(time);
+            teacherOpenCourseStudentSigninSettingDao.updateTemplateById(studentSigninSetting);
             // 学生签到记录添加
             add(signinLogQuery);
         }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java
index 62c22b15..a87560be 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java
@@ -55,6 +55,9 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
     @Query(name = "签到结束日期", display = false)
     private Date teacherOpenCourseStudentSigninSettingEndTime;
 
+    @Query(name = "学生签到时间", display = false)
+    private Date teacherOpenCourseStudentSigninSettingSigninTime ;
+
     @Query(name = "创建时间", display = false)
     private Date teacherOpenCourseStudentSigninSettingAddTime;
 
@@ -105,6 +108,7 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
         pojo.setTeacherOpenCourseStudentSigninSettingAddTime(this.getTeacherOpenCourseStudentSigninSettingAddTime());
         pojo.setTeacherOpenCourseStudentSigninSettingStatus(this.getTeacherOpenCourseStudentSigninSettingStatus());
         pojo.setTeacherOpenCourseStudentSigninSettingSessionTime(this.getTeacherOpenCourseStudentSigninSettingSessionTime());
+        pojo.setTeacherOpenCourseStudentSigninSettingSigninTime(this.getTeacherOpenCourseStudentSigninSettingSigninTime());
         pojo.setOrgId(this.getOrgId());
         pojo.setUserId(this.getUserId());
         return pojo;