From 0bff01f13f6122be54a6664528d6b1e442b85d65 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Thu, 13 Oct 2022 21:28:32 +0800
Subject: [PATCH] =?UTF-8?q?ID=E7=B1=BB=E5=9E=8B=E6=94=B9Long?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/ibeetl/jlw/entity/UniversitySystem.java | 6 +++---
.../TeacherOpenCourseStudentSigninSettingQuery.java | 12 ++++++++++++
.../ibeetl/jlw/web/query/UniversitySystemQuery.java | 6 +++---
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java
index f4e92025..c5f8390f 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java
@@ -44,7 +44,7 @@ public class UniversitySystem extends BaseEntity{
//院系ID（学院ID）
- private Integer universityFacultyId ;
+ private Long universityFacultyId ;
//用户ID
@@ -138,13 +138,13 @@ public class UniversitySystem extends BaseEntity{
/**院系ID（学院ID）
*@return
*/
- public Integer getUniversityFacultyId(){
+ public Long getUniversityFacultyId(){
return universityFacultyId;
}
/**院系ID（学院ID）
*@param universityFacultyId
*/
- public void setUniversityFacultyId(Integer universityFacultyId){
+ public void setUniversityFacultyId(Long universityFacultyId){
this.universityFacultyId = universityFacultyId;
}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java
index 8f6d2254..e653e808 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java
@@ -23,36 +23,48 @@ import static com.ibeetl.jlw.entity.dto.TeacherOpenCourseStudentSigninLogSigninD
@Data
@SuppressWarnings("ALL")
public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam {
+
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
@Query(name = "ID", display = false)
private Long teacherOpenCourseStudentSigninSettingId;
+
@NotNull(message = "开课ID不能为空", groups =ValidateConfig.ADD.class)
@Query(name = "开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
private Long teacherOpenCourseId;
+
@Query(name = "班级ID集合", display = true,type=Query.TYPE_DICT,dict="school_class.class_name.class_status=1")
// 只接收ALL字符，或者带有纯数字的ID。逗号隔开
@Pattern(regexp = "ALL|\\d+", message = "班级ID集合不能为空", groups = ValidateConfig.ADD.class)
@NotBlank(message = "班级ID集合不能为空", groups =ValidateConfig.ADD.class)
private String schoolClassIds;
+
@NotBlank(message = "签到方式不能为空", groups =ValidateConfig.ADD.class)
@Query(name = "签到方式", display = true,type=Query.TYPE_DICT,dict="student_signin_type")
// (数据字典 student_signin_type)
private String teacherOpenCourseStudentSigninSettingType;
+
@Query(name = "设置的值", display = false)
//：数据例子：IP: x.x.x.x-x.x.x.x,x.x.x.x-x.x.x.x（多个IP段，逗号隔开），验证码：xxxx（长度6位验证），手动签到：无需设置（必须为空）
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;
+
//开始状态
private StartStatusEnum teacherOpenCourseStudentSigninSettingStartStatus;
+
@Query(name = "组织ID", display = false)
private Long orgId;
+
@Query(name = "用户ID", display = false)
private Long userId;
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java
index d3ef72d4..188bbbf8 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java
@@ -30,7 +30,7 @@ public class UniversitySystemQuery extends PageParam {
private Integer universitySystemStatus;
// @Query(name = "院系ID（学院ID）", display = false)
@Query(name = "院系ID", display = false)
- private Integer universityFacultyId;
+ private Long universityFacultyId;
@Query(name = "用户ID", display = false)
private Long userId;
@Query(name = "组织ID", display = false)
@@ -81,10 +81,10 @@ public class UniversitySystemQuery extends PageParam {
public void setUniversitySystemStatus(Integer universitySystemStatus ){
this.universitySystemStatus = universitySystemStatus;
}
- public Integer getUniversityFacultyId(){
+ public Long getUniversityFacultyId(){
return universityFacultyId;
}
- public void setUniversityFacultyId(Integer universityFacultyId ){
+ public void setUniversityFacultyId(Long universityFacultyId ){
this.universityFacultyId = universityFacultyId;
}
public Long getUserId(){