增加链接打开方式;

beetlsql3-dev
Mlxa0324 3 years ago
parent 10116c7204
commit 82ad7211b5

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1662559573" Name="cjks" Objects="1039" Symbols="95" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1662562676" Name="cjks" Objects="1040" Symbols="95" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -6488,9 +6488,9 @@ LABL 0 新宋体,8,N</a:FontList>
</o:TableSymbol>
<o:TableSymbol Id="o196">
<a:CreationDate>1662554252</a:CreationDate>
<a:ModificationDate>1662556171</a:ModificationDate>
<a:ModificationDate>1662562641</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((387116,22607), (406116,34431))</a:Rect>
<a:Rect>((387116,21503), (406116,34431))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@ -16792,7 +16792,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>student_client_link</a:Code>
<a:CreationDate>1661850632</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1662556157</a:ModificationDate>
<a:ModificationDate>1662562676</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>学生端-链接</a:Comment>
<a:PhysicalOptions>auto_increment = 1
@ -16883,6 +16883,18 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o956">
<a:ObjectID>963FA155-9A25-41BA-8B52-209536B76758</a:ObjectID>
<a:Name>student_client_link_open_type</a:Name>
<a:Code>student_client_link_open_type</a:Code>
<a:CreationDate>1662562589</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1662562676</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>打开方式(数据字典 student_client_link_open_type</a:Comment>
<a:DataType>varchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o957">
<a:ObjectID>05CE988B-2AF5-4A63-9451-25A9EF95C5DB</a:ObjectID>
<a:Name>create_time</a:Name>
<a:Code>create_time</a:Code>
@ -16893,7 +16905,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>创建时间</a:Comment>
<a:DataType>datetime</a:DataType>
</o:Column>
<o:Column Id="o957">
<o:Column Id="o958">
<a:ObjectID>1E5FBB70-DADA-4251-9BDA-85E132223109</a:ObjectID>
<a:Name>user_id</a:Name>
<a:Code>user_id</a:Code>
@ -16904,7 +16916,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>用户ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o958">
<o:Column Id="o959">
<a:ObjectID>F1483087-727F-4BFE-97BA-9692FD8D1AB2</a:ObjectID>
<a:Name>org_id</a:Name>
<a:Code>org_id</a:Code>
@ -16917,7 +16929,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o959">
<o:Key Id="o960">
<a:ObjectID>B095A5B3-D6C4-40C4-B986-497B3849ED54</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@ -16931,12 +16943,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Key>
</c:Keys>
<c:PrimaryKey>
<o:Key Ref="o959"/>
<o:Key Ref="o960"/>
</c:PrimaryKey>
</o:Table>
</c:Tables>
<c:DefaultGroups>
<o:Group Id="o960">
<o:Group Id="o961">
<a:ObjectID>BFEA4109-96F9-4074-AF58-B84D6574A7FC</a:ObjectID>
<a:Name>PUBLIC</a:Name>
<a:Code>PUBLIC</a:Code>
@ -17064,7 +17076,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<o:Table Ref="o168"/>
</c:Object2>
</o:ExtendedDependency>
<o:ExtendedDependency Id="o961">
<o:ExtendedDependency Id="o962">
<a:ObjectID>ABEFC813-1056-4507-A9A7-809C149B4ABE</a:ObjectID>
<a:CreationDate>1661954753</a:CreationDate>
<a:Creator>lx</a:Creator>
@ -17287,7 +17299,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:ExtendedDependency>
</c:ChildTraceabilityLinks>
<c:TargetModels>
<o:TargetModel Id="o962">
<o:TargetModel Id="o963">
<a:ObjectID>5963E417-B2CE-431D-988A-B3493AAE5EE4</a:ObjectID>
<a:Name>MySQL 5.0</a:Name>
<a:Code>MYSQL50</a:Code>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1662559573" Name="cjks" Objects="1039" Symbols="95" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1662562683" Name="cjks" Objects="1040" Symbols="95" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -6488,9 +6488,9 @@ LABL 0 新宋体,8,N</a:FontList>
</o:TableSymbol>
<o:TableSymbol Id="o196">
<a:CreationDate>1662554252</a:CreationDate>
<a:ModificationDate>1662556171</a:ModificationDate>
<a:ModificationDate>1662562683</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((387116,22607), (406116,34431))</a:Rect>
<a:Rect>((387116,21503), (417150,34431))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
@ -16792,7 +16792,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>student_client_link</a:Code>
<a:CreationDate>1661850632</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1662556157</a:ModificationDate>
<a:ModificationDate>1662562676</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>学生端-链接</a:Comment>
<a:PhysicalOptions>auto_increment = 1
@ -16883,6 +16883,18 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:DataType>int</a:DataType>
</o:Column>
<o:Column Id="o956">
<a:ObjectID>963FA155-9A25-41BA-8B52-209536B76758</a:ObjectID>
<a:Name>student_client_link_open_type</a:Name>
<a:Code>student_client_link_open_type</a:Code>
<a:CreationDate>1662562589</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1662562676</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>打开方式(数据字典 student_client_link_open_type</a:Comment>
<a:DataType>varchar(50)</a:DataType>
<a:Length>50</a:Length>
</o:Column>
<o:Column Id="o957">
<a:ObjectID>05CE988B-2AF5-4A63-9451-25A9EF95C5DB</a:ObjectID>
<a:Name>create_time</a:Name>
<a:Code>create_time</a:Code>
@ -16893,7 +16905,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>创建时间</a:Comment>
<a:DataType>datetime</a:DataType>
</o:Column>
<o:Column Id="o957">
<o:Column Id="o958">
<a:ObjectID>1E5FBB70-DADA-4251-9BDA-85E132223109</a:ObjectID>
<a:Name>user_id</a:Name>
<a:Code>user_id</a:Code>
@ -16904,7 +16916,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Comment>用户ID</a:Comment>
<a:DataType>bigint</a:DataType>
</o:Column>
<o:Column Id="o958">
<o:Column Id="o959">
<a:ObjectID>F1483087-727F-4BFE-97BA-9692FD8D1AB2</a:ObjectID>
<a:Name>org_id</a:Name>
<a:Code>org_id</a:Code>
@ -16917,7 +16929,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column>
</c:Columns>
<c:Keys>
<o:Key Id="o959">
<o:Key Id="o960">
<a:ObjectID>B095A5B3-D6C4-40C4-B986-497B3849ED54</a:ObjectID>
<a:Name>Key_1</a:Name>
<a:Code>Key_1</a:Code>
@ -16931,12 +16943,12 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Key>
</c:Keys>
<c:PrimaryKey>
<o:Key Ref="o959"/>
<o:Key Ref="o960"/>
</c:PrimaryKey>
</o:Table>
</c:Tables>
<c:DefaultGroups>
<o:Group Id="o960">
<o:Group Id="o961">
<a:ObjectID>BFEA4109-96F9-4074-AF58-B84D6574A7FC</a:ObjectID>
<a:Name>PUBLIC</a:Name>
<a:Code>PUBLIC</a:Code>
@ -17064,7 +17076,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<o:Table Ref="o168"/>
</c:Object2>
</o:ExtendedDependency>
<o:ExtendedDependency Id="o961">
<o:ExtendedDependency Id="o962">
<a:ObjectID>ABEFC813-1056-4507-A9A7-809C149B4ABE</a:ObjectID>
<a:CreationDate>1661954753</a:CreationDate>
<a:Creator>lx</a:Creator>
@ -17287,7 +17299,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:ExtendedDependency>
</c:ChildTraceabilityLinks>
<c:TargetModels>
<o:TargetModel Id="o962">
<o:TargetModel Id="o963">
<a:ObjectID>5963E417-B2CE-431D-988A-B3493AAE5EE4</a:ObjectID>
<a:Name>MySQL 5.0</a:Name>
<a:Code>MYSQL50</a:Code>

@ -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
*/

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

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

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

@ -28,8 +28,8 @@
<div class="layui-inline">
<label class="layui-form-label">链接类型</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="student_client_link_type"
id="studentClientLinkType" name="studentClientLinkType" value="${studentClientLink.studentClientLinkType}" layVerify="" />
<layui:simpleDictSelect style='layui-input-inline' type="student_client_link_type"
id="studentClientLinkType" name="studentClientLinkType" value="${studentClientLink.studentClientLinkType}" layVerify="" />
</div>
</div>
</div>
@ -39,9 +39,16 @@
<div class="layui-inline">
<label class="layui-form-label">链接图片</label>
<div class="layui-input-inline">
<input type="text" id="studentClientLinkImg" name="studentClientLinkImg" value="${studentClientLink.studentClientLinkImg}" class="layui-input" >
<input type="text" id="studentClientLinkImg" name="studentClientLinkImg" value="${studentClientLink.studentClientLinkImg}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">打开方式</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="student_client_link_open_type"
id="studentClientLinkOpenType" name="studentClientLinkOpenType" value="${studentClientLink.studentClientLinkOpenType}" layVerify="" />
</div>
</div>
</div>
</div>
<!-- 业务对象须有hidden字段保存delFlag和version字段-->

@ -28,7 +28,8 @@
<div class="layui-inline">
<label class="layui-form-label">链接类型(数据字典 student_client_link_type</label>
<div class="layui-input-inline">
<input type="text" id="studentClientLinkType" name="studentClientLinkType" value="${studentClientLink.studentClientLinkType}" class="layui-input" >
<layui:simpleDictSelect style='layui-input-inline' type="student_client_link_type"
id="studentClientLinkType" name="studentClientLinkType" value="${studentClientLink.studentClientLinkType}" layVerify="" />
</div>
</div>
</div>
@ -38,8 +39,7 @@
<div class="layui-inline">
<label class="layui-form-label">链接图片可用于轮播大图icon小图等功能</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' type="student_client_link_type"
id="studentClientLinkImg" name="studentClientLinkImg" value="${studentClientLink.studentClientLinkImg}" layVerify="" />
<input type="text" id="studentClientLinkImg" name="studentClientLinkImg" value="${studentClientLink.studentClientLinkImg}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
@ -54,21 +54,28 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">创建时间</label>
<label class="layui-form-label">打开方式(数据字典 student_client_link_open_type</label>
<div class="layui-input-inline">
<input type="text" id="createTime" name="createTime" value="${studentClientLink.createTime,"yyyy-MM-dd"}" class="layui-input input-date" >
<layui:simpleDictSelect style='layui-input-inline' type="student_client_link_open_type"
id="studentClientLinkOpenType" name="studentClientLinkOpenType" value="${studentClientLink.studentClientLinkOpenType}" layVerify="" />
</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="${studentClientLink.userId}" class="layui-input" >
<input type="text" id="createTime" name="createTime" value="${studentClientLink.createTime,"yyyy-MM-dd"}" class="layui-input input-date" >
</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="userId" name="userId" value="${studentClientLink.userId}" class="layui-input" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">组织ID</label>
<div class="layui-input-inline">

@ -3,7 +3,9 @@
</layui:searchForm>
<table id="studentClientLinkTable" lay-filter="studentClientLinkTable"></table>
<!--#} -->
<div class="layui-btn-container" id="toolbar_studentClientLink">
<script type="text/html" id="toolbar_studentClientLink">
<div class="layui-btn-container">
<div class="layui-btn-group" >
<!--# if(!isEmpty(search)) {-->
<layui:accessButton function="studentClientLink.query" id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>
@ -16,9 +18,12 @@
<!--# }-->
</div>
</div>
</script>
<script>
layui.use(['index'], function(){
var index = layui.index;
index.init();
});
</script>
layui.use(['index'], function(){
var index = layui.index;
index.init();
});
</script>

Loading…
Cancel
Save