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

非字符串类型默认增加isUpdateForce

Browse Source
This commit is contained in:
jeesite
2021-12-20 09:46:39 +08:00
parent 75a55ad8dd
commit 1de7ef75ef
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
View File

@@ -105,6 +105,10 @@ import com.jeesite.modules.bpm.entity.BpmEntity;
if (c.attrName == table.treeViewNameAttrName){
print(', isTreeName=true');
}
if (c.isNull == @Global.YES && @StringUtils.inString(c.simpleAttrType,
'Long', 'Integer', 'Double', 'BigDecimal', 'Date')){
print(', isUpdateForce=true');
}
}
%>),
<%

4
modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
View File

@@ -105,6 +105,10 @@ import com.jeesite.modules.bpm.entity.BpmEntity;
if (c.attrName == table.treeViewNameAttrName){
print(', isTreeName=true');
}
if (c.isNull == @Global.YES && @StringUtils.inString(c.simpleAttrType,
'Long', 'Integer', 'Double', 'BigDecimal', 'Date')){
print(', isUpdateForce=true');
}
}
%>),
<%

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

@@ -33,7 +33,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@Column(name="test_radio", attrName="testRadio", label="单选框"),
@Column(name="test_checkbox", attrName="testCheckbox", label="复选框"),
@Column(name="test_date", attrName="testDate", label="日期选择", isUpdateForce=true/*是否强制更新（当调用update并且该属性为空的时候，允许更新为空）*/),
@Column(name="test_datetime", attrName="testDatetime", label="日期时间"),
@Column(name="test_datetime", attrName="testDatetime", label="日期时间", isUpdateForce=true),
@Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="机构选择"),
@Column(name="test_area_code", attrName="testAreaCode", label="区域选择"),
@@ -131,7 +131,7 @@ public class TestData extends DataEntity<TestData> {
this.testCheckbox = testCheckbox;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
public Date getTestDate() {
return testDate;
}
@@ -140,7 +140,7 @@ public class TestData extends DataEntity<TestData> {
this.testDate = testDate;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
public Date getTestDatetime() {
return testDatetime;
}

8
web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
View File

@@ -32,8 +32,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@Column(name="test_select_multiple", attrName="testSelectMultiple", label="下拉多选"),
@Column(name="test_radio", attrName="testRadio", label="单选框"),
@Column(name="test_checkbox", attrName="testCheckbox", label="复选框"),
@Column(name="test_date", attrName="testDate", label="日期选择"),
@Column(name="test_datetime", attrName="testDatetime", label="日期时间"),
@Column(name="test_date", attrName="testDate", label="日期选择", isUpdateForce=true),
@Column(name="test_datetime", attrName="testDatetime", label="日期时间", isUpdateForce=true),
@Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="机构选择"),
@Column(name="test_area_code", attrName="testAreaCode", label="区域选择"),
@@ -149,7 +149,7 @@ public class TestDataChild extends DataEntity<TestDataChild> {
this.testCheckbox = testCheckbox;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
public Date getTestDate() {
return testDate;
}
@@ -158,7 +158,7 @@ public class TestDataChild extends DataEntity<TestDataChild> {
this.testDate = testDate;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
public Date getTestDatetime() {
return testDatetime;
}