From 3fd8e82285c0c66ee7d7bfecb0b66d6dfe79140b Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 30 Dec 2022 15:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=97=A5=E5=BF=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseStudentSigninLogService.java    |  6 +++---
 .../TeacherOpenCourseStudentSigninLogQuery.java      | 12 +++++++-----
 .../sql/jlw/teacherOpenCourseMergeStudent.md         |  4 ++++
 .../jlw/teacherOpenCourseStudentSigninLog/index.js   |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

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 2618941f..3e313878 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
@@ -298,7 +298,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
 
         // 构建实体
         TeacherOpenCourseStudentSigninLogQuery signinLogQuery = new TeacherOpenCourseStudentSigninLogQuery();
-        signinLogQuery.setTeacherOpenCourseStudentSigninSettingSessionTime(signinSetting.getTeacherOpenCourseStudentSigninSettingSessionTime());
+        signinLogQuery.setTeacherOpenCourseStudentSigninSettingSessionTime(signinSetting.getTeacherOpenCourseStudentSigninSettingSessionTime().toString());
         signinLogQuery.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
         signinLogQuery.setTeacherOpenCourseId(signinSetting.getTeacherOpenCourseId());
         signinLogQuery.setTeacherOpenCourseStudentSigninLogType(ip_signin.name());
@@ -330,7 +330,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
 
         // 构建实体
         TeacherOpenCourseStudentSigninLogQuery signinLogQuery = new TeacherOpenCourseStudentSigninLogQuery();
-        signinLogQuery.setTeacherOpenCourseStudentSigninSettingSessionTime(signinSetting.getTeacherOpenCourseStudentSigninSettingSessionTime());
+        signinLogQuery.setTeacherOpenCourseStudentSigninSettingSessionTime(signinSetting.getTeacherOpenCourseStudentSigninSettingSessionTime().toString());
         signinLogQuery.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
         signinLogQuery.setTeacherOpenCourseId(signinSetting.getTeacherOpenCourseId());
         signinLogQuery.setTeacherOpenCourseStudentSigninLogType(manual_signin.name());
@@ -374,7 +374,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
 
         // 构建实体
         TeacherOpenCourseStudentSigninLogQuery signinLogQuery = new TeacherOpenCourseStudentSigninLogQuery();
-        signinLogQuery.setTeacherOpenCourseStudentSigninSettingSessionTime(signinSetting.getTeacherOpenCourseStudentSigninSettingSessionTime());
+        signinLogQuery.setTeacherOpenCourseStudentSigninSettingSessionTime(signinSetting.getTeacherOpenCourseStudentSigninSettingSessionTime().toString());
         signinLogQuery.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
         signinLogQuery.setTeacherOpenCourseId(signinSetting.getTeacherOpenCourseId());
         signinLogQuery.setTeacherOpenCourseStudentSigninLogType(code_signin.name());
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java
index f36f874f..1814cc72 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java
@@ -1,11 +1,13 @@
 package com.ibeetl.jlw.web.query;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.web.query.PageParam;
 import com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninLog;
 import com.ibeetl.jlw.enums.SignInTypeEnum;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -22,8 +24,8 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
     private Long teacherOpenCourseStudentSigninSettingId;
 
     // 签到场次（时间）
-
-    private Date teacherOpenCourseStudentSigninSettingSessionTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String teacherOpenCourseStudentSigninSettingSessionTime;
     @Query(name = "学生ID", display = false,type=Query.TYPE_DICT,dict="student.student_name.student_status=1")
     private Long studentId;
     @Query(name = "开课ID", display = false,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
@@ -151,7 +153,7 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
         pojo.setTeacherOpenCourseStudentSigninLogIp(this.getTeacherOpenCourseStudentSigninLogIp());
         pojo.setTeacherOpenCourseStudentSigninLogTag(this.getTeacherOpenCourseStudentSigninLogTag());
         pojo.setTeacherOpenCourseStudentSigninSettingId(this.getTeacherOpenCourseStudentSigninSettingId());
-        pojo.setTeacherOpenCourseStudentSigninSettingSessionTime(this.getTeacherOpenCourseStudentSigninSettingSessionTime());
+        pojo.setTeacherOpenCourseStudentSigninSettingSessionTime(DateUtil.parse(this.getTeacherOpenCourseStudentSigninSettingSessionTime()));
         pojo.setOrgId(this.getOrgId());
         pojo.setUserId(this.getUserId());
         return pojo;
@@ -216,11 +218,11 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
         this.teacherOpenCourseStudentSigninSettingId = teacherOpenCourseStudentSigninSettingId;
     }
 
-    public Date getTeacherOpenCourseStudentSigninSettingSessionTime() {
+    public String getTeacherOpenCourseStudentSigninSettingSessionTime() {
         return teacherOpenCourseStudentSigninSettingSessionTime;
     }
 
-    public void setTeacherOpenCourseStudentSigninSettingSessionTime(Date teacherOpenCourseStudentSigninSettingSessionTime) {
+    public void setTeacherOpenCourseStudentSigninSettingSessionTime(String teacherOpenCourseStudentSigninSettingSessionTime) {
         this.teacherOpenCourseStudentSigninSettingSessionTime = (teacherOpenCourseStudentSigninSettingSessionTime);
     }
 
diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md
index 98120b25..ec86c417 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md
@@ -7,6 +7,7 @@ queryByCondition
   t.*
   @}
   from teacher_open_course_merge_student t
+  inner join student ta on ta.student_id = t.student_id and ta.student_status = 1
   where 1=1  
   @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行  
   and #function("teacherOpenCourseMergeStudent.query")#
@@ -40,6 +41,9 @@ queryByCondition
   @if(!isEmpty(studentId)){
   and t.student_id =#studentId#
   @}
+  @if(!isEmpty(studentSnOrName)){
+  and concat(ta.student_name, ta.student_sn) like #'%'+studentSnOrName+'%'#
+  @}
   @if(!isEmpty(studentIdPlural)){
   and find_in_set(t.student_id,#studentIdPlural#)
   @}
diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js
index 27d8efad..75b4c79a 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js
@@ -148,7 +148,7 @@ layui.define([ 'form', 'laydate', 'table','laytpl'], function(exports) {
                 var param={
                     'teacherOpenCourseStudentSigninSettingId': teacherOpenCourseStudentSigninSettingId,
                     'teacherOpenCourseStudentSigninSettingSessionTime':$("select[name='teacherOpenCourseStudentSigninSettingSessionTime']").val(),
-                    'studentSn':obj.data.studentInfo.studentSn
+                    'studentId':obj.data.studentId
                 }
 
                 teacherOpenCourseStudentSigninLogTable.reload({