签到配置；

签到日志；
2 years ago · c0bfaf1f6b
parent ba18ddd860
commit c0bfaf1f6b
23 changed files with 1849 additions and 1309 deletions
--- a/data_base_design/天泽数据大平台.pdb
+++ b/data_base_design/天泽数据大平台.pdb
--- a/data_base_design/天泽数据大平台.pdm
+++ b/data_base_design/天泽数据大平台.pdm
--- a/doc/sql/mysql/tianze-pro.sql
+++ b/doc/sql/mysql/tianze-pro.sql
@ -29190,43 +29190,59 @@ CREATE TABLE `teacher_open_course_score_dashboard`  (
 -- Records of teacher_open_course_score_dashboard
 -- ----------------------------

-- ----------------------------
-- Table structure for teacher_open_course_student_signin_log
-- ----------------------------
-DROP TABLE IF EXISTS `teacher_open_course_student_signin_log`;
-CREATE TABLE `teacher_open_course_student_signin_log`  (
-  `teacher_open_course_student_signin_id` bigint(20) NOT NULL COMMENT 'ID',
-  `student_id` bigint(20) NULL DEFAULT NULL COMMENT '学生ID',
-  `open_course_id` bigint(20) NULL DEFAULT NULL COMMENT '开课ID',
-  `school_class_id` char(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '班级ID',
-  `add_time` datetime NULL DEFAULT NULL COMMENT '签到日期',
-  `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '签到方式 (数据字典 student_signin_type)',
-  `remark` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注（缺勤理由）',
-  `org_id` bigint(20) NULL DEFAULT NULL COMMENT '组织ID',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  PRIMARY KEY (`teacher_open_course_student_signin_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '教师-我的课程-开课-学生签到记录' ROW_FORMAT = DYNAMIC;
+drop table if exists teacher_open_course_student_signin_log;

-- ----------------------------
-- Records of teacher_open_course_student_signin_log
-- ----------------------------
-INSERT INTO `teacher_open_course_student_signin_log` VALUES (1571170834364669952, 2, 1569699665614643200, '1', '2022-09-18 00:00:00', 'ip_signin', '我缺勤了', 1, 1);
+/*==============================================================*/
+/* Table: teacher_open_course_student_signin_log                */
+/*==============================================================*/
+create table teacher_open_course_student_signin_log
+(
+   teacher_open_course_student_signin_id bigint not null comment 'ID',
+   student_id           bigint comment '学生ID',
+   teacher_open_course_id bigint comment '开课ID',
+   school_class_id      char(10) comment '班级ID',
+   teacher_open_course_student_signin_add_time datetime comment '签到日期',
+   teacher_open_course_student_signin_type varchar(50) comment '签到方式 (数据字典 student_signin_type)',
+   teacher_open_course_student_signin_remark varchar(1000) comment '备注（缺勤理由）',
+   teacher_open_course_student_signin_ip varchar(50) comment '签到的IP',
+   org_id               bigint comment '组织ID',
+   user_id              bigint comment '用户ID',
+   primary key (teacher_open_course_student_signin_id)
+)
+auto_increment = 1
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_general_ci;

-- ----------------------------
-- Table structure for teacher_open_course_student_signin_setting
-- ----------------------------
-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(20) NOT NULL COMMENT 'ID',
-  `open_course_id` bigint(20) NULL DEFAULT NULL COMMENT '开课ID',
-  `school_class_id` bigint(20) NULL DEFAULT NULL COMMENT '班级ID',
-  `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '签到方式 (数据字典 student_signin_type)',
-  `value` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置',
-  `org_id` bigint(20) NULL DEFAULT NULL COMMENT '组织ID',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户ID',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-  PRIMARY KEY (`teacher_open_course_student_signin_setting_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '教师-我的课程-开课-学生签到-配置' ROW_FORMAT = DYNAMIC;
+alter table teacher_open_course_student_signin_log comment '教师-我的课程-开课-学生签到记录';
+
+
+drop table if exists teacher_open_course_student_signin_setting;
+
+/*==============================================================*/
+/* Table: 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_id bigint comment '开课ID',
+   school_class_ids     varchar(2000) comment '班级ID集合',
+   teacher_open_course_student_signin_setting_type varchar(50) comment '签到方式 (数据字典 student_signin_type)',
+   teacher_open_course_student_signin_setting_value varchar(50) comment '设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置',
+   teacher_open_course_student_signin_setting_start_time datetime comment '签到开始日期',
+   teacher_open_course_student_signin_setting_end_time datetime comment '签到结束日期',
+   teacher_open_course_student_signin_setting_add_time datetime comment '创建时间',
+   Column_teacher_open_course_student_signin_setting_status int comment '状态 1正常 2删除',
+   org_id               bigint comment '组织ID',
+   user_id              bigint comment '用户ID',
+   primary key (teacher_open_course_student_signin_setting_id)
+)
+auto_increment = 1
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_general_ci;
+
+alter table teacher_open_course_student_signin_setting comment '教师-我的课程-开课-学生签到-配置';

 -- ----------------------------
 -- Records of teacher_open_course_student_signin_setting
--- a/web/src/main/java/cn/jlw/Interceptor/ActionLog.java
+++ b/web/src/main/java/cn/jlw/Interceptor/ActionLog.java
@ -144,7 +144,7 @@ public class ActionLog {
        @Override
        public Boolean call() {
            try {
-                actionLog.run(uuid,JSONArray.toJSONString(o),new Date(),sysLogService);
+                run(uuid,JSONArray.toJSONString(o),new Date(),sysLogService);
                return true;
            }catch (Exception e){
                e.printStackTrace();
--- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninLogDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninLogDao.java
@ -22,4 +22,5 @@ public interface TeacherOpenCourseStudentSigninLogDao extends BaseMapper<Teacher
    int updateGivenByIds(TeacherOpenCourseStudentSigninLogQuery teacherOpenCourseStudentSigninLogQuery);
    List<TeacherOpenCourseStudentSigninLog> getByIds(String ids);
    List<TeacherOpenCourseStudentSigninLog> getValuesByQuery(TeacherOpenCourseStudentSigninLogQuery teacherOpenCourseStudentSigninLogQuery);
+    List<TeacherOpenCourseStudentSigninLog> getValuesByQueryNotWithPermission(TeacherOpenCourseStudentSigninLogQuery teacherOpenCourseStudentSigninLogQuery);
 }
--- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninSettingDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninSettingDao.java
@ -19,7 +19,10 @@ public interface TeacherOpenCourseStudentSigninSettingDao extends BaseMapper<Tea
    @Update
    void deleteTeacherOpenCourseStudentSigninSettingByIds(String ids);
    @Update
+    void deleteByIds(String ids);
+    @Update
    int updateGivenByIds(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery);
    List<TeacherOpenCourseStudentSigninSetting> getByIds(String ids);
    List<TeacherOpenCourseStudentSigninSetting> getValuesByQuery(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery);
+    List<TeacherOpenCourseStudentSigninSetting> getValuesByQueryNotWithPermission(TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery);
 }
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLog.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninLog.java
@ -10,7 +10,7 @@ import java.util.Date;

 /* 
 * 教师-我的课程-开课-学生签到记录
-* gen by Spring Boot2 Admin 2022-09-18
+* gen by Spring Boot2 Admin 2022-10-11
 */
 public class TeacherOpenCourseStudentSigninLog extends BaseEntity{

@ -29,7 +29,7 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
    //开课ID
    @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")

-    private Long openCourseId ;
+    private Long teacherOpenCourseId ;
 	
    //班级ID
    @Dict(type="school_class.class_name.class_status=1")
@ -38,16 +38,20 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
 	
    //签到日期

-    private Date addTime ;
+    private Date teacherOpenCourseStudentSigninAddTime ;
 	
    //签到方式 (数据字典 student_signin_type)
    @Dict(type="student_signin_type")

-    private String type ;
+    private String teacherOpenCourseStudentSigninType ;
 	
    //备注（缺勤理由）

-    private String remark ;
+    private String teacherOpenCourseStudentSigninRemark ;
+	
+    //签到的IP
+
+    private String teacherOpenCourseStudentSigninIp ;
 	
    //组织ID

@ -89,14 +93,14 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
    /**开课ID
    *@return 
    */
-    public Long getOpenCourseId(){
-        return  openCourseId;
+    public Long getTeacherOpenCourseId(){
+        return  teacherOpenCourseId;
    }
    /**开课ID
-    *@param  openCourseId
+    *@param  teacherOpenCourseId
    */
-    public void setOpenCourseId(Long openCourseId){
-        this.openCourseId = openCourseId;
+    public void setTeacherOpenCourseId(Long teacherOpenCourseId){
+        this.teacherOpenCourseId = teacherOpenCourseId;
    }

    /**班级ID
@ -115,40 +119,53 @@ public class TeacherOpenCourseStudentSigninLog extends BaseEntity{
    /**签到日期
    *@return 
    */
-    public Date getAddTime(){
-        return  addTime;
+    public Date getTeacherOpenCourseStudentSigninAddTime(){
+        return  teacherOpenCourseStudentSigninAddTime;
    }
    /**签到日期
-    *@param  addTime
+    *@param  teacherOpenCourseStudentSigninAddTime
    */
-    public void setAddTime(Date addTime){
-        this.addTime = addTime;
+    public void setTeacherOpenCourseStudentSigninAddTime(Date teacherOpenCourseStudentSigninAddTime){
+        this.teacherOpenCourseStudentSigninAddTime = teacherOpenCourseStudentSigninAddTime;
    }

    /**签到方式 (数据字典 student_signin_type)
    *@return 
    */
-    public String getType(){
-        return  type;
+    public String getTeacherOpenCourseStudentSigninType(){
+        return  teacherOpenCourseStudentSigninType;
    }
    /**签到方式 (数据字典 student_signin_type)
-    *@param  type
+    *@param  teacherOpenCourseStudentSigninType
    */
-    public void setType(String type){
-        this.type = type;
+    public void setTeacherOpenCourseStudentSigninType(String teacherOpenCourseStudentSigninType){
+        this.teacherOpenCourseStudentSigninType = teacherOpenCourseStudentSigninType;
    }

    /**备注（缺勤理由）
    *@return 
    */
-    public String getRemark(){
-        return  remark;
+    public String getTeacherOpenCourseStudentSigninRemark(){
+        return  teacherOpenCourseStudentSigninRemark;
    }
    /**备注（缺勤理由）
-    *@param  remark
+    *@param  teacherOpenCourseStudentSigninRemark
+    */
+    public void setTeacherOpenCourseStudentSigninRemark(String teacherOpenCourseStudentSigninRemark){
+        this.teacherOpenCourseStudentSigninRemark = teacherOpenCourseStudentSigninRemark;
+    }
+
+    /**签到的IP
+    *@return 
+    */
+    public String getTeacherOpenCourseStudentSigninIp(){
+        return  teacherOpenCourseStudentSigninIp;
+    }
+    /**签到的IP
+    *@param  teacherOpenCourseStudentSigninIp
    */
-    public void setRemark(String remark){
-        this.remark = remark;
+    public void setTeacherOpenCourseStudentSigninIp(String teacherOpenCourseStudentSigninIp){
+        this.teacherOpenCourseStudentSigninIp = teacherOpenCourseStudentSigninIp;
    }

    /**组织ID
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java
@ -10,7 +10,7 @@ import java.util.Date;

 /* 
 * 教师-我的课程-开课-学生签到-配置
-* gen by Spring Boot2 Admin 2022-09-18
+* gen by Spring Boot2 Admin 2022-10-11
 */
 public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{

@ -24,21 +24,38 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
    //开课ID
    @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")

-    private Long openCourseId ;
+    private Long teacherOpenCourseId ;
 	
-    //班级ID
+    //班级ID集合
    @Dict(type="school_class.class_name.class_status=1")

-    private Long schoolClassId ;
+    private String schoolClassIds ;
 	
    //签到方式 (数据字典 student_signin_type)
    @Dict(type="student_signin_type")

-    private String type ;
+    private String teacherOpenCourseStudentSigninSettingType ;
 	
    //设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置

-    private String value ;
+    private String teacherOpenCourseStudentSigninSettingValue ;
+	
+    //签到开始日期
+
+    private Date teacherOpenCourseStudentSigninSettingStartTime ;
+	
+    //签到结束日期
+
+    private Date teacherOpenCourseStudentSigninSettingEndTime ;
+	
+    //创建时间
+
+    private Date teacherOpenCourseStudentSigninSettingAddTime ;
+	
+    //状态 1正常 2删除
+    @Dict(type="global_status")
+
+    private Integer teacherOpenCourseStudentSigninSettingStatus ;
 	
    //组织ID

@ -48,10 +65,6 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{

    private Long userId ;
 	
-    //创建时间
-
-    private Date createTime ;
-	
    public TeacherOpenCourseStudentSigninSetting(){
    }

@ -71,53 +84,105 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
    /**开课ID
    *@return 
    */
-    public Long getOpenCourseId(){
-        return  openCourseId;
+    public Long getTeacherOpenCourseId(){
+        return  teacherOpenCourseId;
    }
    /**开课ID
-    *@param  openCourseId
+    *@param  teacherOpenCourseId
    */
-    public void setOpenCourseId(Long openCourseId){
-        this.openCourseId = openCourseId;
+    public void setTeacherOpenCourseId(Long teacherOpenCourseId){
+        this.teacherOpenCourseId = teacherOpenCourseId;
    }

-    /**班级ID
+    /**班级ID集合
    *@return 
    */
-    public Long getSchoolClassId(){
-        return  schoolClassId;
+    public String getSchoolClassIds(){
+        return  schoolClassIds;
    }
-    /**班级ID
-    *@param  schoolClassId
+    /**班级ID集合
+    *@param  schoolClassIds
    */
-    public void setSchoolClassId(Long schoolClassId){
-        this.schoolClassId = schoolClassId;
+    public void setSchoolClassIds(String schoolClassIds){
+        this.schoolClassIds = schoolClassIds;
    }

    /**签到方式 (数据字典 student_signin_type)
    *@return 
    */
-    public String getType(){
-        return  type;
+    public String getTeacherOpenCourseStudentSigninSettingType(){
+        return  teacherOpenCourseStudentSigninSettingType;
    }
    /**签到方式 (数据字典 student_signin_type)
-    *@param  type
+    *@param  teacherOpenCourseStudentSigninSettingType
    */
-    public void setType(String type){
-        this.type = type;
+    public void setTeacherOpenCourseStudentSigninSettingType(String teacherOpenCourseStudentSigninSettingType){
+        this.teacherOpenCourseStudentSigninSettingType = teacherOpenCourseStudentSigninSettingType;
    }

    /**设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置
    *@return 
    */
-    public String getValue(){
-        return  value;
+    public String getTeacherOpenCourseStudentSigninSettingValue(){
+        return  teacherOpenCourseStudentSigninSettingValue;
    }
    /**设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置
-    *@param  value
+    *@param  teacherOpenCourseStudentSigninSettingValue
+    */
+    public void setTeacherOpenCourseStudentSigninSettingValue(String teacherOpenCourseStudentSigninSettingValue){
+        this.teacherOpenCourseStudentSigninSettingValue = teacherOpenCourseStudentSigninSettingValue;
+    }
+
+    /**签到开始日期
+    *@return 
+    */
+    public Date getTeacherOpenCourseStudentSigninSettingStartTime(){
+        return  teacherOpenCourseStudentSigninSettingStartTime;
+    }
+    /**签到开始日期
+    *@param  teacherOpenCourseStudentSigninSettingStartTime
+    */
+    public void setTeacherOpenCourseStudentSigninSettingStartTime(Date teacherOpenCourseStudentSigninSettingStartTime){
+        this.teacherOpenCourseStudentSigninSettingStartTime = teacherOpenCourseStudentSigninSettingStartTime;
+    }
+
+    /**签到结束日期
+    *@return 
+    */
+    public Date getTeacherOpenCourseStudentSigninSettingEndTime(){
+        return  teacherOpenCourseStudentSigninSettingEndTime;
+    }
+    /**签到结束日期
+    *@param  teacherOpenCourseStudentSigninSettingEndTime
+    */
+    public void setTeacherOpenCourseStudentSigninSettingEndTime(Date teacherOpenCourseStudentSigninSettingEndTime){
+        this.teacherOpenCourseStudentSigninSettingEndTime = teacherOpenCourseStudentSigninSettingEndTime;
+    }
+
+    /**创建时间
+    *@return 
    */
-    public void setValue(String value){
-        this.value = value;
+    public Date getTeacherOpenCourseStudentSigninSettingAddTime(){
+        return  teacherOpenCourseStudentSigninSettingAddTime;
+    }
+    /**创建时间
+    *@param  teacherOpenCourseStudentSigninSettingAddTime
+    */
+    public void setTeacherOpenCourseStudentSigninSettingAddTime(Date teacherOpenCourseStudentSigninSettingAddTime){
+        this.teacherOpenCourseStudentSigninSettingAddTime = teacherOpenCourseStudentSigninSettingAddTime;
+    }
+
+    /**状态 1正常 2删除
+    *@return 
+    */
+    public Integer getTeacherOpenCourseStudentSigninSettingStatus(){
+        return  teacherOpenCourseStudentSigninSettingStatus;
+    }
+    /**状态 1正常 2删除
+    *@param  teacherOpenCourseStudentSigninSettingStatus
+    */
+    public void setTeacherOpenCourseStudentSigninSettingStatus(Integer teacherOpenCourseStudentSigninSettingStatus){
+        this.teacherOpenCourseStudentSigninSettingStatus = teacherOpenCourseStudentSigninSettingStatus;
    }

    /**组织ID
@ -146,18 +211,5 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
        this.userId = userId;
    }

-    /**创建时间
-    *@return 
-    */
-    public Date getCreateTime(){
-        return  createTime;
-    }
-    /**创建时间
-    *@param  createTime
-    */
-    public void setCreateTime(Date createTime){
-        this.createTime = createTime;
-    }
-

 }
--- a/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninLogSigninDTO.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherOpenCourseStudentSigninLogSigninDTO.java
@ -0,0 +1,27 @@
+package com.ibeetl.jlw.entity.dto;
+
+import lombok.Data;
+
+/**
+ * <p>
+ *  学生签到-DTO
+ * </p>
+ *
+ * @author mlx
+ * @date 2022/10/11
+ * @modified
+ */
+@Data
+public class TeacherOpenCourseStudentSigninLogSigninDTO {
+
+    // 签到配置ID
+    private String teacherOpenCourseStudentSigninSettingId;
+
+    // 签到类型
+    private TeacherOpenCourseStudentSigninLogTypeEnum signinType;
+
+    public enum TeacherOpenCourseStudentSigninLogTypeEnum {
+        // IP签到、手动签到、验证码签到
+        IP, MANUAL, CODE
+    }
+}
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
@ -9,12 +9,14 @@ import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.TeacherOpenCourseStudentSigninLogDao;
 import com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninLog;
+import com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;
 import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;

 import javax.annotation.Resource;
 import java.util.ArrayList;
@ -27,6 +29,7 @@ import java.util.List;

@Service
@Transactional
+@Validated
 public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<TeacherOpenCourseStudentSigninLog>{

    @Resource private TeacherOpenCourseStudentSigninLogDao teacherOpenCourseStudentSigninLogDao;
@ -124,6 +127,10 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
        return teacherOpenCourseStudentSigninLogDao.getValuesByQuery(teacherOpenCourseStudentSigninLogQuery);
    }

+    public List<TeacherOpenCourseStudentSigninLog> getValuesByQueryNotWithPermission (TeacherOpenCourseStudentSigninLogQuery teacherOpenCourseStudentSigninLogQuery){
+        return teacherOpenCourseStudentSigninLogDao.getValuesByQueryNotWithPermission(teacherOpenCourseStudentSigninLogQuery);
+    }
+
    public TeacherOpenCourseStudentSigninLog getInfo (Long teacherOpenCourseStudentSigninId){
        TeacherOpenCourseStudentSigninLogQuery teacherOpenCourseStudentSigninLogQuery = new TeacherOpenCourseStudentSigninLogQuery();
        teacherOpenCourseStudentSigninLogQuery.setTeacherOpenCourseStudentSigninId(teacherOpenCourseStudentSigninId);
@ -144,4 +151,8 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
        }
    }

+    public void signin(TeacherOpenCourseStudentSigninLogSigninDTO signinDTO) {
+        // TODO mlx 签到实现方法
+        throw new PlatformException("签到方法未实现！");
+    }
 }
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java
@ -15,6 +15,7 @@ import org.beetl.sql.core.SqlId;
 import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;

 import javax.annotation.Resource;
 import java.util.ArrayList;
@ -27,6 +28,7 @@ import java.util.List;

@Service
@Transactional
+@Validated
 public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseService<TeacherOpenCourseStudentSigninSetting>{

    @Resource private TeacherOpenCourseStudentSigninSettingDao teacherOpenCourseStudentSigninSettingDao;
@ -50,7 +52,7 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
            ids += list.get(i).toString()+(i==list.size()-1?"":",");
        }
        if(StringUtils.isNotBlank(ids)){
-            teacherOpenCourseStudentSigninSettingDao.deleteTeacherOpenCourseStudentSigninSettingByIds(ids);
+            teacherOpenCourseStudentSigninSettingDao.deleteByIds(ids);
        }
    }

@ -124,9 +126,14 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
        return teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery);
    }

+    public List<TeacherOpenCourseStudentSigninSetting> getValuesByQueryNotWithPermission (TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery){
+        return teacherOpenCourseStudentSigninSettingDao.getValuesByQueryNotWithPermission(teacherOpenCourseStudentSigninSettingQuery);
+    }
+
    public TeacherOpenCourseStudentSigninSetting getInfo (Long teacherOpenCourseStudentSigninSettingId){
        TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery = new TeacherOpenCourseStudentSigninSettingQuery();
        teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingId(teacherOpenCourseStudentSigninSettingId);
+        teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingStatusPlural("1,2");//需要根据实际情况来
        List<TeacherOpenCourseStudentSigninSetting> list = teacherOpenCourseStudentSigninSettingDao.getValuesByQuery(teacherOpenCourseStudentSigninSettingQuery);
        if(null != list && list.size()>0){
            return list.get(0);
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java
@ -1,5 +1,9 @@
 package com.ibeetl.jlw.web;

+import cn.hutool.core.lang.Assert;
+import cn.hutool.extra.validation.BeanValidationResult;
+import cn.hutool.extra.validation.ValidationUtil;
+import cn.hutool.json.JSONUtil;
 import cn.jlw.Interceptor.SCoreUser;
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Function;
@ -7,6 +11,7 @@ import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileService;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninLog;
+import com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninDTO;
 import com.ibeetl.jlw.service.TeacherOpenCourseStudentSigninLogService;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery;
 import org.apache.commons.lang3.StringUtils;
@ -22,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;

 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 import java.util.List;

 /**
@ -30,6 +36,7 @@ import java.util.List;
 */

@RestController
+@Validated
 public class TeacherOpenCourseStudentSigninLogController{

    private final Log log = LogFactory.getLog(this.getClass());
@ -189,5 +196,19 @@ public class TeacherOpenCourseStudentSigninLogController{
        return JsonResult.success();
    }

+    /**
+     * 学生端-开始签到（签到统一接口）
+     * @param signinDTO     签到DTO
+     * @return
+     */
+    @PostMapping(MODEL + "/signin.json")
+    @Function("teacherOpenCourseStudentSigninLog.add")
+    @ResponseBody
+    public JsonResult signin(@NotNull(message="签到DTO不能为空！") TeacherOpenCourseStudentSigninLogSigninDTO signinDTO) {
+        BeanValidationResult beanValidationResult = ValidationUtil.warpValidate(signinDTO, ValidateConfig.ADD.class);
+        Assert.isTrue(beanValidationResult.isSuccess(), JSONUtil.toJsonStr(beanValidationResult.getErrorMessages()));
+        teacherOpenCourseStudentSigninLogService.signin(signinDTO);
+        return JsonResult.successMessage("签到成功！");
+    }

 }
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java
@ -30,6 +30,7 @@ import java.util.List;
 */

@RestController
+@Validated
 public class TeacherOpenCourseStudentSigninSettingController{

    private final Log log = LogFactory.getLog(this.getClass());
@ -144,6 +145,9 @@ public class TeacherOpenCourseStudentSigninSettingController{
        }else{
                teacherOpenCourseStudentSigninSettingQuery.setUserId(coreUser.getId());
                teacherOpenCourseStudentSigninSettingQuery.setOrgId(coreUser.getOrgId());
+                        if(null == teacherOpenCourseStudentSigninSettingQuery.getTeacherOpenCourseStudentSigninSettingStatus()){
+                            teacherOpenCourseStudentSigninSettingQuery.setTeacherOpenCourseStudentSigninSettingStatus(1);
+                        }
            return teacherOpenCourseStudentSigninSettingService.add(teacherOpenCourseStudentSigninSettingQuery);
        }
    }
--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninLogQuery.java
@ -18,15 +18,17 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
    @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")
-    private Long openCourseId;
+    private Long teacherOpenCourseId;
    @Query(name = "班级ID", display = true,type=Query.TYPE_DICT,dict="school_class.class_name.class_status=1")
    private String schoolClassId;
    @Query(name = "签到日期", display = false)
-    private Date addTime;
+    private Date teacherOpenCourseStudentSigninAddTime;
    @Query(name = "签到方式 (数据字典 student_signin_type)", display = true,type=Query.TYPE_DICT,dict="student_signin_type")
-    private String type;
+    private String teacherOpenCourseStudentSigninType;
    @Query(name = "备注（缺勤理由）", display = false)
-    private String remark;
+    private String teacherOpenCourseStudentSigninRemark;
+    @Query(name = "签到的IP", display = false)
+    private String teacherOpenCourseStudentSigninIp;
    @Query(name = "组织ID", display = false)
    private Long orgId;
    @Query(name = "用户ID", display = false)
@ -34,7 +36,7 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {

    private String teacherOpenCourseStudentSigninIdPlural;
    private String studentIdPlural;
-    private String openCourseIdPlural;
+    private String teacherOpenCourseIdPlural;
    private String orgIdPlural;
    private String userIdPlural;

@ -54,11 +56,11 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
    public void setStudentId(Long studentId ){
        this.studentId = studentId;
    }
-    public Long getOpenCourseId(){
-        return  openCourseId;
+    public Long getTeacherOpenCourseId(){
+        return  teacherOpenCourseId;
    }
-    public void setOpenCourseId(Long openCourseId ){
-        this.openCourseId = openCourseId;
+    public void setTeacherOpenCourseId(Long teacherOpenCourseId ){
+        this.teacherOpenCourseId = teacherOpenCourseId;
    }
    public String getSchoolClassId(){
        return  schoolClassId;
@ -66,23 +68,29 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
    public void setSchoolClassId(String schoolClassId ){
        this.schoolClassId = schoolClassId;
    }
-    public Date getAddTime(){
-        return  addTime;
+    public Date getTeacherOpenCourseStudentSigninAddTime(){
+        return  teacherOpenCourseStudentSigninAddTime;
    }
-    public void setAddTime(Date addTime ){
-        this.addTime = addTime;
+    public void setTeacherOpenCourseStudentSigninAddTime(Date teacherOpenCourseStudentSigninAddTime ){
+        this.teacherOpenCourseStudentSigninAddTime = teacherOpenCourseStudentSigninAddTime;
    }
-    public String getType(){
-        return  type;
+    public String getTeacherOpenCourseStudentSigninType(){
+        return  teacherOpenCourseStudentSigninType;
    }
-    public void setType(String type ){
-        this.type = type;
+    public void setTeacherOpenCourseStudentSigninType(String teacherOpenCourseStudentSigninType ){
+        this.teacherOpenCourseStudentSigninType = teacherOpenCourseStudentSigninType;
    }
-    public String getRemark(){
-        return  remark;
+    public String getTeacherOpenCourseStudentSigninRemark(){
+        return  teacherOpenCourseStudentSigninRemark;
    }
-    public void setRemark(String remark ){
-        this.remark = remark;
+    public void setTeacherOpenCourseStudentSigninRemark(String teacherOpenCourseStudentSigninRemark ){
+        this.teacherOpenCourseStudentSigninRemark = teacherOpenCourseStudentSigninRemark;
+    }
+    public String getTeacherOpenCourseStudentSigninIp(){
+        return  teacherOpenCourseStudentSigninIp;
+    }
+    public void setTeacherOpenCourseStudentSigninIp(String teacherOpenCourseStudentSigninIp ){
+        this.teacherOpenCourseStudentSigninIp = teacherOpenCourseStudentSigninIp;
    }
    public Long getOrgId(){
        return  orgId;
@ -101,11 +109,12 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
        TeacherOpenCourseStudentSigninLog pojo = new TeacherOpenCourseStudentSigninLog();
        pojo.setTeacherOpenCourseStudentSigninId(this.getTeacherOpenCourseStudentSigninId());
        pojo.setStudentId(this.getStudentId());
-        pojo.setOpenCourseId(this.getOpenCourseId());
+        pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId());
        pojo.setSchoolClassId(this.getSchoolClassId());
-        pojo.setAddTime(this.getAddTime());
-        pojo.setType(this.getType());
-        pojo.setRemark(this.getRemark());
+        pojo.setTeacherOpenCourseStudentSigninAddTime(this.getTeacherOpenCourseStudentSigninAddTime());
+        pojo.setTeacherOpenCourseStudentSigninType(this.getTeacherOpenCourseStudentSigninType());
+        pojo.setTeacherOpenCourseStudentSigninRemark(this.getTeacherOpenCourseStudentSigninRemark());
+        pojo.setTeacherOpenCourseStudentSigninIp(this.getTeacherOpenCourseStudentSigninIp());
        pojo.setOrgId(this.getOrgId());
        pojo.setUserId(this.getUserId());
        return pojo;
@ -123,11 +132,11 @@ public class TeacherOpenCourseStudentSigninLogQuery extends PageParam {
    public void setStudentIdPlural(String studentIdPlural){
        this.studentIdPlural = studentIdPlural;
    }
-    public String getOpenCourseIdPlural(){
-        return  openCourseIdPlural;
+    public String getTeacherOpenCourseIdPlural(){
+        return  teacherOpenCourseIdPlural;
    }
-    public void setOpenCourseIdPlural(String openCourseIdPlural){
-        this.openCourseIdPlural = openCourseIdPlural;
+    public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){
+        this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural;
    }
    public String getOrgIdPlural(){
        return  orgIdPlural;
--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java
@ -16,59 +16,91 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
    @Query(name = "ID", display = false)
    private Long teacherOpenCourseStudentSigninSettingId;
    @Query(name = "开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
-    private Long openCourseId;
-    @Query(name = "班级ID", display = true,type=Query.TYPE_DICT,dict="school_class.class_name.class_status=1")
-    private Long schoolClassId;
+    private Long teacherOpenCourseId;
+    @Query(name = "班级ID集合", display = true,type=Query.TYPE_DICT,dict="school_class.class_name.class_status=1")
+    private String schoolClassIds;
    @Query(name = "签到方式 (数据字典 student_signin_type)", display = true,type=Query.TYPE_DICT,dict="student_signin_type")
-    private String type;
+    private String teacherOpenCourseStudentSigninSettingType;
    @Query(name = "设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置", display = false)
-    private String value;
+    private String teacherOpenCourseStudentSigninSettingValue;
+    @Query(name = "签到开始日期", display = false)
+    private Date teacherOpenCourseStudentSigninSettingStartTime;
+    @Query(name = "签到结束日期", display = false)
+    private Date teacherOpenCourseStudentSigninSettingEndTime;
+    @Query(name = "创建时间", display = false)
+    private Date teacherOpenCourseStudentSigninSettingAddTime;
+    @Query(name = "状态 1正常 2删除", display = true,type=Query.TYPE_DICT,dict="global_status")
+    private Integer teacherOpenCourseStudentSigninSettingStatus;
    @Query(name = "组织ID", display = false)
    private Long orgId;
    @Query(name = "用户ID", display = false)
    private Long userId;
-    @Query(name = "创建时间", display = false)
-    private Date createTime;

    private String teacherOpenCourseStudentSigninSettingIdPlural;
-    private String openCourseIdPlural;
-    private String schoolClassIdPlural;
+    private String teacherOpenCourseIdPlural;
    private String orgIdPlural;
    private String userIdPlural;

    private String teacherOpenCourseStudentSigninSettingJsonStr;//json格式

+    private String teacherOpenCourseStudentSigninSettingStatusPlural;
+
    private String _given;//指定更新的特定字段，多个逗号隔开

+
    public Long getTeacherOpenCourseStudentSigninSettingId(){
        return  teacherOpenCourseStudentSigninSettingId;
    }
    public void setTeacherOpenCourseStudentSigninSettingId(Long teacherOpenCourseStudentSigninSettingId ){
        this.teacherOpenCourseStudentSigninSettingId = teacherOpenCourseStudentSigninSettingId;
    }
-    public Long getOpenCourseId(){
-        return  openCourseId;
+    public Long getTeacherOpenCourseId(){
+        return  teacherOpenCourseId;
+    }
+    public void setTeacherOpenCourseId(Long teacherOpenCourseId ){
+        this.teacherOpenCourseId = teacherOpenCourseId;
+    }
+    public String getSchoolClassIds(){
+        return  schoolClassIds;
+    }
+    public void setSchoolClassIds(String schoolClassIds ){
+        this.schoolClassIds = schoolClassIds;
+    }
+    public String getTeacherOpenCourseStudentSigninSettingType(){
+        return  teacherOpenCourseStudentSigninSettingType;
+    }
+    public void setTeacherOpenCourseStudentSigninSettingType(String teacherOpenCourseStudentSigninSettingType ){
+        this.teacherOpenCourseStudentSigninSettingType = teacherOpenCourseStudentSigninSettingType;
+    }
+    public String getTeacherOpenCourseStudentSigninSettingValue(){
+        return  teacherOpenCourseStudentSigninSettingValue;
    }
-    public void setOpenCourseId(Long openCourseId ){
-        this.openCourseId = openCourseId;
+    public void setTeacherOpenCourseStudentSigninSettingValue(String teacherOpenCourseStudentSigninSettingValue ){
+        this.teacherOpenCourseStudentSigninSettingValue = teacherOpenCourseStudentSigninSettingValue;
    }
-    public Long getSchoolClassId(){
-        return  schoolClassId;
+    public Date getTeacherOpenCourseStudentSigninSettingStartTime(){
+        return  teacherOpenCourseStudentSigninSettingStartTime;
    }
-    public void setSchoolClassId(Long schoolClassId ){
-        this.schoolClassId = schoolClassId;
+    public void setTeacherOpenCourseStudentSigninSettingStartTime(Date teacherOpenCourseStudentSigninSettingStartTime ){
+        this.teacherOpenCourseStudentSigninSettingStartTime = teacherOpenCourseStudentSigninSettingStartTime;
    }
-    public String getType(){
-        return  type;
+    public Date getTeacherOpenCourseStudentSigninSettingEndTime(){
+        return  teacherOpenCourseStudentSigninSettingEndTime;
    }
-    public void setType(String type ){
-        this.type = type;
+    public void setTeacherOpenCourseStudentSigninSettingEndTime(Date teacherOpenCourseStudentSigninSettingEndTime ){
+        this.teacherOpenCourseStudentSigninSettingEndTime = teacherOpenCourseStudentSigninSettingEndTime;
    }
-    public String getValue(){
-        return  value;
+    public Date getTeacherOpenCourseStudentSigninSettingAddTime(){
+        return  teacherOpenCourseStudentSigninSettingAddTime;
    }
-    public void setValue(String value ){
-        this.value = value;
+    public void setTeacherOpenCourseStudentSigninSettingAddTime(Date teacherOpenCourseStudentSigninSettingAddTime ){
+        this.teacherOpenCourseStudentSigninSettingAddTime = teacherOpenCourseStudentSigninSettingAddTime;
+    }
+    public Integer getTeacherOpenCourseStudentSigninSettingStatus(){
+        return  teacherOpenCourseStudentSigninSettingStatus;
+    }
+    public void setTeacherOpenCourseStudentSigninSettingStatus(Integer teacherOpenCourseStudentSigninSettingStatus ){
+        this.teacherOpenCourseStudentSigninSettingStatus = teacherOpenCourseStudentSigninSettingStatus;
    }
    public Long getOrgId(){
        return  orgId;
@ -82,23 +114,20 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
    public void setUserId(Long userId ){
        this.userId = userId;
    }
-    public Date getCreateTime(){
-        return  createTime;
-    }
-    public void setCreateTime(Date createTime ){
-        this.createTime = createTime;
-    }

    public TeacherOpenCourseStudentSigninSetting pojo(){
        TeacherOpenCourseStudentSigninSetting pojo = new TeacherOpenCourseStudentSigninSetting();
        pojo.setTeacherOpenCourseStudentSigninSettingId(this.getTeacherOpenCourseStudentSigninSettingId());
-        pojo.setOpenCourseId(this.getOpenCourseId());
-        pojo.setSchoolClassId(this.getSchoolClassId());
-        pojo.setType(this.getType());
-        pojo.setValue(this.getValue());
+        pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId());
+        pojo.setSchoolClassIds(this.getSchoolClassIds());
+        pojo.setTeacherOpenCourseStudentSigninSettingType(this.getTeacherOpenCourseStudentSigninSettingType());
+        pojo.setTeacherOpenCourseStudentSigninSettingValue(this.getTeacherOpenCourseStudentSigninSettingValue());
+        pojo.setTeacherOpenCourseStudentSigninSettingStartTime(this.getTeacherOpenCourseStudentSigninSettingStartTime());
+        pojo.setTeacherOpenCourseStudentSigninSettingEndTime(this.getTeacherOpenCourseStudentSigninSettingEndTime());
+        pojo.setTeacherOpenCourseStudentSigninSettingAddTime(this.getTeacherOpenCourseStudentSigninSettingAddTime());
+        pojo.setTeacherOpenCourseStudentSigninSettingStatus(this.getTeacherOpenCourseStudentSigninSettingStatus());
        pojo.setOrgId(this.getOrgId());
        pojo.setUserId(this.getUserId());
-        pojo.setCreateTime(this.getCreateTime());
        return pojo;
    }

@ -108,17 +137,11 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
    public void setTeacherOpenCourseStudentSigninSettingIdPlural(String teacherOpenCourseStudentSigninSettingIdPlural){
        this.teacherOpenCourseStudentSigninSettingIdPlural = teacherOpenCourseStudentSigninSettingIdPlural;
    }
-    public String getOpenCourseIdPlural(){
-        return  openCourseIdPlural;
-    }
-    public void setOpenCourseIdPlural(String openCourseIdPlural){
-        this.openCourseIdPlural = openCourseIdPlural;
+    public String getTeacherOpenCourseIdPlural(){
+        return  teacherOpenCourseIdPlural;
    }
-    public String getSchoolClassIdPlural(){
-        return  schoolClassIdPlural;
-    }
-    public void setSchoolClassIdPlural(String schoolClassIdPlural){
-        this.schoolClassIdPlural = schoolClassIdPlural;
+    public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural){
+        this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural;
    }
    public String getOrgIdPlural(){
        return  orgIdPlural;
@ -144,4 +167,12 @@ public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
    public void set_given(String _given) {
        this._given = _given;
    }
+
+    public void setTeacherOpenCourseStudentSigninSettingStatusPlural(String teacherOpenCourseStudentSigninSettingStatusPlural) {
+        this.teacherOpenCourseStudentSigninSettingStatusPlural = teacherOpenCourseStudentSigninSettingStatusPlural;
+    }
+
+    public String getTeacherOpenCourseStudentSigninSettingStatusPlural() {
+        return teacherOpenCourseStudentSigninSettingStatusPlural;
+    }
 }
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninLog.md
@ -22,23 +22,26 @@ queryByCondition
  @if(!isEmpty(studentIdPlural)){
  and find_in_set(t.student_id,#studentIdPlural#)
  @}
-  @if(!isEmpty(openCourseId)){
-  and t.open_course_id =#openCourseId#
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
  @}
-  @if(!isEmpty(openCourseIdPlural)){
-  and find_in_set(t.open_course_id,#openCourseIdPlural#)
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
  @}
  @if(!isEmpty(schoolClassId)){
  and t.school_class_id =#schoolClassId#
  @}
-  @if(!isEmpty(addTime)){
-  and t.add_time =#addTime#
+  @if(!isEmpty(teacherOpenCourseStudentSigninAddTime)){
+  and t.teacher_open_course_student_signin_add_time =#teacherOpenCourseStudentSigninAddTime#
  @}
-  @if(!isEmpty(type)){
-  and t.type =#type#
+  @if(!isEmpty(teacherOpenCourseStudentSigninType)){
+  and t.teacher_open_course_student_signin_type =#teacherOpenCourseStudentSigninType#
  @}
-  @if(!isEmpty(remark)){
-  and t.remark =#remark#
+  @if(!isEmpty(teacherOpenCourseStudentSigninRemark)){
+  and t.teacher_open_course_student_signin_remark =#teacherOpenCourseStudentSigninRemark#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninIp)){
+  and t.teacher_open_course_student_signin_ip =#teacherOpenCourseStudentSigninIp#
  @}
  @if(!isEmpty(orgId)){
  and t.org_id =#orgId#
@ -76,23 +79,26 @@ queryByConditionQuery
  @if(!isEmpty(studentIdPlural)){
  and find_in_set(t.student_id,#studentIdPlural#)
  @}
-  @if(!isEmpty(openCourseId)){
-  and t.open_course_id =#openCourseId#
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
  @}
-  @if(!isEmpty(openCourseIdPlural)){
-  and find_in_set(t.open_course_id,#openCourseIdPlural#)
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
  @}
  @if(!isEmpty(schoolClassId)){
  and t.school_class_id =#schoolClassId#
  @}
-  @if(!isEmpty(addTime)){
-  and t.add_time =#addTime#
+  @if(!isEmpty(teacherOpenCourseStudentSigninAddTime)){
+  and t.teacher_open_course_student_signin_add_time =#teacherOpenCourseStudentSigninAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninType)){
+  and t.teacher_open_course_student_signin_type =#teacherOpenCourseStudentSigninType#
  @}
-  @if(!isEmpty(type)){
-  and t.type =#type#
+  @if(!isEmpty(teacherOpenCourseStudentSigninRemark)){
+  and t.teacher_open_course_student_signin_remark =#teacherOpenCourseStudentSigninRemark#
  @}
-  @if(!isEmpty(remark)){
-  and t.remark =#remark#
+  @if(!isEmpty(teacherOpenCourseStudentSigninIp)){
+  and t.teacher_open_course_student_signin_ip =#teacherOpenCourseStudentSigninIp#
  @}
  @if(!isEmpty(orgId)){
  and t.org_id =#orgId#
@ -139,11 +145,11 @@ updateGivenByIds
  student_id = #studentId# ,
  @}
  @}
-  @if(contain("openCourseId",_given)){
-  @if(isEmpty(openCourseId)){
-  open_course_id = null ,
+  @if(contain("teacherOpenCourseId",_given)){
+  @if(isEmpty(teacherOpenCourseId)){
+  teacher_open_course_id = null ,
  @}else{
-  open_course_id = #openCourseId# ,
+  teacher_open_course_id = #teacherOpenCourseId# ,
  @}
  @}
  @if(contain("schoolClassId",_given)){
@ -153,25 +159,32 @@ updateGivenByIds
  school_class_id = #schoolClassId# ,
  @}
  @}
-  @if(contain("addTime",_given)){
-  @if(isEmpty(addTime)){
-  add_time = null ,
+  @if(contain("teacherOpenCourseStudentSigninAddTime",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninAddTime)){
+  teacher_open_course_student_signin_add_time = null ,
+  @}else{
+  teacher_open_course_student_signin_add_time = #teacherOpenCourseStudentSigninAddTime# ,
+  @}
+  @}
+  @if(contain("teacherOpenCourseStudentSigninType",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninType)){
+  teacher_open_course_student_signin_type = null ,
  @}else{
-  add_time = #addTime# ,
+  teacher_open_course_student_signin_type = #teacherOpenCourseStudentSigninType# ,
  @}
  @}
-  @if(contain("type",_given)){
-  @if(isEmpty(type)){
-  type = null ,
+  @if(contain("teacherOpenCourseStudentSigninRemark",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninRemark)){
+  teacher_open_course_student_signin_remark = null ,
  @}else{
-  type = #type# ,
+  teacher_open_course_student_signin_remark = #teacherOpenCourseStudentSigninRemark# ,
  @}
  @}
-  @if(contain("remark",_given)){
-  @if(isEmpty(remark)){
-  remark = null ,
+  @if(contain("teacherOpenCourseStudentSigninIp",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninIp)){
+  teacher_open_course_student_signin_ip = null ,
  @}else{
-  remark = #remark# ,
+  teacher_open_course_student_signin_ip = #teacherOpenCourseStudentSigninIp# ,
  @}
  @}
  @if(contain("orgId",_given)){
@ -207,20 +220,23 @@ getTeacherOpenCourseStudentSigninLogValues
  @if(!isEmpty(studentId)){
  and t.student_id =#studentId#
  @}
-  @if(!isEmpty(openCourseId)){
-  and t.open_course_id =#openCourseId#
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
  @}
  @if(!isEmpty(schoolClassId)){
  and t.school_class_id =#schoolClassId#
  @}
-  @if(!isEmpty(addTime)){
-  and t.add_time =#addTime#
+  @if(!isEmpty(teacherOpenCourseStudentSigninAddTime)){
+  and t.teacher_open_course_student_signin_add_time =#teacherOpenCourseStudentSigninAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninType)){
+  and t.teacher_open_course_student_signin_type =#teacherOpenCourseStudentSigninType#
  @}
-  @if(!isEmpty(type)){
-  and t.type =#type#
+  @if(!isEmpty(teacherOpenCourseStudentSigninRemark)){
+  and t.teacher_open_course_student_signin_remark =#teacherOpenCourseStudentSigninRemark#
  @}
-  @if(!isEmpty(remark)){
-  and t.remark =#remark#
+  @if(!isEmpty(teacherOpenCourseStudentSigninIp)){
+  and t.teacher_open_course_student_signin_ip =#teacherOpenCourseStudentSigninIp#
  @}
  @if(!isEmpty(orgId)){
  and t.org_id =#orgId#
@ -250,23 +266,81 @@ getValuesByQuery
  @if(!isEmpty(studentIdPlural)){
  and find_in_set(t.student_id,#studentIdPlural#)
  @}
-  @if(!isEmpty(openCourseId)){
-  and t.open_course_id =#openCourseId#
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
  @}
-  @if(!isEmpty(openCourseIdPlural)){
-  and find_in_set(t.open_course_id,#openCourseIdPlural#)
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
  @}
  @if(!isEmpty(schoolClassId)){
  and t.school_class_id =#schoolClassId#
  @}
-  @if(!isEmpty(addTime)){
-  and t.add_time =#addTime#
+  @if(!isEmpty(teacherOpenCourseStudentSigninAddTime)){
+  and t.teacher_open_course_student_signin_add_time =#teacherOpenCourseStudentSigninAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninType)){
+  and t.teacher_open_course_student_signin_type =#teacherOpenCourseStudentSigninType#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninRemark)){
+  and t.teacher_open_course_student_signin_remark =#teacherOpenCourseStudentSigninRemark#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninIp)){
+  and t.teacher_open_course_student_signin_ip =#teacherOpenCourseStudentSigninIp#
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+
+
+getValuesByQueryNotWithPermission
+===
+
+* 根据不为空的参数进行查询（不包含权限）
+
+  select t.*
+  from teacher_open_course_student_signin_log t
+  where 1=1
+  @if(!isEmpty(teacherOpenCourseStudentSigninId)){
+  and t.teacher_open_course_student_signin_id =#teacherOpenCourseStudentSigninId#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninIdPlural)){
+  and find_in_set(t.teacher_open_course_student_signin_id,#teacherOpenCourseStudentSigninIdPlural#)
+  @}
+  @if(!isEmpty(studentId)){
+  and t.student_id =#studentId#
+  @}
+  @if(!isEmpty(studentIdPlural)){
+  and find_in_set(t.student_id,#studentIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(schoolClassId)){
+  and t.school_class_id =#schoolClassId#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninAddTime)){
+  and t.teacher_open_course_student_signin_add_time =#teacherOpenCourseStudentSigninAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninType)){
+  and t.teacher_open_course_student_signin_type =#teacherOpenCourseStudentSigninType#
  @}
-  @if(!isEmpty(type)){
-  and t.type =#type#
+  @if(!isEmpty(teacherOpenCourseStudentSigninRemark)){
+  and t.teacher_open_course_student_signin_remark =#teacherOpenCourseStudentSigninRemark#
  @}
-  @if(!isEmpty(remark)){
-  and t.remark =#remark#
+  @if(!isEmpty(teacherOpenCourseStudentSigninIp)){
+  and t.teacher_open_course_student_signin_ip =#teacherOpenCourseStudentSigninIp#
  @}
  @if(!isEmpty(orgId)){
  and t.org_id =#orgId#
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md
@ -16,23 +16,38 @@ queryByCondition
  @if(!isEmpty(teacherOpenCourseStudentSigninSettingIdPlural)){
  and find_in_set(t.teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#)
  @}
-  @if(!isEmpty(openCourseId)){
-  and t.open_course_id =#openCourseId#
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
  @}
-  @if(!isEmpty(openCourseIdPlural)){
-  and find_in_set(t.open_course_id,#openCourseIdPlural#)
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
  @}
-  @if(!isEmpty(schoolClassId)){
-  and t.school_class_id =#schoolClassId#
+  @if(!isEmpty(schoolClassIds)){
+  and t.school_class_ids =#schoolClassIds#
  @}
-  @if(!isEmpty(schoolClassIdPlural)){
-  and find_in_set(t.school_class_id,#schoolClassIdPlural#)
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingType)){
+  and t.teacher_open_course_student_signin_setting_type =#teacherOpenCourseStudentSigninSettingType#
  @}
-  @if(!isEmpty(type)){
-  and t.type =#type#
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingValue)){
+  and t.teacher_open_course_student_signin_setting_value =#teacherOpenCourseStudentSigninSettingValue#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingStartTime)){
+  and t.teacher_open_course_student_signin_setting_start_time =#teacherOpenCourseStudentSigninSettingStartTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingEndTime)){
+  and t.teacher_open_course_student_signin_setting_end_time =#teacherOpenCourseStudentSigninSettingEndTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingAddTime)){
+  and t.teacher_open_course_student_signin_setting_add_time =#teacherOpenCourseStudentSigninSettingAddTime#
+  @}
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingStatus) && isEmpty(teacherOpenCourseStudentSigninSettingStatusPlural)){
+  and t.teacher_open_course_student_signin_setting_status != 2
+  @}else{
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingStatus)){
+  and t.teacher_open_course_student_signin_setting_status =#teacherOpenCourseStudentSigninSettingStatus#
+  @}else if(!isEmpty(teacherOpenCourseStudentSigninSettingStatusPlural)){
+  and find_in_set(t.teacher_open_course_student_signin_setting_status,#teacherOpenCourseStudentSigninSettingStatusPlural#)
  @}
-  @if(!isEmpty(value)){
-  and t.value =#value#
  @}
  @if(!isEmpty(orgId)){
  and t.org_id =#orgId#
@ -46,9 +61,6 @@ queryByCondition
  @if(!isEmpty(userIdPlural)){
  and find_in_set(t.user_id,#userIdPlural#)
  @}
-  @if(!isEmpty(createTime)){
-  and t.create_time =#createTime#
-  @}


 queryByConditionQuery
@ -67,23 +79,38 @@ queryByConditionQuery
  @if(!isEmpty(teacherOpenCourseStudentSigninSettingIdPlural)){
  and find_in_set(t.teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#)
  @}
-  @if(!isEmpty(openCourseId)){
-  and t.open_course_id =#openCourseId#
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(schoolClassIds)){
+  and t.school_class_ids =#schoolClassIds#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingType)){
+  and t.teacher_open_course_student_signin_setting_type =#teacherOpenCourseStudentSigninSettingType#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingValue)){
+  and t.teacher_open_course_student_signin_setting_value =#teacherOpenCourseStudentSigninSettingValue#
  @}
-  @if(!isEmpty(openCourseIdPlural)){
-  and find_in_set(t.open_course_id,#openCourseIdPlural#)
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingStartTime)){
+  and t.teacher_open_course_student_signin_setting_start_time =#teacherOpenCourseStudentSigninSettingStartTime#
  @}
-  @if(!isEmpty(schoolClassId)){
-  and t.school_class_id =#schoolClassId#
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingEndTime)){
+  and t.teacher_open_course_student_signin_setting_end_time =#teacherOpenCourseStudentSigninSettingEndTime#
  @}
-  @if(!isEmpty(schoolClassIdPlural)){
-  and find_in_set(t.school_class_id,#schoolClassIdPlural#)
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingAddTime)){
+  and t.teacher_open_course_student_signin_setting_add_time =#teacherOpenCourseStudentSigninSettingAddTime#
  @}
-  @if(!isEmpty(type)){
-  and t.type =#type#
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingStatus) && isEmpty(teacherOpenCourseStudentSigninSettingStatusPlural)){
+  and t.teacher_open_course_student_signin_setting_status != 2
+  @}else{
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingStatus)){
+  and t.teacher_open_course_student_signin_setting_status =#teacherOpenCourseStudentSigninSettingStatus#
+  @}else if(!isEmpty(teacherOpenCourseStudentSigninSettingStatusPlural)){
+  and find_in_set(t.teacher_open_course_student_signin_setting_status,#teacherOpenCourseStudentSigninSettingStatusPlural#)
  @}
-  @if(!isEmpty(value)){
-  and t.value =#value#
  @}
  @if(!isEmpty(orgId)){
  and t.org_id =#orgId#
@ -97,9 +124,6 @@ queryByConditionQuery
  @if(!isEmpty(userIdPlural)){
  and find_in_set(t.user_id,#userIdPlural#)
  @}
-  @if(!isEmpty(createTime)){
-  and t.create_time =#createTime#
-  @}



@ -107,7 +131,15 @@ queryByConditionQuery
 deleteTeacherOpenCourseStudentSigninSettingByIds
 ===

-* 批量删除
+* 批量删除（假删除）
+
+  update teacher_open_course_student_signin_setting set teacher_open_course_student_signin_setting_status = 2 where find_in_set(teacher_open_course_student_signin_setting_id,#ids#)
+
+
+deleteByIds
+===    
+
+* 批量删除（真删除）

  delete from teacher_open_course_student_signin_setting where find_in_set(teacher_open_course_student_signin_setting_id,#ids#)

@ -126,32 +158,60 @@ updateGivenByIds

  update teacher_open_course_student_signin_setting
  set
-  @if(contain("openCourseId",_given)){
-  @if(isEmpty(openCourseId)){
-  open_course_id = null ,
+  @if(contain("teacherOpenCourseId",_given)){
+  @if(isEmpty(teacherOpenCourseId)){
+  teacher_open_course_id = null ,
  @}else{
-  open_course_id = #openCourseId# ,
+  teacher_open_course_id = #teacherOpenCourseId# ,
  @}
  @}
-  @if(contain("schoolClassId",_given)){
-  @if(isEmpty(schoolClassId)){
-  school_class_id = null ,
+  @if(contain("schoolClassIds",_given)){
+  @if(isEmpty(schoolClassIds)){
+  school_class_ids = null ,
  @}else{
-  school_class_id = #schoolClassId# ,
+  school_class_ids = #schoolClassIds# ,
  @}
  @}
-  @if(contain("type",_given)){
-  @if(isEmpty(type)){
-  type = null ,
+  @if(contain("teacherOpenCourseStudentSigninSettingType",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingType)){
+  teacher_open_course_student_signin_setting_type = null ,
  @}else{
-  type = #type# ,
+  teacher_open_course_student_signin_setting_type = #teacherOpenCourseStudentSigninSettingType# ,
  @}
  @}
-  @if(contain("value",_given)){
-  @if(isEmpty(value)){
-  value = null ,
+  @if(contain("teacherOpenCourseStudentSigninSettingValue",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingValue)){
+  teacher_open_course_student_signin_setting_value = null ,
  @}else{
-  value = #value# ,
+  teacher_open_course_student_signin_setting_value = #teacherOpenCourseStudentSigninSettingValue# ,
+  @}
+  @}
+  @if(contain("teacherOpenCourseStudentSigninSettingStartTime",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingStartTime)){
+  teacher_open_course_student_signin_setting_start_time = null ,
+  @}else{
+  teacher_open_course_student_signin_setting_start_time = #teacherOpenCourseStudentSigninSettingStartTime# ,
+  @}
+  @}
+  @if(contain("teacherOpenCourseStudentSigninSettingEndTime",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingEndTime)){
+  teacher_open_course_student_signin_setting_end_time = null ,
+  @}else{
+  teacher_open_course_student_signin_setting_end_time = #teacherOpenCourseStudentSigninSettingEndTime# ,
+  @}
+  @}
+  @if(contain("teacherOpenCourseStudentSigninSettingAddTime",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingAddTime)){
+  teacher_open_course_student_signin_setting_add_time = null ,
+  @}else{
+  teacher_open_course_student_signin_setting_add_time = #teacherOpenCourseStudentSigninSettingAddTime# ,
+  @}
+  @}
+  @if(contain("teacherOpenCourseStudentSigninSettingStatus",_given)){
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingStatus)){
+  teacher_open_course_student_signin_setting_status = null ,
+  @}else{
+  teacher_open_course_student_signin_setting_status = #teacherOpenCourseStudentSigninSettingStatus# ,
  @}
  @}
  @if(contain("orgId",_given)){
@ -168,13 +228,6 @@ updateGivenByIds
  user_id = #userId# ,
  @}
  @}
-  @if(contain("createTime",_given)){
-  @if(isEmpty(createTime)){
-  create_time = null ,
-  @}else{
-  create_time = #createTime# ,
-  @}
-  @}
  teacher_open_course_student_signin_setting_id = teacher_open_course_student_signin_setting_id
  where find_in_set(teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#)

@ -191,17 +244,31 @@ getTeacherOpenCourseStudentSigninSettingValues
  @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
  and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
  @}
-  @if(!isEmpty(openCourseId)){
-  and t.open_course_id =#openCourseId#
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(schoolClassIds)){
+  and t.school_class_ids =#schoolClassIds#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingType)){
+  and t.teacher_open_course_student_signin_setting_type =#teacherOpenCourseStudentSigninSettingType#
  @}
-  @if(!isEmpty(schoolClassId)){
-  and t.school_class_id =#schoolClassId#
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingValue)){
+  and t.teacher_open_course_student_signin_setting_value =#teacherOpenCourseStudentSigninSettingValue#
  @}
-  @if(!isEmpty(type)){
-  and t.type =#type#
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingStartTime)){
+  and t.teacher_open_course_student_signin_setting_start_time =#teacherOpenCourseStudentSigninSettingStartTime#
  @}
-  @if(!isEmpty(value)){
-  and t.value =#value#
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingEndTime)){
+  and t.teacher_open_course_student_signin_setting_end_time =#teacherOpenCourseStudentSigninSettingEndTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingAddTime)){
+  and t.teacher_open_course_student_signin_setting_add_time =#teacherOpenCourseStudentSigninSettingAddTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingStatus)){
+  and t.teacher_open_course_student_signin_setting_status =#teacherOpenCourseStudentSigninSettingStatus#
+  @}else{
+  and t.teacher_open_course_student_signin_setting_status != 2
  @}
  @if(!isEmpty(orgId)){
  and t.org_id =#orgId#
@ -209,9 +276,6 @@ getTeacherOpenCourseStudentSigninSettingValues
  @if(!isEmpty(userId)){
  and t.user_id =#userId#
  @}
-  @if(!isEmpty(createTime)){
-  and t.create_time =#createTime#
-  @}


 getValuesByQuery
@ -228,23 +292,38 @@ getValuesByQuery
  @if(!isEmpty(teacherOpenCourseStudentSigninSettingIdPlural)){
  and find_in_set(t.teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#)
  @}
-  @if(!isEmpty(openCourseId)){
-  and t.open_course_id =#openCourseId#
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(schoolClassIds)){
+  and t.school_class_ids =#schoolClassIds#
  @}
-  @if(!isEmpty(openCourseIdPlural)){
-  and find_in_set(t.open_course_id,#openCourseIdPlural#)
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingType)){
+  and t.teacher_open_course_student_signin_setting_type =#teacherOpenCourseStudentSigninSettingType#
  @}
-  @if(!isEmpty(schoolClassId)){
-  and t.school_class_id =#schoolClassId#
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingValue)){
+  and t.teacher_open_course_student_signin_setting_value =#teacherOpenCourseStudentSigninSettingValue#
  @}
-  @if(!isEmpty(schoolClassIdPlural)){
-  and find_in_set(t.school_class_id,#schoolClassIdPlural#)
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingStartTime)){
+  and t.teacher_open_course_student_signin_setting_start_time =#teacherOpenCourseStudentSigninSettingStartTime#
  @}
-  @if(!isEmpty(type)){
-  and t.type =#type#
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingEndTime)){
+  and t.teacher_open_course_student_signin_setting_end_time =#teacherOpenCourseStudentSigninSettingEndTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingAddTime)){
+  and t.teacher_open_course_student_signin_setting_add_time =#teacherOpenCourseStudentSigninSettingAddTime#
+  @}
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingStatus) && isEmpty(teacherOpenCourseStudentSigninSettingStatusPlural)){
+  and t.teacher_open_course_student_signin_setting_status != 2
+  @}else{
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingStatus)){
+  and t.teacher_open_course_student_signin_setting_status =#teacherOpenCourseStudentSigninSettingStatus#
+  @}else if(!isEmpty(teacherOpenCourseStudentSigninSettingStatusPlural)){
+  and find_in_set(t.teacher_open_course_student_signin_setting_status,#teacherOpenCourseStudentSigninSettingStatusPlural#)
  @}
-  @if(!isEmpty(value)){
-  and t.value =#value#
  @}
  @if(!isEmpty(orgId)){
  and t.org_id =#orgId#
@ -258,8 +337,66 @@ getValuesByQuery
  @if(!isEmpty(userIdPlural)){
  and find_in_set(t.user_id,#userIdPlural#)
  @}
-  @if(!isEmpty(createTime)){
-  and t.create_time =#createTime#
+
+
+getValuesByQueryNotWithPermission
+===
+
+* 根据不为空的参数进行查询（不包含权限）
+
+  select t.*
+  from teacher_open_course_student_signin_setting t
+  where 1=1
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingId)){
+  and t.teacher_open_course_student_signin_setting_id =#teacherOpenCourseStudentSigninSettingId#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingIdPlural)){
+  and find_in_set(t.teacher_open_course_student_signin_setting_id,#teacherOpenCourseStudentSigninSettingIdPlural#)
+  @}
+  @if(!isEmpty(teacherOpenCourseId)){
+  and t.teacher_open_course_id =#teacherOpenCourseId#
+  @}
+  @if(!isEmpty(teacherOpenCourseIdPlural)){
+  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
+  @}
+  @if(!isEmpty(schoolClassIds)){
+  and t.school_class_ids =#schoolClassIds#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingType)){
+  and t.teacher_open_course_student_signin_setting_type =#teacherOpenCourseStudentSigninSettingType#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingValue)){
+  and t.teacher_open_course_student_signin_setting_value =#teacherOpenCourseStudentSigninSettingValue#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingStartTime)){
+  and t.teacher_open_course_student_signin_setting_start_time =#teacherOpenCourseStudentSigninSettingStartTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingEndTime)){
+  and t.teacher_open_course_student_signin_setting_end_time =#teacherOpenCourseStudentSigninSettingEndTime#
+  @}
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingAddTime)){
+  and t.teacher_open_course_student_signin_setting_add_time =#teacherOpenCourseStudentSigninSettingAddTime#
+  @}
+  @if(isEmpty(teacherOpenCourseStudentSigninSettingStatus) && isEmpty(teacherOpenCourseStudentSigninSettingStatusPlural)){
+  and t.teacher_open_course_student_signin_setting_status != 2
+  @}else{
+  @if(!isEmpty(teacherOpenCourseStudentSigninSettingStatus)){
+  and t.teacher_open_course_student_signin_setting_status =#teacherOpenCourseStudentSigninSettingStatus#
+  @}else if(!isEmpty(teacherOpenCourseStudentSigninSettingStatusPlural)){
+  and find_in_set(t.teacher_open_course_student_signin_setting_status,#teacherOpenCourseStudentSigninSettingStatusPlural#)
+  @}
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
  @}


--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninLog/index.js
@ -49,11 +49,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                    hide:$.isEmpty(sx_['studentIdText'])?false:sx_['studentIdText'],
                },
                {
-                    field : 'openCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
+                    field : 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
                    title : '开课ID',
                    align:"center",
                    hideField :false,
-                    hide:$.isEmpty(sx_['openCourseIdText'])?false:sx_['openCourseIdText'],
+                    hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'],
                },
                {
                    field : 'schoolClassIdText', //数据字典类型为 school_class.class_name.class_status=1
@ -63,25 +63,32 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                    hide:$.isEmpty(sx_['schoolClassIdText'])?false:sx_['schoolClassIdText'],
                },
                {
-                    field : 'addTime', 
+                    field : 'teacherOpenCourseStudentSigninAddTime', 
                    title : '签到日期',
                    align:"center",
                    hideField :false,
-                    hide:$.isEmpty(sx_['addTime'])?false:sx_['addTime'],
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninAddTime'])?false:sx_['teacherOpenCourseStudentSigninAddTime'],
                },
                {
-                    field : 'typeText', //数据字典类型为 student_signin_type
+                    field : 'teacherOpenCourseStudentSigninTypeText', //数据字典类型为 student_signin_type
                    title : '签到方式 (数据字典 student_signin_type)',
                    align:"center",
                    hideField :false,
-                    hide:$.isEmpty(sx_['typeText'])?false:sx_['typeText'],
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninTypeText'])?false:sx_['teacherOpenCourseStudentSigninTypeText'],
                },
                {
-                    field : 'remark', 
+                    field : 'teacherOpenCourseStudentSigninRemark', 
                    title : '备注（缺勤理由）',
                    align:"center",
                    hideField :false,
-                    hide:$.isEmpty(sx_['remark'])?false:sx_['remark'],
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninRemark'])?false:sx_['teacherOpenCourseStudentSigninRemark'],
+                },
+                {
+                    field : 'teacherOpenCourseStudentSigninIp', 
+                    title : '签到的IP',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninIp'])?false:sx_['teacherOpenCourseStudentSigninIp'],
                },
                {
                    field : 'orgId', 
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js
@ -42,32 +42,60 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                        width : 60,
                },
                {
-                    field : 'openCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
+                    field : 'teacherOpenCourseIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1
                    title : '开课ID',
                    align:"center",
                    hideField :false,
-                    hide:$.isEmpty(sx_['openCourseIdText'])?false:sx_['openCourseIdText'],
+                    hide:$.isEmpty(sx_['teacherOpenCourseIdText'])?false:sx_['teacherOpenCourseIdText'],
                },
                {
-                    field : 'schoolClassIdText', //数据字典类型为 school_class.class_name.class_status=1
-                    title : '班级ID',
+                    field : 'schoolClassIdsText', //数据字典类型为 school_class.class_name.class_status=1
+                    title : '班级ID集合',
                    align:"center",
                    hideField :false,
-                    hide:$.isEmpty(sx_['schoolClassIdText'])?false:sx_['schoolClassIdText'],
+                    hide:$.isEmpty(sx_['schoolClassIdsText'])?false:sx_['schoolClassIdsText'],
                },
                {
-                    field : 'typeText', //数据字典类型为 student_signin_type
+                    field : 'teacherOpenCourseStudentSigninSettingTypeText', //数据字典类型为 student_signin_type
                    title : '签到方式 (数据字典 student_signin_type)',
                    align:"center",
                    hideField :false,
-                    hide:$.isEmpty(sx_['typeText'])?false:sx_['typeText'],
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninSettingTypeText'])?false:sx_['teacherOpenCourseStudentSigninSettingTypeText'],
                },
                {
-                    field : 'value', 
+                    field : 'teacherOpenCourseStudentSigninSettingValue', 
                    title : '设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置',
                    align:"center",
                    hideField :false,
-                    hide:$.isEmpty(sx_['value'])?false:sx_['value'],
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninSettingValue'])?false:sx_['teacherOpenCourseStudentSigninSettingValue'],
+                },
+                {
+                    field : 'teacherOpenCourseStudentSigninSettingStartTime', 
+                    title : '签到开始日期',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninSettingStartTime'])?false:sx_['teacherOpenCourseStudentSigninSettingStartTime'],
+                },
+                {
+                    field : 'teacherOpenCourseStudentSigninSettingEndTime', 
+                    title : '签到结束日期',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninSettingEndTime'])?false:sx_['teacherOpenCourseStudentSigninSettingEndTime'],
+                },
+                {
+                    field : 'teacherOpenCourseStudentSigninSettingAddTime', 
+                    title : '创建时间',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninSettingAddTime'])?false:sx_['teacherOpenCourseStudentSigninSettingAddTime'],
+                },
+                {
+                    field : 'teacherOpenCourseStudentSigninSettingStatusText', //数据字典类型为 global_status
+                    title : '状态 1正常 2删除',
+                    align:"center",
+                    hideField :false,
+                    hide:$.isEmpty(sx_['teacherOpenCourseStudentSigninSettingStatusText'])?false:sx_['teacherOpenCourseStudentSigninSettingStatusText'],
                },
                {
                    field : 'orgId', 
@ -82,13 +110,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                    align:"center",
                    hideField :false,
                    hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
-                },
-                {
-                    field : 'createTime', 
-                    title : '创建时间',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['createTime'])?false:sx_['createTime'],
                }
                ,{
                    field : 'operation_',title : '操作',align:"center", templet: function (d) {
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/add.html
@ -14,7 +14,7 @@
            	<label class="layui-form-label">开课ID</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
-											id="openCourseId" name="openCourseId" value="${teacherOpenCourseStudentSigninLog.openCourseId}" layVerify="" />
+											id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseStudentSigninLog.teacherOpenCourseId}" layVerify="" />
 				</div>
            </div>
        </div>
@ -31,7 +31,7 @@
            <div class="layui-inline">
            	<label class="layui-form-label">签到日期</label>
 				<div class="layui-input-inline">
-					<input type="text" id="addTime" name="addTime"  value="${teacherOpenCourseStudentSigninLog.addTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
+					<input type="text" id="teacherOpenCourseStudentSigninAddTime" name="teacherOpenCourseStudentSigninAddTime"  value="${teacherOpenCourseStudentSigninLog.teacherOpenCourseStudentSigninAddTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
 				</div>
            </div>
        </div>
@ -42,25 +42,35 @@
            	<label class="layui-form-label">签到方式 (数据字典 student_signin_type)</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="student_signin_type"
-											id="type" name="type" value="${teacherOpenCourseStudentSigninLog.type}" layVerify="" />
+											id="teacherOpenCourseStudentSigninType" name="teacherOpenCourseStudentSigninType" value="${teacherOpenCourseStudentSigninLog.teacherOpenCourseStudentSigninType}" layVerify="" />
 				</div>
            </div>
            <div class="layui-inline">
            	<label class="layui-form-label">备注（缺勤理由）</label>
 				<div class="layui-input-inline">
-					<input type="text" id="remark" name="remark"  value="${teacherOpenCourseStudentSigninLog.remark}"   class="layui-input" >
+					<input type="text" id="teacherOpenCourseStudentSigninRemark" name="teacherOpenCourseStudentSigninRemark"  value="${teacherOpenCourseStudentSigninLog.teacherOpenCourseStudentSigninRemark}"   class="layui-input" >
 				</div>
            </div>
        </div>
    </div>
    <div class="layui-row">
        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">签到的IP</label>
+				<div class="layui-input-inline">
+					<input type="text" id="teacherOpenCourseStudentSigninIp" name="teacherOpenCourseStudentSigninIp"  value="${teacherOpenCourseStudentSigninLog.teacherOpenCourseStudentSigninIp}"   class="layui-input" >
+				</div>
+            </div>
            <div class="layui-inline">
            	<label class="layui-form-label">组织ID</label>
 				<div class="layui-input-inline">
 					<input type="text" id="orgId" name="orgId"  value="${teacherOpenCourseStudentSigninLog.orgId}"   class="layui-input" >
 				</div>
            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
            <div class="layui-inline">
            	<label class="layui-form-label">用户ID</label>
 				<div class="layui-input-inline">
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/edit.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/edit.html
@ -14,7 +14,7 @@
            	<label class="layui-form-label">开课ID</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
-						id="openCourseId" name="openCourseId" value="${teacherOpenCourseStudentSigninLog.openCourseId}" layVerify="" />
+						id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseStudentSigninLog.teacherOpenCourseId}" layVerify="" />
 				</div>
            </div>
        </div>
@ -31,7 +31,7 @@
            <div class="layui-inline">
            	<label class="layui-form-label">签到日期</label>
 				<div class="layui-input-inline">
-					<input type="text" id="addTime" name="addTime"  value="${teacherOpenCourseStudentSigninLog.addTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
+					<input type="text" id="teacherOpenCourseStudentSigninAddTime" name="teacherOpenCourseStudentSigninAddTime"  value="${teacherOpenCourseStudentSigninLog.teacherOpenCourseStudentSigninAddTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
 				</div>
            </div>
        </div>
@ -42,25 +42,35 @@
            	<label class="layui-form-label">签到方式 (数据字典 student_signin_type)</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="student_signin_type"
-						id="type" name="type" value="${teacherOpenCourseStudentSigninLog.type}" layVerify="" />
+						id="teacherOpenCourseStudentSigninType" name="teacherOpenCourseStudentSigninType" value="${teacherOpenCourseStudentSigninLog.teacherOpenCourseStudentSigninType}" layVerify="" />
 				</div>
            </div>
            <div class="layui-inline">
            	<label class="layui-form-label">备注（缺勤理由）</label>
 				<div class="layui-input-inline">
-					<input type="text" id="remark" name="remark"  value="${teacherOpenCourseStudentSigninLog.remark}"   class="layui-input" >
+					<input type="text" id="teacherOpenCourseStudentSigninRemark" name="teacherOpenCourseStudentSigninRemark"  value="${teacherOpenCourseStudentSigninLog.teacherOpenCourseStudentSigninRemark}"   class="layui-input" >
 				</div>
            </div>
        </div>
    </div>
    <div class="layui-row">
        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">签到的IP</label>
+				<div class="layui-input-inline">
+					<input type="text" id="teacherOpenCourseStudentSigninIp" name="teacherOpenCourseStudentSigninIp"  value="${teacherOpenCourseStudentSigninLog.teacherOpenCourseStudentSigninIp}"   class="layui-input" >
+				</div>
+            </div>
            <div class="layui-inline">
            	<label class="layui-form-label">组织ID</label>
 				<div class="layui-input-inline">
 					<input type="text" id="orgId" name="orgId"  value="${teacherOpenCourseStudentSigninLog.orgId}"   class="layui-input" >
 				</div>
            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
            <div class="layui-inline">
            	<label class="layui-form-label">用户ID</label>
 				<div class="layui-input-inline">
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/add.html
@ -7,14 +7,14 @@
            	<label class="layui-form-label">开课ID</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
-											id="openCourseId" name="openCourseId" value="${teacherOpenCourseStudentSigninSetting.openCourseId}" layVerify="" />
+											id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseId}" layVerify="" />
 				</div>
            </div>
            <div class="layui-inline">
-            	<label class="layui-form-label">班级ID</label>
+            	<label class="layui-form-label">班级ID集合</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1"
-											id="schoolClassId" name="schoolClassId" value="${teacherOpenCourseStudentSigninSetting.schoolClassId}" layVerify="" />
+											id="schoolClassIds" name="schoolClassIds" value="${teacherOpenCourseStudentSigninSetting.schoolClassIds}" layVerify="" />
 				</div>
            </div>
        </div>
@ -25,13 +25,13 @@
            	<label class="layui-form-label">签到方式 (数据字典 student_signin_type)</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="student_signin_type"
-											id="type" name="type" value="${teacherOpenCourseStudentSigninSetting.type}" layVerify="" />
+											id="teacherOpenCourseStudentSigninSettingType" name="teacherOpenCourseStudentSigninSettingType" value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingType}" layVerify="" />
 				</div>
            </div>
            <div class="layui-inline">
            	<label class="layui-form-label">设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置</label>
 				<div class="layui-input-inline">
-					<input type="text" id="value" name="value"  value="${teacherOpenCourseStudentSigninSetting.value}"   class="layui-input" >
+					<input type="text" id="teacherOpenCourseStudentSigninSettingValue" name="teacherOpenCourseStudentSigninSettingValue"  value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingValue}"   class="layui-input" >
 				</div>
            </div>
        </div>
@ -39,15 +39,15 @@
    <div class="layui-row">
        <div class="layui-form-item">
            <div class="layui-inline">
-            	<label class="layui-form-label">组织ID</label>
+            	<label class="layui-form-label">签到开始日期</label>
 				<div class="layui-input-inline">
-					<input type="text" id="orgId" name="orgId"  value="${teacherOpenCourseStudentSigninSetting.orgId}"   class="layui-input" >
+					<input type="text" id="teacherOpenCourseStudentSigninSettingStartTime" name="teacherOpenCourseStudentSigninSettingStartTime"  value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingStartTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
 				</div>
            </div>
            <div class="layui-inline">
-            	<label class="layui-form-label">用户ID</label>
+            	<label class="layui-form-label">签到结束日期</label>
 				<div class="layui-input-inline">
-					<input type="text" id="userId" name="userId"  value="${teacherOpenCourseStudentSigninSetting.userId}"   class="layui-input" >
+					<input type="text" id="teacherOpenCourseStudentSigninSettingEndTime" name="teacherOpenCourseStudentSigninSettingEndTime"  value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingEndTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
 				</div>
            </div>
        </div>
@ -57,7 +57,30 @@
            <div class="layui-inline">
            	<label class="layui-form-label">创建时间</label>
 				<div class="layui-input-inline">
-					<input type="text" id="createTime" name="createTime"  value="${teacherOpenCourseStudentSigninSetting.createTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
+					<input type="text" id="teacherOpenCourseStudentSigninSettingAddTime" name="teacherOpenCourseStudentSigninSettingAddTime"  value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingAddTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">状态 1正常 2删除</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="global_status"
+											id="teacherOpenCourseStudentSigninSettingStatus" name="teacherOpenCourseStudentSigninSettingStatus" value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingStatus}" layVerify="" />
+				</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">组织ID</label>
+				<div class="layui-input-inline">
+					<input type="text" id="orgId" name="orgId"  value="${teacherOpenCourseStudentSigninSetting.orgId}"   class="layui-input" >
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">用户ID</label>
+				<div class="layui-input-inline">
+					<input type="text" id="userId" name="userId"  value="${teacherOpenCourseStudentSigninSetting.userId}"   class="layui-input" >
 				</div>
            </div>
        </div>
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/edit.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/edit.html
@ -7,14 +7,14 @@
            	<label class="layui-form-label">开课ID</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
-						id="openCourseId" name="openCourseId" value="${teacherOpenCourseStudentSigninSetting.openCourseId}" layVerify="" />
+						id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseId}" layVerify="" />
 				</div>
            </div>
            <div class="layui-inline">
-            	<label class="layui-form-label">班级ID</label>
+            	<label class="layui-form-label">班级ID集合</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1"
-						id="schoolClassId" name="schoolClassId" value="${teacherOpenCourseStudentSigninSetting.schoolClassId}" layVerify="" />
+						id="schoolClassIds" name="schoolClassIds" value="${teacherOpenCourseStudentSigninSetting.schoolClassIds}" layVerify="" />
 				</div>
            </div>
        </div>
@ -25,13 +25,13 @@
            	<label class="layui-form-label">签到方式 (数据字典 student_signin_type)</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="student_signin_type"
-						id="type" name="type" value="${teacherOpenCourseStudentSigninSetting.type}" layVerify="" />
+						id="teacherOpenCourseStudentSigninSettingType" name="teacherOpenCourseStudentSigninSettingType" value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingType}" layVerify="" />
 				</div>
            </div>
            <div class="layui-inline">
            	<label class="layui-form-label">设置的值：数据例子：IP: x.x.x.x-x.x.x.x，验证码：xxxx，手动签到：无需设置</label>
 				<div class="layui-input-inline">
-					<input type="text" id="value" name="value"  value="${teacherOpenCourseStudentSigninSetting.value}"   class="layui-input" >
+					<input type="text" id="teacherOpenCourseStudentSigninSettingValue" name="teacherOpenCourseStudentSigninSettingValue"  value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingValue}"   class="layui-input" >
 				</div>
            </div>
        </div>
@ -39,15 +39,15 @@
    <div class="layui-row">
        <div class="layui-form-item">
            <div class="layui-inline">
-            	<label class="layui-form-label">组织ID</label>
+            	<label class="layui-form-label">签到开始日期</label>
 				<div class="layui-input-inline">
-					<input type="text" id="orgId" name="orgId"  value="${teacherOpenCourseStudentSigninSetting.orgId}"   class="layui-input" >
+					<input type="text" id="teacherOpenCourseStudentSigninSettingStartTime" name="teacherOpenCourseStudentSigninSettingStartTime"  value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingStartTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
 				</div>
            </div>
            <div class="layui-inline">
-            	<label class="layui-form-label">用户ID</label>
+            	<label class="layui-form-label">签到结束日期</label>
 				<div class="layui-input-inline">
-					<input type="text" id="userId" name="userId"  value="${teacherOpenCourseStudentSigninSetting.userId}"   class="layui-input" >
+					<input type="text" id="teacherOpenCourseStudentSigninSettingEndTime" name="teacherOpenCourseStudentSigninSettingEndTime"  value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingEndTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
 				</div>
            </div>
        </div>
@ -57,7 +57,30 @@
            <div class="layui-inline">
            	<label class="layui-form-label">创建时间</label>
 				<div class="layui-input-inline">
-					<input type="text" id="createTime" name="createTime"  value="${teacherOpenCourseStudentSigninSetting.createTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
+					<input type="text" id="teacherOpenCourseStudentSigninSettingAddTime" name="teacherOpenCourseStudentSigninSettingAddTime"  value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingAddTime,"yyyy-MM-dd"}"   class="layui-input input-date" >
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">状态 1正常 2删除</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="global_status"
+						id="teacherOpenCourseStudentSigninSettingStatus" name="teacherOpenCourseStudentSigninSettingStatus" value="${teacherOpenCourseStudentSigninSetting.teacherOpenCourseStudentSigninSettingStatus}" layVerify="" />
+				</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            	<label class="layui-form-label">组织ID</label>
+				<div class="layui-input-inline">
+					<input type="text" id="orgId" name="orgId"  value="${teacherOpenCourseStudentSigninSetting.orgId}"   class="layui-input" >
+				</div>
+            </div>
+            <div class="layui-inline">
+            	<label class="layui-form-label">用户ID</label>
+				<div class="layui-input-inline">
+					<input type="text" id="userId" name="userId"  value="${teacherOpenCourseStudentSigninSetting.userId}"   class="layui-input" >
 				</div>
            </div>
        </div>