增加场次时间字段

doc/sql/mysql/tianze-pro.sql

@@ -29198,6 +29198,7 @@ create table teacher_open_course_student_signin_log
 (
    teacher_open_course_student_signin_log_id bigint not null comment 'ID',
    teacher_open_course_student_signin_setting_id bigint comment '签到配置ID',
+   teacher_open_course_student_signin_setting_session_time datetime comment '场次时间',
    student_id           bigint comment '学生ID',
    teacher_open_course_id bigint comment '开课ID',
    school_class_id      bigint comment '班级ID',
@@ -29218,7 +29219,6 @@ COLLATE = utf8_general_ci;
 alter table teacher_open_course_student_signin_log comment '教师-我的课程-开课-学生签到记录';
 
 
-
 drop table if exists teacher_open_course_student_signin_setting;
 
 /*==============================================================*/
@@ -29227,6 +29227,7 @@ drop table if exists teacher_open_course_student_signin_setting;
 create table teacher_open_course_student_signin_setting
 (
    teacher_open_course_student_signin_setting_id bigint not null comment 'ID',
+   teacher_open_course_student_signin_setting_session_time datetime comment '场次时间',
    teacher_open_course_id bigint comment '开课ID',
    school_class_ids     varchar(2000) comment '班级ID集合',
    teacher_open_course_student_signin_setting_type varchar(50) comment '签到方式 (数据字典 student_signin_type)',
@@ -29234,6 +29235,8 @@ create table teacher_open_course_student_signin_setting
    teacher_open_course_student_signin_setting_add_time datetime comment '创建时间',
    teacher_open_course_student_signin_setting_status int comment '状态 1正常 2删除',
    teacher_open_course_student_signin_setting_start_status char(10) comment '开启状态 （枚举 StartStatusEnum）',
+   teacher_open_course_student_signin_setting_start_time datetime comment '开始时间',
+   teacher_open_course_student_signin_setting_end_time datetime comment '结束时间',
    org_id               bigint comment '组织ID',
    user_id              bigint comment '用户ID',
    primary key (teacher_open_course_student_signin_setting_id)
@@ -29246,6 +29249,7 @@ COLLATE = utf8_general_ci;
 alter table teacher_open_course_student_signin_setting comment '教师-我的课程-开课-学生签到-配置';
 
 
+
 -- ----------------------------
 -- Records of teacher_open_course_student_signin_setting
 -- ----------------------------

web/src/main/java/cn/jlw/validator/TeacherOpenCourseStudentSigninSettingQueryValidator.java

@@ -1,31 +0,0 @@
-package cn.jlw.validator;
-
-import cn.hutool.core.util.StrUtil;
-import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninSettingQuery;
-import org.springframework.stereotype.Component;
-
-import static cn.jlw.util.IpUtils.verifyIpRange;
-import static com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO.TeacherOpenCourseStudentSigninLogTypeEnum.ip_signin;
-
-/**
- * 签到配置Query验证类
- *
- * @author mlx
- **/
-@Component
-public class TeacherOpenCourseStudentSigninSettingQueryValidator {
-
-    /**
-     * 复杂验证
-     * @param query
-     */
-    public void validator(TeacherOpenCourseStudentSigninSettingQuery query) {
-
-        // 如果是ip签到类型，验证IP区间字符
-        if (StrUtil.isNotBlank(query.getTeacherOpenCourseStudentSigninSettingValue())
-                && query.getTeacherOpenCourseStudentSigninSettingType().equals(ip_signin.name())) {
-            verifyIpRange(query.getTeacherOpenCourseStudentSigninSettingValue());
-        }
-    }
-
-}

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLog.java

@@ -26,6 +26,10 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
 
     private Long teacherOpenCourseStudentSigninSettingId ;
 
+    // 签到场次（时间）
+
+    private Date teacherOpenCourseStudentSigninSettingSessionTime;
+
     //学生ID
     @Dict(type="student.student_name.student_status=1")
 
@@ -219,4 +223,11 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
         this.teacherOpenCourseStudentSigninSettingId = teacherOpenCourseStudentSigninSettingId;
     }
 
+    public Date getTeacherOpenCourseStudentSigninSettingSessionTime() {
+        return teacherOpenCourseStudentSigninSettingSessionTime;
+    }
+
+    public void setTeacherOpenCourseStudentSigninSettingSessionTime(Date teacherOpenCourseStudentSigninSettingSessionTime) {
+        this.teacherOpenCourseStudentSigninSettingSessionTime = teacherOpenCourseStudentSigninSettingSessionTime;
+    }
 }

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java

@@ -25,6 +25,10 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
     @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninSetting")
 
     private Long teacherOpenCourseStudentSigninSettingId ;
+
+    // 签到场次（时间）
+
+    private Date teacherOpenCourseStudentSigninSettingSessionTime;
 	
     //开课ID
     @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
@@ -252,4 +256,12 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
     public void setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum teacherOpenCourseStudentSigninSettingStartStatus) {
         this.teacherOpenCourseStudentSigninSettingStartStatus = teacherOpenCourseStudentSigninSettingStartStatus;
     }
+
+    public Date getTeacherOpenCourseStudentSigninSettingSessionTime() {
+        return teacherOpenCourseStudentSigninSettingSessionTime;
+    }
+
+    public void setTeacherOpenCourseStudentSigninSettingSessionTime(Date teacherOpenCourseStudentSigninSettingSessionTime) {
+        this.teacherOpenCourseStudentSigninSettingSessionTime = teacherOpenCourseStudentSigninSettingSessionTime;
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java

@@ -6,7 +6,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.validation.BeanValidationResult;
 import cn.hutool.extra.validation.ValidationUtil;
 import cn.jlw.util.ToolUtils;
-import cn.jlw.validator.TeacherOpenCourseStudentSigninLogSigninDTOValidator;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ibeetl.admin.core.entity.CoreUser;
@@ -23,6 +22,7 @@ import com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninLog;
 import com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninSetting;
 import com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO;
 import com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO.ManualClass;
+import com.ibeetl.jlw.validator.TeacherOpenCourseStudentSigninLogSigninDTOValidator;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;
@@ -198,10 +198,11 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
         // 通过签到配置ID查询对应的参数信息。用于下面的验证。
         TeacherOpenCourseStudentSigninSetting signinSetting = signinSettingList.get(0);
 
-        // 断言验证，学生某个课程只能签到一次
+        // 断言验证，学生某个课程只能签到一次。三种签到类型，都可以签到
         TeacherOpenCourseStudentSigninLog entity = new TeacherOpenCourseStudentSigninLog();
         entity.setStudentId(signinDTO.getStudentId());
-        entity.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
+        entity.setTeacherOpenCourseId(signinSetting.getTeacherOpenCourseId());
+        entity.setTeacherOpenCourseId(signinSetting.getTeacherOpenCourseId());
         Assert.isTrue(ObjectUtil.isEmpty(teacherOpenCourseStudentSigninLogDao.template(entity)), "该学生已经签到过了！");
 
         TeacherOpenCourseMergeStudent paras = new TeacherOpenCourseMergeStudent();
@@ -278,6 +279,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
 
         // 构建实体
         TeacherOpenCourseStudentSigninLogQuery signinLogQuery = new TeacherOpenCourseStudentSigninLogQuery();
+        signinLogQuery.setTeacherOpenCourseStudentSigninSettingSessionTime(signinSetting.getTeacherOpenCourseStudentSigninSettingSessionTime());
         signinLogQuery.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
         signinLogQuery.setTeacherOpenCourseId(signinSetting.getTeacherOpenCourseId());
         signinLogQuery.setTeacherOpenCourseStudentSigninLogType(ip_signin.name());
@@ -309,6 +311,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
 
         // 构建实体
         TeacherOpenCourseStudentSigninLogQuery signinLogQuery = new TeacherOpenCourseStudentSigninLogQuery();
+        signinLogQuery.setTeacherOpenCourseStudentSigninSettingSessionTime(signinSetting.getTeacherOpenCourseStudentSigninSettingSessionTime());
         signinLogQuery.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
         signinLogQuery.setTeacherOpenCourseId(signinSetting.getTeacherOpenCourseId());
         signinLogQuery.setTeacherOpenCourseStudentSigninLogType(manual_signin.name());
@@ -353,6 +356,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
 
         // 构建实体
         TeacherOpenCourseStudentSigninLogQuery signinLogQuery = new TeacherOpenCourseStudentSigninLogQuery();
+        signinLogQuery.setTeacherOpenCourseStudentSigninSettingSessionTime(signinSetting.getTeacherOpenCourseStudentSigninSettingSessionTime());
         signinLogQuery.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
         signinLogQuery.setTeacherOpenCourseId(signinSetting.getTeacherOpenCourseId());
         signinLogQuery.setTeacherOpenCourseStudentSigninLogType(code_signin.name());

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java

@@ -1,7 +1,6 @@
 package com.ibeetl.jlw.service;
 
 import cn.jlw.util.ToolUtils;
-import cn.jlw.validator.TeacherOpenCourseStudentSigninSettingQueryValidator;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ibeetl.admin.core.service.CoreBaseService;
@@ -11,6 +10,7 @@ import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.TeacherOpenCourseStudentSigninSettingDao;
 import com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninSetting;
 import com.ibeetl.jlw.enums.StartStatusEnum;
+import com.ibeetl.jlw.validator.TeacherOpenCourseStudentSigninSettingQueryValidator;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninSettingQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;

web/src/main/java/com/ibeetl/jlw/validator/TeacherOpenCourseStudentSigninLogSigninDTOValidator.java

@@ -1,4 +1,4 @@
-package cn.jlw.validator;
+package com.ibeetl.jlw.validator;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.extra.validation.BeanValidationResult;

web/src/main/java/com/ibeetl/jlw/validator/TeacherOpenCourseStudentSigninSettingQueryValidator.java

@@ -0,0 +1,47 @@
+package com.ibeetl.jlw.validator;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninSettingQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import static cn.jlw.util.IpUtils.verifyIpRange;
+import static com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO.TeacherOpenCourseStudentSigninLogTypeEnum.*;
+
+/**
+ * 签到配置Query验证类
+ *
+ * @author mlx
+ **/
+@Component
+public class TeacherOpenCourseStudentSigninSettingQueryValidator {
+
+    /**
+     * 复杂验证
+     * @param query
+     */
+    public void validator(TeacherOpenCourseStudentSigninSettingQuery query) {
+
+        final String signinSettingType = query.getTeacherOpenCourseStudentSigninSettingType();
+
+        // 如果是ip签到类型，验证IP区间字符
+        if (StrUtil.isNotBlank(query.getTeacherOpenCourseStudentSigninSettingValue())
+                && signinSettingType.equals(ip_signin.name())) {
+            verifyIpRange(query.getTeacherOpenCourseStudentSigninSettingValue());
+        }
+
+        String signinSettingValue = query.getTeacherOpenCourseStudentSigninSettingValue();
+        if(StringUtils.isBlank(signinSettingValue)) {
+            return;
+        }
+
+         if(signinSettingType.equals(manual_signin.name())) {
+            Assert.isTrue(StringUtils.isBlank(signinSettingType), "手动签到，配置参数值必须为空！");
+        }
+        else if(signinSettingType.equals(code_signin.name())) {
+            Assert.isTrue(signinSettingType.length() == 6, "验证码签到，配置参数值长度必须是6位！");
+        }
+    }
+
+}

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java

@@ -20,6 +20,10 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
 
     // 签到配置ID
     private Long teacherOpenCourseStudentSigninSettingId;
+
+    // 签到场次（时间）
+
+    private Date teacherOpenCourseStudentSigninSettingSessionTime;
     @Query(name = "学生ID", display = true,type=Query.TYPE_DICT,dict="student.student_name.student_status=1")
     private Long studentId;
     @Query(name = "开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
@@ -202,4 +206,12 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
     public void setTeacherOpenCourseStudentSigninSettingId(Long teacherOpenCourseStudentSigninSettingId) {
         this.teacherOpenCourseStudentSigninSettingId = teacherOpenCourseStudentSigninSettingId;
     }
+
+    public Date getTeacherOpenCourseStudentSigninSettingSessionTime() {
+        return teacherOpenCourseStudentSigninSettingSessionTime;
+    }
+
+    public void setTeacherOpenCourseStudentSigninSettingSessionTime(Date teacherOpenCourseStudentSigninSettingSessionTime) {
+        this.teacherOpenCourseStudentSigninSettingSessionTime = teacherOpenCourseStudentSigninSettingSessionTime;
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java

@@ -1,22 +1,17 @@
 package com.ibeetl.jlw.web.query;
 
-import cn.hutool.core.lang.Assert;
 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.TeacherOpenCourseStudentSigninSetting;
 import com.ibeetl.jlw.enums.StartStatusEnum;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.util.Date;
 
-import static cn.hutool.core.net.Ipv4Util.IP_SPLIT_MARK;
-import static com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO.TeacherOpenCourseStudentSigninLogTypeEnum.*;
-
 /**
  *学生签到设置查询
  */
@@ -28,6 +23,11 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
     @Query(name = "ID", display = false)
     private Long teacherOpenCourseStudentSigninSettingId;
 
+    // 签到场次（时间）
+    @NotNull(message = "签到场次（时间）不能为空", groups =ValidateConfig.ADD.class)
+    @Query(name = "签到场次", display = false)
+    private Date teacherOpenCourseStudentSigninSettingSessionTime;
+
     @NotNull(message = "开课ID不能为空", groups =ValidateConfig.ADD.class)
     @Query(name = "开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
     private Long teacherOpenCourseId;
@@ -95,40 +95,4 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
         pojo.setUserId(this.getUserId());
         return pojo;
     }
-
-    /**
-     * 尝试 用断言去验证属性是否符合系统的要求
-     */
-    public void tryToValidTeacherOpenCourseStudentSigninSettingValue() {
-        String signinSettingValue = this.getTeacherOpenCourseStudentSigninSettingValue();
-        if(StringUtils.isBlank(signinSettingValue)) {
-            return;
-        }
-
-        final String signinSettingType = this.getTeacherOpenCourseStudentSigninSettingType();
-        if(signinSettingType.equals(ip_signin.name())) {
-            try {
-                for (String range : signinSettingValue.split(",")) {
-                    Assert.isTrue(range.split(IP_SPLIT_MARK).length == 2, "IP段必须要有开始IP和结束IP！");
-                }
-            }catch (Exception e) {
-                Assert.isTrue(StringUtils.isEmpty(e.getMessage()), e.getMessage());
-            }
-        } else if(signinSettingType.equals(manual_signin.name())) {
-            Assert.isTrue(StringUtils.isBlank(signinSettingType), "手动签到，配置参数值必须为空！");
-        }
-        else if(signinSettingType.equals(code_signin.name())) {
-            Assert.isTrue(signinSettingType.length() == 6, "验证码签到，配置参数值长度必须是6位！");
-        }
-    }
-
-    public void setTeacherOpenCourseStudentSigninSettingType(String teacherOpenCourseStudentSigninSettingType) {
-        this.teacherOpenCourseStudentSigninSettingType = teacherOpenCourseStudentSigninSettingType;
-        tryToValidTeacherOpenCourseStudentSigninSettingValue();
-    }
-
-    public void setTeacherOpenCourseStudentSigninSettingValue(String teacherOpenCourseStudentSigninSettingValue) {
-        this.teacherOpenCourseStudentSigninSettingValue = teacherOpenCourseStudentSigninSettingValue;
-        tryToValidTeacherOpenCourseStudentSigninSettingValue();
-    }
 }

web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md

@@ -13,6 +13,9 @@ queryByCondition
   @if(!isEmpty(teacherOpenCourseStudentSigninLogId)){
   and t.teacher_open_course_student_signin_log_id =#teacherOpenCourseStudentSigninLogId#
   @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  @}
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
   and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
   @}
@@ -76,6 +79,9 @@ queryByConditionQuery
   @if(!isEmpty(teacherOpenCourseStudentSigninLogId)){
   and t.teacher_open_course_student_signin_log_id =#teacherOpenCourseStudentSigninLogId#
   @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  @}
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
   and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
   @}
@@ -164,6 +170,13 @@ updateGivenByIds
   teacher_open_course_id = #teacherOpenCourseId# ,
   @}
   @}
+  @if(contain("teacherOpenCourseStudentSigninSettingSessionTime",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  teacher_open_course_student_signin_setting_session_time = null ,
+  @}else{
+  teacher_open_course_student_signin_setting_session_time = #teacherOpenCourseStudentSigninSettingSessionTime# ,
+  @}
+  @}
   @if(contain("schoolClassId",_given)){
   @if(isEmpty(schoolClassId)){
   school_class_id = null ,
@@ -243,6 +256,9 @@ getTeacherOpenCourseStudentSigninLogValues
   @if(!isEmpty(teacherOpenCourseStudentSigninLogId)){
   and t.teacher_open_course_student_signin_log_id =#teacherOpenCourseStudentSigninLogId#
   @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  @}
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
   and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
   @}
@@ -289,6 +305,9 @@ getValuesByQuery
   @if(!isEmpty(teacherOpenCourseStudentSigninLogId)){
   and t.teacher_open_course_student_signin_log_id =#teacherOpenCourseStudentSigninLogId#
   @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  @}
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
   and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
   @}
@@ -350,6 +369,9 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(teacherOpenCourseStudentSigninLogId)){
   and t.teacher_open_course_student_signin_log_id =#teacherOpenCourseStudentSigninLogId#
   @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  @}
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
   and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
   @}

web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md

@@ -13,6 +13,9 @@ queryByCondition
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
   and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
   @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  @}
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingIdPlural)){
   and find_in_set(t.teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#)
   @}
@@ -79,6 +82,9 @@ queryByConditionQuery
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
   and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
   @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  @}
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingIdPlural)){
   and find_in_set(t.teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#)
   @}
@@ -171,6 +177,13 @@ updateGivenByIds
   teacher_open_course_id = #teacherOpenCourseId# ,
   @}
   @}
+  @if(contain("teacherOpenCourseStudentSigninSettingSessionTime",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  teacher_open_course_student_signin_setting_session_time = null ,
+  @}else{
+  teacher_open_course_student_signin_setting_session_time = #teacherOpenCourseStudentSigninSettingSessionTime# ,
+  @}
+  @}
   @if(contain("schoolClassIds",_given)){
   @if(isEmpty(schoolClassIds)){
   school_class_ids = null ,
@@ -257,6 +270,9 @@ getTeacherOpenCourseStudentSigninSettingValues
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
   and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
   @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  @}
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
   @}
@@ -305,6 +321,9 @@ getValuesByQuery
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
   and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
   @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  @}
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingIdPlural)){
   and find_in_set(t.teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#)
   @}
@@ -369,6 +388,9 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
   and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
   @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingSessionTime)){
+  and t.teacher_open_course_student_signin_setting_session_time =#teacherOpenCourseStudentSigninSettingSessionTime#
+  @}
   @if(!isEmpty(teacherOpenCourseStudentSigninSettingIdPlural)){
   and find_in_set(t.teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#)
   @}

web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js

@@ -41,6 +41,13 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
 
                         width : 60,
                 },
+                {
+                    field : 'teacherOpenCourseStudentSigninSettingSessionTime',
+                    title : '场次时间',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninSettingSessionTime'])?false:sx_['teacherOpenCourseStudentSigninSettingSessionTime'],
+                },
                 {
                     field : 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
                     title : '开课ID',

web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/add.html

@@ -10,6 +10,12 @@
 											id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseId}" layVerify="" />
 				</div>
             </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">场次时间<label>
+				<div class="layui-input-inline">
+					<input type="text" id="teacherOpenCourseStudentSigninSettingSessionTime" name="teacherOpenCourseStudentSigninSettingSessionTime"  value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingSessionTime,"yyyy-MM-dd HH"}"   class="layui-input input-datetime" />
+				</div>
+            </div>
             <div class="layui-inline">
             	<label class="layui-form-label">班级ID集合</label>
 				<div class="layui-input-inline">

web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/edit.html

@@ -10,6 +10,12 @@
 						id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseId}" layVerify="" />
 				</div>
             </div>
+			<div class="layui-inline">
+				<label class="layui-form-label">场次时间<label>
+					<div class="layui-input-inline">
+						<input type="text" id="teacherOpenCourseStudentSigninSettingSessionTime" name="teacherOpenCourseStudentSigninSettingSessionTime"  value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingSessionTime,"yyyy-MM-dd HH"}"   class="layui-input input-datetime" />
+					</div>
+			</div>
             <div class="layui-inline">
             	<label class="layui-form-label">班级ID集合</label>
 				<div class="layui-input-inline">