Pre Merge pull request !1131 from 山崩岩阻/fix_vm_localdate

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

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")
+#if (${column.listOperation} && ${column.javaType} == "LocalDateTime")
-import org.springframework.format.annotation.DateTimeFormat;
 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

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)

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")
+#if (${column.listOperation} && ${column.javaType} == "LocalDateTime")
-import org.springframework.format.annotation.DateTimeFormat;
 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

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};