diff --git a/data_base_design/天泽数据大平台.pdb b/data_base_design/天泽数据大平台.pdb index 4b8ab6df..84bda596 100644 --- a/data_base_design/天泽数据大平台.pdb +++ b/data_base_design/天泽数据大平台.pdb @@ -1,5 +1,5 @@ - + @@ -6488,9 +6488,9 @@ LABL 0 新宋体,8,N 1662554252 -1662556171 +1662562641 -1 -((387116,22607), (406116,34431)) +((387116,21503), (406116,34431)) 0 12615680 16570034 @@ -16792,7 +16792,7 @@ COLLATE = utf8_general_ci student_client_link 1661850632 lx -1662556157 +1662562676 lx 学生端-链接 auto_increment = 1 @@ -16883,6 +16883,18 @@ COLLATE = utf8_general_ci int +963FA155-9A25-41BA-8B52-209536B76758 +student_client_link_open_type +student_client_link_open_type +1662562589 +lx +1662562676 +lx +打开方式（数据字典 student_client_link_open_type） +varchar(50) +50 + + 05CE988B-2AF5-4A63-9451-25A9EF95C5DB create_time create_time @@ -16893,7 +16905,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 1E5FBB70-DADA-4251-9BDA-85E132223109 user_id user_id @@ -16904,7 +16916,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + F1483087-727F-4BFE-97BA-9692FD8D1AB2 org_id org_id @@ -16917,7 +16929,7 @@ COLLATE = utf8_general_ci - + B095A5B3-D6C4-40C4-B986-497B3849ED54 Key_1 Key_1 @@ -16931,12 +16943,12 @@ COLLATE = utf8_general_ci - + - + BFEA4109-96F9-4074-AF58-B84D6574A7FC PUBLIC PUBLIC @@ -17064,7 +17076,7 @@ COLLATE = utf8_general_ci - + ABEFC813-1056-4507-A9A7-809C149B4ABE 1661954753 lx @@ -17287,7 +17299,7 @@ COLLATE = utf8_general_ci - + 5963E417-B2CE-431D-988A-B3493AAE5EE4 MySQL 5.0 MYSQL50 diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm index 4b8ab6df..45dbaa2c 100644 --- a/data_base_design/天泽数据大平台.pdm +++ b/data_base_design/天泽数据大平台.pdm @@ -1,5 +1,5 @@ - + @@ -6488,9 +6488,9 @@ LABL 0 新宋体,8,N 1662554252 -1662556171 +1662562683 -1 -((387116,22607), (406116,34431)) +((387116,21503), (417150,34431)) 0 12615680 16570034 @@ -16792,7 +16792,7 @@ COLLATE = utf8_general_ci student_client_link 1661850632 lx -1662556157 +1662562676 lx 学生端-链接 auto_increment = 1 @@ -16883,6 +16883,18 @@ COLLATE = utf8_general_ci int +963FA155-9A25-41BA-8B52-209536B76758 +student_client_link_open_type +student_client_link_open_type +1662562589 +lx +1662562676 +lx +打开方式（数据字典 student_client_link_open_type） +varchar(50) +50 + + 05CE988B-2AF5-4A63-9451-25A9EF95C5DB create_time create_time @@ -16893,7 +16905,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 1E5FBB70-DADA-4251-9BDA-85E132223109 user_id user_id @@ -16904,7 +16916,7 @@ COLLATE = utf8_general_ci 用户ID bigint - + F1483087-727F-4BFE-97BA-9692FD8D1AB2 org_id org_id @@ -16917,7 +16929,7 @@ COLLATE = utf8_general_ci - + B095A5B3-D6C4-40C4-B986-497B3849ED54 Key_1 Key_1 @@ -16931,12 +16943,12 @@ COLLATE = utf8_general_ci - + - + BFEA4109-96F9-4074-AF58-B84D6574A7FC PUBLIC PUBLIC @@ -17064,7 +17076,7 @@ COLLATE = utf8_general_ci - + ABEFC813-1056-4507-A9A7-809C149B4ABE 1661954753 lx @@ -17287,7 +17299,7 @@ COLLATE = utf8_general_ci - + 5963E417-B2CE-431D-988A-B3493AAE5EE4 MySQL 5.0 MYSQL50 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java index c1f28a15..3175ed1f 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java @@ -9,8 +9,6 @@ import org.beetl.sql.core.annotatoin.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; -import static com.ibeetl.admin.core.util.enums.CoreDictType.GLOBAL_STATUS; - /* * 学生端-链接 * gen by Spring Boot2 Admin 2022-09-07 @@ -37,8 +35,8 @@ public class StudentClientLink extends BaseEntity{ private String studentClientLinkContent ; //链接类型（数据字典 student_client_link_type） - @Dict(type="student_client_link_type") + private String studentClientLinkType ; //链接图片（可用于轮播大图，icon小图等功能） @@ -46,10 +44,15 @@ public class StudentClientLink extends BaseEntity{ private String studentClientLinkImg ; //状态（ 1 正常 2删除） - @Dict(type=GLOBAL_STATUS) + @Dict(type="global_status") private Integer studentClientLinkStatus ; + //打开方式（数据字典 student_client_link_open_type） + @Dict(type="student_client_link_open_type") + + private String studentClientLinkOpenType ; + //创建时间 private Date createTime ; @@ -156,6 +159,19 @@ public class StudentClientLink extends BaseEntity{ this.studentClientLinkStatus = studentClientLinkStatus; } + /**打开方式（数据字典 student_client_link_open_type） + *@return + */ + public String getStudentClientLinkOpenType(){ + return studentClientLinkOpenType; + } + /**打开方式（数据字典 student_client_link_open_type） + *@param studentClientLinkOpenType + */ + public void setStudentClientLinkOpenType(String studentClientLinkOpenType){ + this.studentClientLinkOpenType = studentClientLinkOpenType; + } + /**创建时间 *@return */ diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentClientLinkQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentClientLinkQuery.java index cd40cc65..ad35673e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentClientLinkQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentClientLinkQuery.java @@ -29,6 +29,8 @@ public class StudentClientLinkQuery extends PageParam { private String studentClientLinkImg; @Query(name = "状态", display = true,type=Query.TYPE_DICT,dict=GLOBAL_STATUS) private Integer studentClientLinkStatus; + @Query(name = "打开方式", display = true,type=Query.TYPE_DICT,dict="student_client_link_open_type") + private String studentClientLinkOpenType; @Query(name = "创建时间", display = false) private Date createTime; @Query(name = "用户ID", display = false) @@ -86,6 +88,12 @@ public class StudentClientLinkQuery extends PageParam { public void setStudentClientLinkStatus(Integer studentClientLinkStatus ){ this.studentClientLinkStatus = studentClientLinkStatus; } + public String getStudentClientLinkOpenType(){ + return studentClientLinkOpenType; + } + public void setStudentClientLinkOpenType(String studentClientLinkOpenType ){ + this.studentClientLinkOpenType = studentClientLinkOpenType; + } public Date getCreateTime(){ return createTime; } @@ -114,6 +122,7 @@ public class StudentClientLinkQuery extends PageParam { pojo.setStudentClientLinkType(this.getStudentClientLinkType()); pojo.setStudentClientLinkImg(this.getStudentClientLinkImg()); pojo.setStudentClientLinkStatus(this.getStudentClientLinkStatus()); + pojo.setStudentClientLinkOpenType(this.getStudentClientLinkOpenType()); pojo.setCreateTime(this.getCreateTime()); pojo.setUserId(this.getUserId()); pojo.setOrgId(this.getOrgId()); diff --git a/web/src/main/resources/sql/jlw/studentClientLink.md b/web/src/main/resources/sql/jlw/studentClientLink.md index cd30d783..09f08d69 100644 --- a/web/src/main/resources/sql/jlw/studentClientLink.md +++ b/web/src/main/resources/sql/jlw/studentClientLink.md @@ -34,6 +34,9 @@ queryByCondition @if(!isEmpty(studentClientLinkStatus)){ and t.student_client_link_status =#studentClientLinkStatus# @} + @if(!isEmpty(studentClientLinkOpenType)){ + and t.student_client_link_open_type =#studentClientLinkOpenType# + @} @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} @@ -85,6 +88,9 @@ queryByConditionQuery @if(!isEmpty(studentClientLinkStatus)){ and t.student_client_link_status =#studentClientLinkStatus# @} + @if(!isEmpty(studentClientLinkOpenType)){ + and t.student_client_link_open_type =#studentClientLinkOpenType# + @} @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} @@ -176,6 +182,13 @@ updateGivenByIds student_client_link_status = #studentClientLinkStatus# , @} @} + @if(contain("studentClientLinkOpenType",_given)){ + @if(isEmpty(studentClientLinkOpenType)){ + student_client_link_open_type = null , + @}else{ + student_client_link_open_type = #studentClientLinkOpenType# , + @} + @} @if(contain("createTime",_given)){ @if(isEmpty(createTime)){ create_time = null , @@ -231,6 +244,9 @@ getStudentClientLinkValues @if(!isEmpty(studentClientLinkStatus)){ and t.student_client_link_status =#studentClientLinkStatus# @} + @if(!isEmpty(studentClientLinkOpenType)){ + and t.student_client_link_open_type =#studentClientLinkOpenType# + @} @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} @@ -274,6 +290,9 @@ getValuesByQuery @if(!isEmpty(studentClientLinkStatus)){ and t.student_client_link_status =#studentClientLinkStatus# @} + @if(!isEmpty(studentClientLinkOpenType)){ + and t.student_client_link_open_type =#studentClientLinkOpenType# + @} @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} diff --git a/web/src/main/resources/static/js/jlw/studentClientLink/index.js b/web/src/main/resources/static/js/jlw/studentClientLink/index.js index 3a3cf434..538837c7 100644 --- a/web/src/main/resources/static/js/jlw/studentClientLink/index.js +++ b/web/src/main/resources/static/js/jlw/studentClientLink/index.js @@ -61,18 +61,18 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hide:$.isEmpty(sx_['studentClientLinkContent'])?false:sx_['studentClientLinkContent'], }, { - field : 'studentClientLinkType', + field : 'studentClientLinkTypeText', //数据字典类型为 student_client_link_type title : '链接类型', align:"center", hideField :false, - hide:$.isEmpty(sx_['studentClientLinkType'])?false:sx_['studentClientLinkType'], + hide:$.isEmpty(sx_['studentClientLinkTypeText'])?false:sx_['studentClientLinkTypeText'], }, { - field : 'studentClientLinkImgText', //数据字典类型为 student_client_link_type + field : 'studentClientLinkImg', title : '链接图片', align:"center", hideField :false, - hide:$.isEmpty(sx_['studentClientLinkImgText'])?false:sx_['studentClientLinkImgText'], + hide:$.isEmpty(sx_['studentClientLinkImg'])?false:sx_['studentClientLinkImg'], }, { field : 'studentClientLinkStatusText', //数据字典类型为 global_status @@ -81,6 +81,13 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { hideField :false, hide:$.isEmpty(sx_['studentClientLinkStatusText'])?false:sx_['studentClientLinkStatusText'], }, + { + field : 'studentClientLinkOpenTypeText', //数据字典类型为 student_client_link_open_type + title : '打开方式', + align:"center", + hideField :false, + hide:$.isEmpty(sx_['studentClientLinkOpenTypeText'])?false:sx_['studentClientLinkOpenTypeText'], + }, { field : 'createTime', title : '创建时间', @@ -158,7 +165,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { view.initToolBar() }, } - //触发事件 $('.ext-toolbar').on('click', function() { var type = $(this).data('type'); diff --git a/web/src/main/resources/templates/jlw/studentClientLink/add.html b/web/src/main/resources/templates/jlw/studentClientLink/add.html index e69f9a63..82ac3230 100644 --- a/web/src/main/resources/templates/jlw/studentClientLink/add.html +++ b/web/src/main/resources/templates/jlw/studentClientLink/add.html @@ -28,8 +28,8 @@
- +
@@ -39,9 +39,16 @@
- +
+
+ +
+ +
+
diff --git a/web/src/main/resources/templates/jlw/studentClientLink/edit.html b/web/src/main/resources/templates/jlw/studentClientLink/edit.html index c27bfd9a..aaec475f 100644 --- a/web/src/main/resources/templates/jlw/studentClientLink/edit.html +++ b/web/src/main/resources/templates/jlw/studentClientLink/edit.html @@ -28,7 +28,8 @@
- +
@@ -38,8 +39,7 @@
- +
@@ -54,21 +54,28 @@
- +
- +
- +
- +
+
+ +
+ +
+
diff --git a/web/src/main/resources/templates/jlw/studentClientLink/index.html b/web/src/main/resources/templates/jlw/studentClientLink/index.html index 0edb1410..f1c572ea 100644 --- a/web/src/main/resources/templates/jlw/studentClientLink/index.html +++ b/web/src/main/resources/templates/jlw/studentClientLink/index.html @@ -3,7 +3,9 @@
-