提交 440883e0 编写于 作者: zhouweidong's avatar zhouweidong

继承属性时间类型反序列化问题

上级 63cf9763
...@@ -40,19 +40,20 @@ public class ${item.codeName}SearchContext extends QueryWrapperContext<${item.co ...@@ -40,19 +40,20 @@ public class ${item.codeName}SearchContext extends QueryWrapperContext<${item.co
<#list defield.getAllPSDEFSearchModes() as formitem> <#list defield.getAllPSDEFSearchModes() as formitem>
<#if formitem.getPSDEField()??> <#if formitem.getPSDEField()??>
<#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)> <#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
<#assign stdDataType=formitem.getPSDEField().stdDataType>
<#assign defDataType=formitem.getPSDEField().getDataType()> <#assign defDataType=formitem.getPSDEField().getDataType()>
<#comment>in条件通过String接,通过split拆后再进行查询</#comment> <#comment>in条件通过String接,通过split拆后再进行查询</#comment>
<#if formitem.getValueOp() == "IN" || formitem.getValueOp() == "ISNULL" || formitem.getValueOp() == "ISNOTNULL"> <#if formitem.getValueOp() == "IN" || formitem.getValueOp() == "ISNULL" || formitem.getValueOp() == "ISNOTNULL">
<#assign formItemDataType="String"> <#assign formItemDataType="String">
</#if> </#if>
<#if formItemDataType !="String"> <#if formItemDataType !="String">
<#if defDataType == "DATETIME" || formItemDataType == "DATETIME"> <#if defDataType == "DATETIME" || stdDataType == "DATETIME">
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
@JSONField(format="yyyy-MM-dd HH:mm:ss") @JSONField(format="yyyy-MM-dd HH:mm:ss")
<#elseif defDataType == "DATE" || formItemDataType == "DATETIME"> <#elseif defDataType == "DATE" || stdDataType == "DATE">
@JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
@JSONField(format="yyyy-MM-dd") @JSONField(format="yyyy-MM-dd")
<#elseif defDataType == "TIME" || formItemDataType == "DATETIME"> <#elseif defDataType == "TIME" || stdDataType == "TIME">
@JsonFormat(pattern="HH:mm", timezone="GMT+8") @JsonFormat(pattern="HH:mm", timezone="GMT+8")
@JSONField(format="HH:mm") @JSONField(format="HH:mm")
</#if> </#if>
...@@ -154,19 +155,20 @@ public class ${item.codeName}SearchContext extends QueryBuildContext { ...@@ -154,19 +155,20 @@ public class ${item.codeName}SearchContext extends QueryBuildContext {
<#list defield.getAllPSDEFSearchModes() as formitem> <#list defield.getAllPSDEFSearchModes() as formitem>
<#if formitem.getPSDEField()??> <#if formitem.getPSDEField()??>
<#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)> <#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
<#assign stdDataType=formitem.getPSDEField().stdDataType>
<#assign defDataType=formitem.getPSDEField().getDataType()> <#assign defDataType=formitem.getPSDEField().getDataType()>
<#comment>in条件通过String接,通过split拆后再进行查询</#comment> <#comment>in条件通过String接,通过split拆后再进行查询</#comment>
<#if formitem.getValueOp() == "IN" || formitem.getValueOp() == "ISNULL" || formitem.getValueOp() == "ISNOTNULL"> <#if formitem.getValueOp() == "IN" || formitem.getValueOp() == "ISNULL" || formitem.getValueOp() == "ISNOTNULL">
<#assign formItemDataType="String"> <#assign formItemDataType="String">
</#if> </#if>
<#if formItemDataType !="String"> <#if formItemDataType !="String">
<#if defDataType == "DATETIME" || formItemDataType == "DATETIME"> <#if defDataType == "DATETIME" || stdDataType == "DATETIME">
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
@JSONField(format="yyyy-MM-dd HH:mm:ss") @JSONField(format="yyyy-MM-dd HH:mm:ss")
<#elseif defDataType == "DATE" || formItemDataType == "DATE"> <#elseif defDataType == "DATE" || stdDataType == "DATE">
@JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
@JSONField(format="yyyy-MM-dd") @JSONField(format="yyyy-MM-dd")
<#elseif defDataType == "TIME" || formItemDataType == "TIME"> <#elseif defDataType == "TIME" || stdDataType == "TIME">
@JsonFormat(pattern="HH:mm", timezone="GMT+8") @JsonFormat(pattern="HH:mm", timezone="GMT+8")
@JSONField(format="HH:mm") @JSONField(format="HH:mm")
</#if> </#if>
...@@ -254,14 +256,15 @@ public class ${item.codeName}SearchContext extends SearchContextBase { ...@@ -254,14 +256,15 @@ public class ${item.codeName}SearchContext extends SearchContextBase {
<#list defield.getAllPSDEFSearchModes() as formitem> <#list defield.getAllPSDEFSearchModes() as formitem>
<#if formitem.getPSDEField()??> <#if formitem.getPSDEField()??>
<#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)> <#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
<#assign stdDataType=formitem.getPSDEField().stdDataType>
<#assign defDataType=formitem.getPSDEField().getDataType()> <#assign defDataType=formitem.getPSDEField().getDataType()>
<#if defDataType == "DATETIME" || formItemDataType == "DATETIME"> <#if defDataType == "DATETIME" || stdDataType == "DATETIME">
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
@JSONField(format="yyyy-MM-dd HH:mm:ss") @JSONField(format="yyyy-MM-dd HH:mm:ss")
<#elseif defDataType == "DATE" || formItemDataType == "DATE"> <#elseif defDataType == "DATE" || stdDataType == "DATE">
@JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
@JSONField(format="yyyy-MM-dd") @JSONField(format="yyyy-MM-dd")
<#elseif defDataType == "TIME" || formItemDataType == "TIME"> <#elseif defDataType == "TIME" || stdDataType == "TIME">
@JsonFormat(pattern="HH:mm", timezone="GMT+8") @JsonFormat(pattern="HH:mm", timezone="GMT+8")
@JSONField(format="HH:mm") @JSONField(format="HH:mm")
</#if> </#if>
...@@ -292,14 +295,15 @@ public class ${item.codeName}SearchContext extends SearchContextBase { ...@@ -292,14 +295,15 @@ public class ${item.codeName}SearchContext extends SearchContextBase {
<#list defield.getAllPSDEFSearchModes() as formitem> <#list defield.getAllPSDEFSearchModes() as formitem>
<#if formitem.getPSDEField()??> <#if formitem.getPSDEField()??>
<#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)> <#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
<#assign stdDataType=formitem.getPSDEField().stdDataType>
<#assign defDataType=formitem.getPSDEField().getDataType()> <#assign defDataType=formitem.getPSDEField().getDataType()>
<#if defDataType == "DATETIME" || formItemDataType == "DATETIME"> <#if defDataType == "DATETIME" || stdDataType == "DATETIME">
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
@JSONField(format="yyyy-MM-dd HH:mm:ss") @JSONField(format="yyyy-MM-dd HH:mm:ss")
<#elseif defDataType == "DATE" || formItemDataType == "DATE"> <#elseif defDataType == "DATE" || stdDataType == "DATE">
@JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
@JSONField(format="yyyy-MM-dd") @JSONField(format="yyyy-MM-dd")
<#elseif defDataType == "TIME" || formItemDataType == "TIME"> <#elseif defDataType == "TIME" || stdDataType == "TIME">
@JsonFormat(pattern="HH:mm", timezone="GMT+8") @JsonFormat(pattern="HH:mm", timezone="GMT+8")
@JSONField(format="HH:mm") @JSONField(format="HH:mm")
</#if> </#if>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册