继承属性日期类型format

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/filter/%DE%SearchContext.java.ftl

@@ -46,13 +46,13 @@ public class ${item.codeName}SearchContext extends QueryWrapperContext<${item.co
                         <#assign formItemDataType="String">
                     </#if>
                     <#if formItemDataType !="String">
-                        <#if defDataType == "DATETIME">
+                        <#if defDataType == "DATETIME" || formItemDataType == "DATETIME">
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     @JSONField(format="yyyy-MM-dd HH:mm:ss")
-                        <#elseif defDataType == "DATE">
+                        <#elseif defDataType == "DATE" || formItemDataType == "DATETIME">
     @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
     @JSONField(format="yyyy-MM-dd")
-                        <#elseif defDataType == "TIME">
+                        <#elseif defDataType == "TIME" || formItemDataType == "DATETIME">
     @JsonFormat(pattern="HH:mm", timezone="GMT+8")
     @JSONField(format="HH:mm")
                         </#if>
@@ -160,13 +160,13 @@ public class ${item.codeName}SearchContext extends QueryBuildContext {
                         <#assign formItemDataType="String">
                     </#if>
                     <#if formItemDataType !="String">
-                        <#if defDataType == "DATETIME">
+                        <#if defDataType == "DATETIME" || formItemDataType == "DATETIME">
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     @JSONField(format="yyyy-MM-dd HH:mm:ss")
-                        <#elseif defDataType == "DATE">
+                        <#elseif defDataType == "DATE" || formItemDataType == "DATE">
     @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
     @JSONField(format="yyyy-MM-dd")
-                        <#elseif defDataType == "TIME">
+                        <#elseif defDataType == "TIME" || formItemDataType == "TIME">
     @JsonFormat(pattern="HH:mm", timezone="GMT+8")
     @JSONField(format="HH:mm")
                         </#if>
@@ -253,14 +253,15 @@ public class ${item.codeName}SearchContext extends SearchContextBase {
         <#if defield.getAllPSDEFSearchModes()??>
             <#list defield.getAllPSDEFSearchModes() as formitem>
                 <#if formitem.getPSDEField()??>
+                    <#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
                     <#assign defDataType=formitem.getPSDEField().getDataType()>
-                    <#if defDataType == "DATETIME">
+                    <#if defDataType == "DATETIME" || formItemDataType == "DATETIME">
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     @JSONField(format="yyyy-MM-dd HH:mm:ss")
-                    <#elseif defDataType == "DATE">
+                    <#elseif defDataType == "DATE" || formItemDataType == "DATE">
     @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
     @JSONField(format="yyyy-MM-dd")
-                    <#elseif defDataType == "TIME">
+                    <#elseif defDataType == "TIME" || formItemDataType == "TIME">
     @JsonFormat(pattern="HH:mm", timezone="GMT+8")
     @JSONField(format="HH:mm")
                     </#if>
@@ -290,14 +291,15 @@ public class ${item.codeName}SearchContext extends SearchContextBase {
         <#if defield.getAllPSDEFSearchModes()??>
             <#list defield.getAllPSDEFSearchModes() as formitem>
                 <#if formitem.getPSDEField()??>
+                    <#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
                     <#assign defDataType=formitem.getPSDEField().getDataType()>
-                    <#if defDataType == "DATETIME">
+                    <#if defDataType == "DATETIME" || formItemDataType == "DATETIME">
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     @JSONField(format="yyyy-MM-dd HH:mm:ss")
-                    <#elseif defDataType == "DATE">
+                    <#elseif defDataType == "DATE" || formItemDataType == "DATE">
     @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
     @JSONField(format="yyyy-MM-dd")
-                    <#elseif defDataType == "TIME">
+                    <#elseif defDataType == "TIME" || formItemDataType == "TIME">
     @JsonFormat(pattern="HH:mm", timezone="GMT+8")
     @JSONField(format="HH:mm")
                     </#if>