From 39141bd090edf2511ee40323ca6f2af4a0a7eaa6 Mon Sep 17 00:00:00 2001
From: Xiangdong She <Xiangdong.She2@nike.com>
Date: Mon, 5 Jun 2023 17:35:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?sendtime=E7=B1=BB=E5=9E=8B=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/service/mail/MailLogServiceImplTest.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java
index 53acd0ef0..4c4a0bdd3 100755
--- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java
+++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java
@@ -14,6 +14,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.Map;
 
 import static cn.hutool.core.util.RandomUtil.randomEle;
@@ -140,7 +141,7 @@ public class MailLogServiceImplTest extends BaseDbUnitTest {
            o.setAccountId(10L);
            o.setTemplateId(100L);
            o.setSendStatus(MailSendStatusEnum.INIT.getStatus());
-           o.setSendTime(buildTime(2023, 2, 10));
+           o.setSendTime(LocalDateTime.now());
            o.setTemplateParams(randomTemplateParams());
        });
        mailLogMapper.insert(dbMailLog);
@@ -157,7 +158,7 @@ public class MailLogServiceImplTest extends BaseDbUnitTest {
        // 测试 sendStatus 不匹配
        mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendStatus(MailSendStatusEnum.SUCCESS.getStatus())));
        // 测试 sendTime 不匹配
-       mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendTime(buildTime(2023, 3, 10))));
+       mailLogMapper.insert(cloneIgnoreId(dbMailLog, o -> o.setSendTime(LocalDateTime.now())));
        // 准备参数
        MailLogPageReqVO reqVO = new MailLogPageReqVO();
        reqVO.setUserId(1L);

From c51412977241acb68b955986965b08dba81a0e41 Mon Sep 17 00:00:00 2001
From: Xiangdong She <Xiangdong.She2@nike.com>
Date: Wed, 16 Aug 2023 10:58:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=201.=20=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=AF=BC=E5=85=A5=202.=20=E5=8A=A0=E5=85=A5B?=
 =?UTF-8?q?igDecimal=E3=80=81LocalDate=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=8F=8A=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codegen/java/controller/vo/baseVO.vm      | 16 ++++++++++++--
 .../codegen/java/controller/vo/createReqVO.vm | 20 ++++++++++++-----
 .../codegen/java/controller/vo/excelVO.vm     | 22 ++++++++++---------
 .../codegen/java/controller/vo/exportReqVO.vm | 18 +++++++++++----
 .../codegen/java/controller/vo/pageReqVO.vm   | 20 ++++++++++++-----
 .../codegen/java/controller/vo/respVO.vm      | 18 +++++++++++++--
 .../codegen/java/controller/vo/updateReqVO.vm | 20 ++++++++++++-----
 .../src/main/resources/codegen/java/dal/do.vm | 16 ++++++++++++--
 8 files changed, 115 insertions(+), 35 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/baseVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/baseVO.vm
index cc612e337..e1ec7adaf 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/baseVO.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/baseVO.vm
@@ -3,12 +3,24 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
+## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
+#set($importedClasses = [])
 #foreach ($column in $columns)
-#if (${column.javaType} == "BigDecimal")
+#if (${column.createOperation} && ${column.updateOperation} && ${column.listOperationResult})##通用操作
+#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
+#set($dummy = $importedClasses.add("java.math.BigDecimal"))
 import java.math.BigDecimal;
 #end
-#if (${column.javaType} == "LocalDateTime")
+#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
+#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
 import java.time.LocalDateTime;
+import org.springframework.format.annotation.DateTimeFormat;
+import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+#end
+#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
+#set($dummy = $importedClasses.add("java.time.LocalDate"))
+import java.time.LocalDate;
+#end
 #end
 #end
 import javax.validation.constraints.*;
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm
index d4f6f8ea9..5bf0f9180 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm
@@ -4,14 +4,24 @@ import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import javax.validation.constraints.*;
-## 处理 Date 字段的引入
+## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
+#set($importedClasses = [])
 #foreach ($column in $columns)
-#if (${column.createOperation} && (!${column.updateOperation} || !${column.listOperationResult})
-    && ${column.javaType} == "LocalDateTime")## 时间类型
-import org.springframework.format.annotation.DateTimeFormat;
+#if (${column.createOperation} && (!${column.updateOperation} || !${column.listOperationResult}))##不是通用字段
+#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
+#set($dummy = $importedClasses.add("java.math.BigDecimal"))
+import java.math.BigDecimal;
+#end
+#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
+#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
 import java.time.LocalDateTime;
+import org.springframework.format.annotation.DateTimeFormat;
 import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-#break
+#end
+#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
+#set($dummy = $importedClasses.add("java.time.LocalDate"))
+import java.time.LocalDate;
+#end
 #end
 #end
 
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/excelVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/excelVO.vm
index 15c6660c8..a88ab3ce1 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/excelVO.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/excelVO.vm
@@ -3,22 +3,24 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
+## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
+#set($importedClasses = [])
 #foreach ($column in $columns)
-#if (${column.javaType} == "BigDecimal")
+#if (${column.listOperationResult})##返回字段
+#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
+#set($dummy = $importedClasses.add("java.math.BigDecimal"))
 import java.math.BigDecimal;
 #end
-#if (${column.javaType} == "LocalDateTime")
+#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
+#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
 import java.time.LocalDateTime;
+import org.springframework.format.annotation.DateTimeFormat;
+import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 #end
+#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
+#set($dummy = $importedClasses.add("java.time.LocalDate"))
+import java.time.LocalDate;
 #end
-
-import com.alibaba.excel.annotation.ExcelProperty;
-#foreach ($column in $columns)
-#if ("$!column.dictType" != "")## 有设置数据字典
-import ${DictFormatClassName};
-import ${DictConvertClassName};
-
-#break
 #end
 #end
 
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/exportReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/exportReqVO.vm
index d3ef4aacd..36001ceea 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/exportReqVO.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/exportReqVO.vm
@@ -4,14 +4,24 @@ import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import ${PageParamClassName};
-## 处理 Date 字段的引入
+## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
+#set($importedClasses = [])
 #foreach ($column in $columns)
-#if (${column.listOperation} && ${column.javaType} == "LocalDateTime")## 时间类型
+#if (${column.listOperation})##查询操作
+#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
+#set($dummy = $importedClasses.add("java.math.BigDecimal"))
+import java.math.BigDecimal;
+#end
+#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
+#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
 import java.time.LocalDateTime;
 import org.springframework.format.annotation.DateTimeFormat;
-
 import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-#break
+#end
+#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
+#set($dummy = $importedClasses.add("java.time.LocalDate"))
+import java.time.LocalDate;
+#end
 #end
 #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 6f9868da3..f46282764 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
@@ -4,14 +4,24 @@ import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import ${PageParamClassName};
-## 处理 Date 字段的引入
+## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
+#set($importedClasses = [])
 #foreach ($column in $columns)
-#if (${column.listOperation} && ${column.javaType} == "LocalDateTime")## 时间类型
-import org.springframework.format.annotation.DateTimeFormat;
+#if (${column.listOperation})##查询操作
+#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
+#set($dummy = $importedClasses.add("java.math.BigDecimal"))
+import java.math.BigDecimal;
+#end
+#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
+#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
 import java.time.LocalDateTime;
-
+import org.springframework.format.annotation.DateTimeFormat;
 import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-#break
+#end
+#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
+#set($dummy = $importedClasses.add("java.time.LocalDate"))
+import java.time.LocalDate;
+#end
 #end
 #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 517d8bcd5..656f862a5 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
@@ -2,10 +2,24 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
+#set($importedClasses = [])
 #foreach ($column in $columns)
-#if (${column.javaType} == "LocalDateTime")
+#if (${column.listOperationResult} && (!${column.createOperation} || !${column.updateOperation}))##不是通用字段
+#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
+#set($dummy = $importedClasses.add("java.math.BigDecimal"))
+import java.math.BigDecimal;
+#end
+#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
+#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
 import java.time.LocalDateTime;
-#break
+import org.springframework.format.annotation.DateTimeFormat;
+import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+#end
+#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
+#set($dummy = $importedClasses.add("java.time.LocalDate"))
+import java.time.LocalDate;
+#end
 #end
 #end
 
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/updateReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/updateReqVO.vm
index 48d74321d..0782d549a 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/updateReqVO.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/updateReqVO.vm
@@ -4,14 +4,24 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import javax.validation.constraints.*;
-## 处理 Date 字段的引入
+## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
+#set($importedClasses = [])
 #foreach ($column in $columns)
-#if (${column.updateOperation} && (!${column.createOperation} || !${column.listOperationResult})
-    && ${column.javaType} == "LocalDateTime")## 时间类型
-import org.springframework.format.annotation.DateTimeFormat;
+#if (${column.updateOperation} && (!${column.createOperation} || !${column.listOperationResult}))##不是通用字段
+#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
+#set($dummy = $importedClasses.add("java.math.BigDecimal"))
+import java.math.BigDecimal;
+#end
+#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
+#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
 import java.time.LocalDateTime;
+import org.springframework.format.annotation.DateTimeFormat;
 import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-#break
+#end
+#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
+#set($dummy = $importedClasses.add("java.time.LocalDate"))
+import java.time.LocalDate;
+#end
 #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 d551d4b30..76397a6da 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
@@ -2,12 +2,24 @@ package ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.busines
 
 import lombok.*;
 import java.util.*;
+## 处理 BigDecimal/LocalDate/LocalDateTime 字段的引入
+#set($importedClasses = [])
 #foreach ($column in $columns)
-#if (${column.javaType} == "BigDecimal")
+#if (!${baseDOFields.contains(${column.javaField})})##排除 BaseDO 的字段
+#if (${column.javaType} == "BigDecimal" && !$importedClasses.contains("java.math.BigDecimal"))
+#set($dummy = $importedClasses.add("java.math.BigDecimal"))
 import java.math.BigDecimal;
 #end
-#if (${column.javaType} == "LocalDateTime")
+#if (${column.javaType} == "LocalDateTime" && !$importedClasses.contains("java.time.LocalDateTime"))
+#set($dummy = $importedClasses.add("java.time.LocalDateTime"))
 import java.time.LocalDateTime;
+import org.springframework.format.annotation.DateTimeFormat;
+import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+#end
+#if (${column.javaType} == "LocalDate" && !$importedClasses.contains("java.time.LocalDate"))
+#set($dummy = $importedClasses.add("java.time.LocalDate"))
+import java.time.LocalDate;
+#end
 #end
 #end
 import com.baomidou.mybatisplus.annotation.*;