manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@Table@Column支持isUpdateForce=true强制更新，不再判断值非空情况下才加入更新。

Browse Source
This commit is contained in:
thinkgem
2018-07-04 21:26:54 +08:00
parent 26ee250d4a
commit 0af6fedef8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/main/java/com/jeesite/modules/test/entity/TestData.java
View File

@@ -31,7 +31,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@Column(name="test_select_multiple", attrName="testSelectMultiple", label="下拉多选"), @Column(name="test_select_multiple", attrName="testSelectMultiple", label="下拉多选"),
@Column(name="test_radio", attrName="testRadio", label="单选框"), @Column(name="test_radio", attrName="testRadio", label="单选框"),
@Column(name="test_checkbox", attrName="testCheckbox", label="复选框"), @Column(name="test_checkbox", attrName="testCheckbox", label="复选框"),
@Column(name="test_date", attrName="testDate", label="日期选择"), @Column(name="test_date", attrName="testDate", label="日期选择", isUpdateForce=true),
@Column(name="test_datetime", attrName="testDatetime", label="日期时间"), @Column(name="test_datetime", attrName="testDatetime", label="日期时间"),
@Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"), @Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="机构选择"), @Column(name="test_office_code", attrName="testOffice.officeCode", label="机构选择"),

2
web/src/main/resources/views/modules/test/testDataForm.html
View File

@@ -82,7 +82,7 @@
<span class="required hide">*</span> ${text('日期选择')}：<i class="fa icon-question hide"></i></label> <span class="required hide">*</span> ${text('日期选择')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8"> <div class="col-sm-8">
<#form:input path="testDate" readonly="true" maxlength="20" class="form-control Wdate" <#form:input path="testDate" readonly="true" maxlength="20" class="form-control Wdate"
dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div> </div>
</div> </div>
</div> </div>

2
web/src/main/resources/views/modules/test/testDataList.html
View File

@@ -150,7 +150,7 @@ $('#dataGrid').dataGrid({
}}, }},
{header:'${text('创建时间')}', name:'createDate', index:'a.create_date', width:150, align:"center"}, {header:'${text('创建时间')}', name:'createDate', index:'a.create_date', width:150, align:"center"},
{header:'${text('备注信息')}', name:'remarks', index:'a.remarks', width:150, align:"left"}, {header:'${text('备注信息')}', name:'remarks', index:'a.remarks', width:150, align:"left"},
{header:'${text('操作')}', name:'actions', width:120, sortable:false, title:false, formatter: function(val, obj, row, act){ {header:'${text('操作')}', name:'actions', width:200, sortable:false, title:false, formatter: function(val, obj, row, act){
var actions = []; var actions = [];
<% if(hasPermi('test:testData:edit')){ %> <% if(hasPermi('test:testData:edit')){ %>
actions.push('<a href="${ctx}/test/testData/form?id='+row.id+'" class="btnList" title="${text('编辑数据')}"><i class="fa fa-pencil"></i></a>&nbsp;'); actions.push('<a href="${ctx}/test/testData/form?id='+row.id+'" class="btnList" title="${text('编辑数据')}"><i class="fa fa-pencil"></i></a>&nbsp;');