tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source 
# Conflicts:
#	web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java
beetlsql3-dev
姚丹ab 2 years ago
parent 0a2c6dd982 0bff01f13f
commit 060801bdd2
3 changed files with 67 additions and 85 deletions
Show Stats Download Patch File Download Diff File

6
web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java
Unescape Escape View File

@ -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;
}

12
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java
Unescape Escape View File

@ -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;

44
web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java
Unescape Escape View File

@ -19,20 +19,18 @@ public class UniversitySystemQuery extends PageParam {
private Long universitySystemId;
@Query(name = "专业名称", display = true)
private String universitySystemName;
@Query(name = "联系人", display = false)
@Query(name = "联系人", display = true)
private String universitySystemContact;
@Query(name = "联系人电话", display = false)
@Query(name = "联系人电话", display = true)
private String universitySystemContactTel;
@Query(name = "创建时间", display = false)
private Date universitySystemAddTime;
// @Query(name = "状态 （1正常 2删除）", display = true,type=Query.TYPE_DICT,dict="global_status")
@Query(name = "状态", display = false, type = Query.TYPE_DICT, dict = GLOBAL_STATUS)
@Query(name = "状态", display = true,type=Query.TYPE_DICT,dict=GLOBAL_STATUS)
private Integer universitySystemStatus;
// @Query(name = "院系ID（学院ID）", display = false)
@Query(name = "所属院系", display = true, type = Query.TYPE_DICT,
dict = "university_faculty.university_faculty_name.university_faculty_status=1")
/*@Query(name = "所属院系", display = true)*/
private Integer universityFacultyId;
@Query(name = "院系ID", display = false)
private Long universityFacultyId;
@Query(name = "用户ID", display = false)
private Long userId;
@Query(name = "组织ID", display = false)
@ -50,71 +48,54 @@ public class UniversitySystemQuery extends PageParam {
public Long getUniversitySystemId(){
return universitySystemId;
}
public void setUniversitySystemId(Long universitySystemId ){
this.universitySystemId = universitySystemId;
}
public String getUniversitySystemName(){
return universitySystemName;
}
public void setUniversitySystemName(String universitySystemName ){
this.universitySystemName = universitySystemName;
}
public String getUniversitySystemContact(){
return universitySystemContact;
}
public void setUniversitySystemContact(String universitySystemContact ){
this.universitySystemContact = universitySystemContact;
}
public String getUniversitySystemContactTel(){
return universitySystemContactTel;
}
public void setUniversitySystemContactTel(String universitySystemContactTel ){
this.universitySystemContactTel = universitySystemContactTel;
}
public Date getUniversitySystemAddTime(){
return universitySystemAddTime;
}
public void setUniversitySystemAddTime(Date universitySystemAddTime ){
this.universitySystemAddTime = universitySystemAddTime;
}
public Integer getUniversitySystemStatus(){
return universitySystemStatus;
}
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(){
return userId;
}
public void setUserId(Long userId ){
this.userId = userId;
}
public Long getOrgId(){
return orgId;
}
public void setOrgId(Long orgId ){
this.orgId = orgId;
}
@ -136,47 +117,36 @@ public class UniversitySystemQuery extends PageParam {
public String getUniversitySystemIdPlural(){
return universitySystemIdPlural;
}
public void setUniversitySystemIdPlural(String universitySystemIdPlural){
this.universitySystemIdPlural = universitySystemIdPlural;
}
public String getUniversitySystemStatusPlural(){
return universitySystemStatusPlural;
}
public void setUniversitySystemStatusPlural(String universitySystemStatusPlural){
this.universitySystemStatusPlural = universitySystemStatusPlural;
}
public String getUserIdPlural(){
return userIdPlural;
}
public void setUserIdPlural(String userIdPlural){
this.userIdPlural = userIdPlural;
}
public String getOrgIdPlural(){
return orgIdPlural;
}
public void setOrgIdPlural(String orgIdPlural){
this.orgIdPlural = orgIdPlural;
}
public String getUniversitySystemJsonStr(){
return universitySystemJsonStr;
}
public void setUniversitySystemJsonStr(String universitySystemJsonStr ){
this.universitySystemJsonStr = universitySystemJsonStr;
}
public String get_given() {
return _given;
}
public void set_given(String _given) {
this._given = _given;
}

Write Preview
Loading…
Cancel
Save