日期类型 searchContext （is null）问题

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

@@ -39,22 +39,24 @@ public class ${item.codeName}SearchContext extends QueryWrapperContext<${item.co
         <#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">
+                    <#comment>in条件通过String接，通过split拆后再进行查询</#comment>
+                    <#if formitem.getValueOp() == "IN" || formitem.getValueOp() == "ISNULL" || formitem.getValueOp() == "ISNOTNULL">
+                        <#assign formItemDataType="String">
+                    </#if>
+                    <#if formItemDataType !="String">
+                        <#if defDataType == "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">
     @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
     @JSONField(format="yyyy-MM-dd")
-                    <#elseif defDataType == "TIME">
+                        <#elseif defDataType == "TIME">
     @JsonFormat(pattern="HH:mm", timezone="GMT+8")
     @JSONField(format="HH:mm")
+                        </#if>
                     </#if>
-        <#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
-        <#comment>in条件通过String接，通过split拆后再进行查询</#comment>
-        <#if formitem.getValueOp() == "IN" || formitem.getValueOp() == "ISNULL" || formitem.getValueOp() == "ISNOTNULL">
-            <#assign formItemDataType="String">
-        </#if>
 	private ${formItemDataType} ${formitem.getName()?lower_case};//[${defield.getLogicName()}]
 	public void set${formitem.getName()?lower_case?cap_first}(${formItemDataType} ${formitem.getName()?lower_case}) {
         this.${formitem.getName()?lower_case} = ${formitem.getName()?lower_case};
@@ -151,22 +153,24 @@ public class ${item.codeName}SearchContext extends QueryBuildContext {
         <#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">
+                    <#comment>in条件通过String接，通过split拆后再进行查询</#comment>
+                    <#if formitem.getValueOp() == "IN" || formitem.getValueOp() == "ISNULL" || formitem.getValueOp() == "ISNOTNULL">
+                        <#assign formItemDataType="String">
+                    </#if>
+                    <#if formItemDataType !="String">
+                        <#if defDataType == "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">
     @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
     @JSONField(format="yyyy-MM-dd")
-                    <#elseif defDataType == "TIME">
+                        <#elseif defDataType == "TIME">
     @JsonFormat(pattern="HH:mm", timezone="GMT+8")
     @JSONField(format="HH:mm")
+                        </#if>
                     </#if>
-        <#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
-        <#comment>in条件通过String接，通过split拆后再进行查询</#comment>
-        <#if formitem.getValueOp() == "IN" || formitem.getValueOp() == "ISNULL" || formitem.getValueOp() == "ISNOTNULL">
-            <#assign formItemDataType="String">
-        </#if>
 	private ${formItemDataType} ${formitem.getName()?lower_case};//[${defield.getLogicName()}]
 	public void set${formitem.getName()?lower_case?cap_first}(${formItemDataType} ${formitem.getName()?lower_case}) {
         this.${formitem.getName()?lower_case} = ${formitem.getName()?lower_case};