diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/listReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/listReqVO.vm index 46b6a259d1..ea3325d95a 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/listReqVO.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/listReqVO.vm @@ -10,16 +10,30 @@ import java.math.BigDecimal; #break #end #end +##只引入一次DateTimeFormat +#foreach ($column in $columns) +#if (${column.listOperation} && (${column.javaType} == "LocalDateTime" || ${column.javaType} == "LocalDate")) +import org.springframework.format.annotation.DateTimeFormat; +#break +#end +#end ## 处理 LocalDateTime 字段的引入 #foreach ($column in $columns) #if (${column.listOperation} && ${column.javaType} == "LocalDateTime") import java.time.LocalDateTime; -import org.springframework.format.annotation.DateTimeFormat; - import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; #break #end #end +## 处理 LocalDate 字段的引入 +#foreach ($column in $columns) +#if (${column.listOperation} && ${column.javaType} == "LocalDate") +import java.time.LocalDate; +import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY; +#break +#end +#end + ## 字段模板 #macro(columnTpl $prefix $prefixStr) @Schema(description = "${prefixStr}${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end) @@ -33,9 +47,15 @@ public class ${sceneEnum.prefixClass}${table.className}ListReqVO { #foreach ($column in $columns) #if (${column.listOperation})##查询操作 #if (${column.listOperationCondition} == "BETWEEN")## 情况一,Between 的时候 + #if (${column.listOperation} && ${column.javaType} == "LocalDate") + @Schema(description = "${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end) + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private ${column.javaType}[] ${column.javaField}; + #else## 如果不满足上述任何条件,做其他处理 @Schema(description = "${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private ${column.javaType}[] ${column.javaField}; + #end #else##情况二,非 Between 的时间 #columnTpl('', '') #end diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm index 003bac902f..8198e8a20c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm @@ -10,16 +10,30 @@ import java.math.BigDecimal; #break #end #end +##只引入一次DateTimeFormat +#foreach ($column in $columns) +#if (${column.listOperation} && (${column.javaType} == "LocalDateTime" || ${column.javaType} == "LocalDate")) +import org.springframework.format.annotation.DateTimeFormat; +#break +#end +#end ## 处理 LocalDateTime 字段的引入 #foreach ($column in $columns) -#if (${column.listOperationCondition} && ${column.javaType} == "LocalDateTime") -import org.springframework.format.annotation.DateTimeFormat; +#if (${column.listOperation} && ${column.javaType} == "LocalDateTime") import java.time.LocalDateTime; - import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; #break #end #end +## 处理 LocalDate 字段的引入 +#foreach ($column in $columns) +#if (${column.listOperation} && ${column.javaType} == "LocalDate") +import java.time.LocalDate; +import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY; +#break +#end +#end + ## 字段模板 #macro(columnTpl $prefix $prefixStr) @Schema(description = "${prefixStr}${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end) @@ -35,9 +49,15 @@ public class ${sceneEnum.prefixClass}${table.className}PageReqVO extends PagePar #foreach ($column in $columns) #if (${column.listOperation})##查询操作 #if (${column.listOperationCondition} == "BETWEEN")## 情况一,Between 的时候 + #if (${column.listOperation} && ${column.javaType} == "LocalDate") + @Schema(description = "${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end) + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private ${column.javaType}[] ${column.javaField}; + #else## 如果不满足上述任何条件,做其他处理 @Schema(description = "${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private ${column.javaType}[] ${column.javaField}; + #end #else##情况二,非 Between 的时间 #columnTpl('', '') #end diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm index 24c3519451..0a5f5ba119 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm @@ -10,14 +10,30 @@ import java.math.BigDecimal; #break #end #end -## 处理 LocalDateTime 字段的引入 +##只引入一次DateTimeFormat #foreach ($column in $columns) -#if (${column.listOperationResult} && ${column.javaType} == "LocalDateTime") +#if (${column.listOperation} && (${column.javaType} == "LocalDateTime" || ${column.javaType} == "LocalDate")) import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; #break #end #end +## 处理 LocalDateTime 字段的引入 +#foreach ($column in $columns) +#if (${column.listOperation} && ${column.javaType} == "LocalDateTime") +import java.time.LocalDateTime; +import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +#break +#end +#end +## 处理 LocalDate 字段的引入 +#foreach ($column in $columns) +#if (${column.listOperation} && ${column.javaType} == "LocalDate") +import java.time.LocalDate; +import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY; +#break +#end +#end + ## 处理 Excel 导出 import com.alibaba.excel.annotation.*; #foreach ($column in $columns) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm index b432c75276..1c0f937eef 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm @@ -11,11 +11,26 @@ import java.math.BigDecimal; #break #end #end +##只引入一次DateTimeFormat +#foreach ($column in $columns) +#if (${column.listOperation} && (${column.javaType} == "LocalDateTime" || ${column.javaType} == "LocalDate")) +import org.springframework.format.annotation.DateTimeFormat; +#break +#end +#end ## 处理 LocalDateTime 字段的引入 #foreach ($column in $columns) -#if ((${column.createOperation} || ${column.updateOperation}) && ${column.javaType} == "LocalDateTime") -import org.springframework.format.annotation.DateTimeFormat; +#if (${column.listOperation} && ${column.javaType} == "LocalDateTime") import java.time.LocalDateTime; +import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +#break +#end +#end +## 处理 LocalDate 字段的引入 +#foreach ($column in $columns) +#if (${column.listOperation} && ${column.javaType} == "LocalDate") +import java.time.LocalDate; +import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY; #break #end #end diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/do.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/do.vm index b019d6e12f..dc56c0b72a 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/do.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/do.vm @@ -9,6 +9,9 @@ import java.math.BigDecimal; #if (${column.javaType} == "LocalDateTime") import java.time.LocalDateTime; #end +#if (${column.javaType} == "LocalDate") +import java.time.LocalDate; +#end #end import com.baomidou.mybatisplus.annotation.*; import ${BaseDOClassName};