From 1de7ef75ef67650d724cb9f58f0aa24e78566d28 Mon Sep 17 00:00:00 2001 From: jeesite Date: Mon, 20 Dec 2021 09:46:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=BB=98=E8=AE=A4=E5=A2=9E=E5=8A=A0isUpdateForce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/modules/gen/crud/entity.xml | 4 ++++ .../resources/templates/modules/gen/crud_cloud/entity.xml | 4 ++++ .../java/com/jeesite/modules/test/entity/TestData.java | 6 +++--- .../com/jeesite/modules/test/entity/TestDataChild.java | 8 ++++---- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml index 7d4566eb..545c05f7 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml @@ -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'); + } } %>), <% diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml index 8cbf72d4..f306df47 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml @@ -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'); + } } %>), <% diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java index 52e0d41c..dbd07330 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java @@ -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 { 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 { this.testDate = testDate; } - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") public Date getTestDatetime() { return testDatetime; } diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java index 96da2ae9..4a83a789 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java @@ -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 { 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 { this.testDate = testDate; } - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") public Date getTestDatetime() { return testDatetime; }