解决冲突

beetlsql3-dev
姚丹ab 2 years ago
parent 09240bf5f1
commit 551ddc669a

@ -17,16 +17,16 @@ public class UniversitySystemQuery extends PageParam {
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
@Query(name = "专业ID", display = false) @Query(name = "专业ID", display = false)
private Long universitySystemId; private Long universitySystemId;
@Query(name = "专业名称", display = true) @Query(name = "专业名称", display = false)
private String universitySystemName; private String universitySystemName;
@Query(name = "联系人", display = true) @Query(name = "联系人", display = false)
private String universitySystemContact; private String universitySystemContact;
@Query(name = "联系人电话", display = true) @Query(name = "联系人电话", display = false)
private String universitySystemContactTel; private String universitySystemContactTel;
@Query(name = "创建时间", display = false) @Query(name = "创建时间", display = false)
private Date universitySystemAddTime; private Date universitySystemAddTime;
// @Query(name = "状态 1正常 2删除", display = true,type=Query.TYPE_DICT,dict="global_status") // @Query(name = "状态 1正常 2删除", display = true,type=Query.TYPE_DICT,dict="global_status")
@Query(name = "状态", display = true,type=Query.TYPE_DICT,dict=GLOBAL_STATUS) @Query(name = "状态", display = false,type=Query.TYPE_DICT,dict=GLOBAL_STATUS)
private Integer universitySystemStatus; private Integer universitySystemStatus;
// @Query(name = "院系ID学院ID", display = false) // @Query(name = "院系ID学院ID", display = false)
@Query(name = "院系ID", display = false) @Query(name = "院系ID", display = false)

@ -14,7 +14,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}, },
initTable: function () { initTable: function () {
var sx_ = localStorage.getItem("universityFacultyTable_field_" + Common.userInfoId); //筛选值显示、隐藏缓存 var sx_ = localStorage.getItem("universityFacultyTable_field_" + Common.userInfoId); //筛选值显示、隐藏缓存
if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} if ($.isEmpty(sx_)) {
sx_ = {};
} else {
sx_ = JSON.parse(sx_);
}
universityFacultyTable = table.render({ universityFacultyTable = table.render({
elem: '#universityFacultyTable', elem: '#universityFacultyTable',
height: Lib.getTableHeight(1), height: Lib.getTableHeight(1),
@ -22,24 +26,30 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
method: 'post', method: 'post',
url: Common.ctxPath + '/jlw/universityFaculty/list.json' // 数据接口 url: Common.ctxPath + '/jlw/universityFaculty/list.json' // 数据接口
, page: Lib.tablePage // 开启分页 , page: Lib.tablePage // 开启分页
,toolbar: '#toolbar_universityFaculty' //自定义头部左侧工具栏 /*,toolbar: '#toolbar_universityFaculty' //自定义头部左侧工具栏
,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
, limit: 10, , limit: 10,
cols: [[ // 表头 cols: [[ // 表头
{ /*{
type: 'checkbox', type: 'checkbox',
}, },*/
{ {
field: 'universityFacultyId', field: 'universityFacultyId',
// title : '院系ID学院ID', // title : '院系ID学院ID',
title: '院系ID', title: '院系ID',
align: "center", align: "center",
hideField: false, hideField: false,
hide:$.isEmpty(sx_['universityFacultyId'])?false:sx_['universityFacultyId'], hide: true,/*$.isEmpty(sx_['universityFacultyId']) ? false : sx_['universityFacultyId'],*/
width: 60, width: 60,
}, },
{
field: 'universitiesCollegesIdText',
title: '院校名称',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['universitiesCollegesIdText']) ? false : sx_['universitiesCollegesIdText'],
},
{ {
field: 'universityFacultyName', field: 'universityFacultyName',
title: '院系名称', title: '院系名称',
@ -68,13 +78,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
hideField: false, hideField: false,
hide: $.isEmpty(sx_['universityFacultyContactAddress']) ? false : sx_['universityFacultyContactAddress'], hide: $.isEmpty(sx_['universityFacultyContactAddress']) ? false : sx_['universityFacultyContactAddress'],
}, },
{
field : 'universitiesCollegesIdText',
title : '院校名称',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universitiesCollegesIdText'])?false:sx_['universitiesCollegesIdText'],
},
{ {
field: 'universityFacultyStatusText', //数据字典类型为 global_status field: 'universityFacultyStatusText', //数据字典类型为 global_status
title: '状态', title: '状态',
@ -106,8 +110,8 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
// } // }
{ {
field: 'operation_', title: '操作', align: "center", templet: function (d) { field: 'operation_', title: '操作', align: "center", templet: function (d) {
var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>'; var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';
htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>'; htm += '<a class="layui-table-link" lay-event="del">删除</a>';
return htm; return htm;
} }
} }

@ -14,7 +14,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}, },
initTable: function () { initTable: function () {
var sx_ = localStorage.getItem("universitySystemTable_field_" + Common.userInfoId); //筛选值显示、隐藏缓存 var sx_ = localStorage.getItem("universitySystemTable_field_" + Common.userInfoId); //筛选值显示、隐藏缓存
if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);} if ($.isEmpty(sx_)) {
sx_ = {};
} else {
sx_ = JSON.parse(sx_);
}
universitySystemTable = table.render({ universitySystemTable = table.render({
elem: '#universitySystemTable', elem: '#universitySystemTable',
height: Lib.getTableHeight(1), height: Lib.getTableHeight(1),
@ -22,23 +26,29 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
method: 'post', method: 'post',
url: Common.ctxPath + '/jlw/universitySystem/list.json' // 数据接口 url: Common.ctxPath + '/jlw/universitySystem/list.json' // 数据接口
, page: Lib.tablePage // 开启分页 , page: Lib.tablePage // 开启分页
,toolbar: '#toolbar_universitySystem' //自定义头部左侧工具栏 /*, toolbar: '#toolbar_universitySystem' //自定义头部左侧工具栏
,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏 , defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
, limit: 10, , limit: 10,
cols: [[ // 表头 cols: [[ // 表头
{ /*{
type: 'checkbox', type: 'checkbox',
}, },*/
{ {
field: 'universitySystemId', field: 'universitySystemId',
title: '专业ID', title: '专业ID',
align: "center", align: "center",
hideField: false, hideField: false,
hide:$.isEmpty(sx_['universitySystemId'])?false:sx_['universitySystemId'], hide: true,/*$.isEmpty(sx_['universitySystemId']) ? false : sx_['universitySystemId'],*/
width: 60, width: 60,
}, },
{
field : 'universityFacultyIdText',
title : '院系名称',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyIdText'])?false:sx_['universityFacultyIdText'],
},
{ {
field: 'universitySystemName', field: 'universitySystemName',
title: '专业名称', title: '专业名称',
@ -75,13 +85,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
hideField: false, hideField: false,
hide: $.isEmpty(sx_['universitySystemStatusText']) ? false : sx_['universitySystemStatusText'], hide: $.isEmpty(sx_['universitySystemStatusText']) ? false : sx_['universitySystemStatusText'],
}, },
{
field : 'universityFacultyIdText',
title : '院系',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['universityFacultyIdText'])?false:sx_['universityFacultyIdText'],
},
// { // {
// field : 'userId', // field : 'userId',
// title : '用户ID', // title : '用户ID',
@ -98,8 +102,8 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
// } // }
{ {
field: 'operation_', title: '操作', align: "center", templet: function (d) { field: 'operation_', title: '操作', align: "center", templet: function (d) {
var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>'; var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';
htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>'; htm += '<a class="layui-table-link" lay-event="del">删除</a>';
return htm; return htm;
} }
} }

@ -1,48 +1,60 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/universityFaculty/"}){ --> <!--# layout("/common/layout.html",{"jsBase":"/js/jlw/universityFaculty/"}){ -->
<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
<form class="layui-form" id="addForm"> <form class="layui-form" id="addForm">
<div class="layui-row"> <div style="margin-left: 95px;">
<layui:submitButtons id="addButton" buttonType="" showExamine="2"/>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">院校名称</label> <label class="layui-form-label">院校名称</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universityFaculty.universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1" <layui:simpleDictSelect style='layui-input-inline' value="${universityFaculty.universitiesCollegesId}"
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="universitiesCollegesId"/> type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="universitiesCollegesId"/>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">院系名称</label> <label class="layui-form-label">院系名称</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="universityFacultyName" name="universityFacultyName" value="${universityFaculty.universityFacultyName}" class="layui-input" > <input type="text" id="universityFacultyName" name="universityFacultyName"
value="${universityFaculty.universityFacultyName}" class="layui-input">
</div>
</div> </div>
</div> </div>
<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">联系人</label> <label class="layui-form-label">联系人</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="universityFacultyContact" name="universityFacultyContact" value="${universityFaculty.universityFacultyContact}" class="layui-input" > <input type="text" id="universityFacultyContact" name="universityFacultyContact"
value="${universityFaculty.universityFacultyContact}" class="layui-input">
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">联系人电话</label> <label class="layui-form-label">联系人电话</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="universityFacultyContactTel" name="universityFacultyContactTel" value="${universityFaculty.universityFacultyContactTel}" class="layui-input" > <input type="text" id="universityFacultyContactTel" name="universityFacultyContactTel"
value="${universityFaculty.universityFacultyContactTel}" class="layui-input">
</div>
</div> </div>
</div> </div>
<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">联系人地址</label> <label class="layui-form-label">联系人地址</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="universityFacultyContactAddress" name="universityFacultyContactAddress" value="${universityFaculty.universityFacultyContactAddress}" class="layui-input" > <textarea id="universityFacultyContactAddress" name="universityFacultyContactAddress"
</div> value="${universityFaculty.universityFacultyContactAddress}" placeholder="请输入地址"
class="layui-textarea"></textarea>
</div> </div>
</div> </div>
</div> </div>
<!-- 业务对象须有hidden字段保存delFlag和version字段--> <!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="universityFacultyId" value="${universityFaculty.universityFacultyId}"/> <input type="hidden" name="universityFacultyId" value="${universityFaculty.universityFacultyId}"/>
<layui:submitButtons id="addButton" buttonType="" showExamine="2" />
</form> </form>
<!--#} --> <!--#} -->
<script> <script>

@ -15,25 +15,25 @@
<table id="universityFacultyTable" lay-filter="universityFacultyTable"></table> <table id="universityFacultyTable" lay-filter="universityFacultyTable"></table>
<!--#} --> <!--#} -->
<script type="text/html" id="toolbar_universityFaculty"> <!--<script type="text/html" id="toolbar_universityFaculty">
<div class="layui-btn-container"> <div class="layui-btn-container">
<div class="layui-btn-group"> <div class="layui-btn-group">
<!--# if(core.searchIsShow(search)) {--> &lt;!&ndash;# if(core.searchIsShow(search)) {&ndash;&gt;
<layui:accessButton function="universityFaculty.query" id="searchFormSearch" action="search"><i <layui:accessButton function="universityFaculty.query" id="searchFormSearch" action="search"><i
class="layui-icon">&#xe615;</i>搜索 class="layui-icon">&#xe615;</i>搜索
</layui:accessButton> </layui:accessButton>
<!--# }--> &lt;!&ndash;# }&ndash;&gt;
<layui:accessButton function="universityFaculty.add" action="add"><i class="layui-icon">&#xe61f;</i>新增 <layui:accessButton function="universityFaculty.add" action="add"><i class="layui-icon">&#xe61f;</i>新增
</layui:accessButton> </layui:accessButton>
<!--<layui:accessButton function="universityFaculty.edit" action="edit">修改</layui:accessButton> &lt;!&ndash;<layui:accessButton function="universityFaculty.edit" action="edit">修改</layui:accessButton>
<layui:accessButton function="universityFaculty.del" action="del">删除</layui:accessButton>--> <layui:accessButton function="universityFaculty.del" action="del">删除</layui:accessButton>&ndash;&gt;
<!--# if(!isEmpty(search)) {--> &lt;!&ndash;# if(!isEmpty(search)) {&ndash;&gt;
<layui:accessButton function="universityFaculty.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新 <layui:accessButton function="universityFaculty.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新
</layui:accessButton> </layui:accessButton>
<!--# }--> &lt;!&ndash;# }&ndash;&gt;
</div> </div>
</div> </div>
</script> </script>-->
<script> <script>
layui.use(['index'], function () { layui.use(['index'], function () {

@ -1,49 +1,61 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/universitySystem/"}){ --> <!--# layout("/common/layout.html",{"jsBase":"/js/jlw/universitySystem/"}){ -->
<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
<form class="layui-form" id="addForm"> <form class="layui-form" id="addForm">
<div class="layui-row"> <div style="margin-left: 95px;">
<layui:submitButtons id="addButton" buttonType="" showExamine="2"/>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">院校名称</label> <label class="layui-form-label">院校名称</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1" <layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}"
id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesCollegesIds"/> type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesCollegesIds"/>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">所属学院</label> <label class="layui-form-label">所属学院</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystem.universityFacultyId}" type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${universitiesCollegesId}" <layui:simpleDictSelect style='layui-input-inline' value="${universitySystem.universityFacultyId}"
id="universityFacultyId" name="universityFacultyId" layFilter="select_universityFacultyIds"/> type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${universitiesCollegesId}"
id="universityFacultyId" name="universityFacultyId"
layFilter="select_universityFacultyIds"/>
</div>
</div> </div>
</div> </div>
<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">专业名称</label> <label class="layui-form-label">专业名称</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="universitySystemName" name="universitySystemName" value="${universitySystem.universitySystemName}" class="layui-input" > <input type="text" id="universitySystemName" name="universitySystemName"
value="${universitySystem.universitySystemName}" class="layui-input">
</div> </div>
</div> </div>
</div>
<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">联系人</label> <label class="layui-form-label">联系人</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="universitySystemContact" name="universitySystemContact" value="${universitySystem.universitySystemContact}" class="layui-input" > <input type="text" id="universitySystemContact" name="universitySystemContact"
</div> value="${universitySystem.universitySystemContact}" class="layui-input">
</div> </div>
</div> </div>
</div> </div>
<div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">联系人电话</label> <label class="layui-form-label">联系人电话</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="universitySystemContactTel" name="universitySystemContactTel" value="${universitySystem.universitySystemContactTel}" class="layui-input" > <input type="text" id="universitySystemContactTel" name="universitySystemContactTel"
</div> value="${universitySystem.universitySystemContactTel}" class="layui-input">
</div> </div>
</div> </div>
</div> </div>
<!-- 业务对象须有hidden字段保存delFlag和version字段--> <!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="universitySystemId" value="${universitySystem.universitySystemId}"/> <input type="hidden" name="universitySystemId" value="${universitySystem.universitySystemId}"/>
<layui:submitButtons id="addButton" buttonType="" showExamine="2" />
</form> </form>
<!--#} --> <!--#} -->
<script> <script>

@ -5,33 +5,55 @@
} }
</style> </style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}"> <layui:searchForm formId="searchForm" searchList="" condition="${search}">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">专业名称</label>
<div class="layui-input-inline">
<input type="text" id="universitySystemName" name="universitySystemName" placeholder=""
autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">所属院校</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesColleges"/>
</div>
</div>
</div>
</layui:searchForm> </layui:searchForm>
<div class="layui-btn-group"> <div class="layui-btn-group">
<div class="layui-btn-group"> <div class="layui-btn-group">
<layui:accessButton function="universitySystem.add" action="add"><i class="layui-icon">&#xe61f;</i>添加</layui:accessButton> <layui:accessButton function="universitySystem.add" action="add"><i class="layui-icon">&#xe61f;</i>添加
</layui:accessButton>
<!--<layui:accessButton function="universitySystem.edit" action="edit">修改</layui:accessButton> <!--<layui:accessButton function="universitySystem.edit" action="edit">修改</layui:accessButton>
<layui:accessButton function="universitySystem.del" action="del">删除</layui:accessButton>--> <layui:accessButton function="universitySystem.del" action="del">删除</layui:accessButton>-->
<layui:accessButton function="universitySystem.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton> <layui:accessButton function="universitySystem.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新
</layui:accessButton>
</div> </div>
</div> </div>
<table id="universitySystemTable" lay-filter="universitySystemTable"></table> <table id="universitySystemTable" lay-filter="universitySystemTable"></table>
<!--#} --> <!--#} -->
<script type="text/html" id="toolbar_universitySystem"> <!--<script type="text/html" id="toolbar_universitySystem">
<div class="layui-btn-container"> <div class="layui-btn-container">
<div class="layui-btn-group" > <div class="layui-btn-group" >
<layui:accessButton function="universitySystem.add" action="add"><i class="layui-icon">&#xe61f;</i>添加</layui:accessButton> <layui:accessButton function="universitySystem.add" action="add"><i class="layui-icon">&#xe61f;</i>添加</layui:accessButton>
<!--<layui:accessButton function="universitySystem.edit" action="edit">修改</layui:accessButton> &lt;!&ndash;<layui:accessButton function="universitySystem.edit" action="edit">修改</layui:accessButton>
<layui:accessButton function="universitySystem.del" action="del">删除</layui:accessButton>--> <layui:accessButton function="universitySystem.del" action="del">删除</layui:accessButton>&ndash;&gt;
<layui:accessButton function="universitySystem.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton> <layui:accessButton function="universitySystem.query" action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>
</div> </div>
</div> </div>
</script> </script>-->
<script> <script>
layui.use(['index'], function () { layui.use(['index'], function () {

Loading…
Cancel
Save