Merge remote-tracking branch 'origin/dev' into dev

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java

@@ -30,7 +30,13 @@ public class DateUtils {
 
     public static final String FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND = "yyyy-MM-dd HH:mm:ss";
 
-    public static Date localDateTimeToDate(LocalDateTime date){
+    /**
+     * 将 LocalDateTime 转换成 Date
+     *
+     * @param date LocalDateTime
+     * @return LocalDateTime
+     */
+    public static Date of(LocalDateTime date) {
         // 将此日期时间与时区相结合以创建 ZonedDateTime
         ZonedDateTime zonedDateTime = date.atZone(ZoneId.systemDefault());
         // 本地时间线 LocalDateTime 到即时时间线 Instant 时间戳
@@ -39,7 +45,13 @@ public class DateUtils {
         return Date.from(instant);
     }
 
-    public static LocalDateTime dateToLocalDateTime(Date date){
+    /**
+     * 将 Date 转换成 LocalDateTime
+     *
+     * @param date Date
+     * @return LocalDateTime
+     */
+    public static LocalDateTime of(Date date) {
         // 转为时间戳
         Instant instant = date.toInstant();
         // UTC时间(世界协调时间,UTC + 00:00)转北京(北京,UTC + 8:00)时间
@@ -113,14 +125,14 @@ public class DateUtils {
         return a.compareTo(b) > 0 ? a : b;
     }
 
-    public static LocalDateTime maxLocalDateTime(LocalDateTime a, LocalDateTime b) {
+    public static LocalDateTime max(LocalDateTime a, LocalDateTime b) {
         if (a == null) {
             return b;
         }
         if (b == null) {
             return a;
         }
-        return a.compareTo(b) > 0 ? a : b;
+        return a.isAfter(b) ? a : b;
     }
 
     public static boolean beforeNow(Date date) {

yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java

@@ -66,7 +66,7 @@ public class ErrorCodeLoaderImpl implements ErrorCodeLoader {
             // 写入到错误码的缓存
             putErrorCode(errorCodeRespDTO.getCode(), errorCodeRespDTO.getMessage());
             // 记录下更新时间，方便增量更新
-            maxUpdateTime = DateUtils.maxLocalDateTime(maxUpdateTime, errorCodeRespDTO.getUpdateTime());
+            maxUpdateTime = DateUtils.max(maxUpdateTime, errorCodeRespDTO.getUpdateTime());
         });
     }
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java

@@ -45,7 +45,7 @@ public interface BpmModelConvert {
     default BpmModelPageItemRespVO convert(Model model, BpmFormDO form, Deployment deployment, ProcessDefinition processDefinition) {
         BpmModelPageItemRespVO modelRespVO = new BpmModelPageItemRespVO();
         modelRespVO.setId(model.getId());
-        modelRespVO.setCreateTime(DateUtils.dateToLocalDateTime(model.getCreateTime()));
+        modelRespVO.setCreateTime(DateUtils.of(model.getCreateTime()));
         // 通用 copy
         copyTo(model, modelRespVO);
         // Form
@@ -58,7 +58,7 @@ public interface BpmModelConvert {
         if (modelRespVO.getProcessDefinition() != null) {
             modelRespVO.getProcessDefinition().setSuspensionState(processDefinition.isSuspended() ?
                     SuspensionState.SUSPENDED.getStateCode() : SuspensionState.ACTIVE.getStateCode());
-            modelRespVO.getProcessDefinition().setDeploymentTime(DateUtils.dateToLocalDateTime(deployment.getDeploymentTime()));
+            modelRespVO.getProcessDefinition().setDeploymentTime(DateUtils.of(deployment.getDeploymentTime()));
         }
         return modelRespVO;
     }
@@ -66,7 +66,7 @@ public interface BpmModelConvert {
     default BpmModelRespVO convert(Model model) {
         BpmModelRespVO modelRespVO = new BpmModelRespVO();
         modelRespVO.setId(model.getId());
-        modelRespVO.setCreateTime(DateUtils.dateToLocalDateTime(model.getCreateTime()));
+        modelRespVO.setCreateTime(DateUtils.of(model.getCreateTime()));
         // 通用 copy
         copyTo(model, modelRespVO);
         return modelRespVO;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java

@@ -76,10 +76,10 @@ public class BpmTaskServiceImpl implements BpmTaskService {
             taskQuery.taskNameLike("%" + pageVO.getName() + "%");
         }
         if (pageVO.getBeginCreateTime() != null) {
-            taskQuery.taskCreatedAfter(DateUtils.localDateTimeToDate(pageVO.getBeginCreateTime()));
+            taskQuery.taskCreatedAfter(DateUtils.of(pageVO.getBeginCreateTime()));
         }
         if (pageVO.getEndCreateTime() != null) {
-            taskQuery.taskCreatedBefore(DateUtils.localDateTimeToDate(pageVO.getEndCreateTime()));
+            taskQuery.taskCreatedBefore(DateUtils.of(pageVO.getEndCreateTime()));
         }
         // 执行查询
         List<Task> tasks = taskQuery.listPage(PageUtils.getStart(pageVO), pageVO.getPageSize());
@@ -108,10 +108,10 @@ public class BpmTaskServiceImpl implements BpmTaskService {
             taskQuery.taskNameLike("%" + pageVO.getName() + "%");
         }
         if (pageVO.getBeginCreateTime() != null) {
-            taskQuery.taskCreatedAfter(DateUtils.localDateTimeToDate(pageVO.getBeginCreateTime()));
+            taskQuery.taskCreatedAfter(DateUtils.of(pageVO.getBeginCreateTime()));
         }
         if (pageVO.getEndCreateTime() != null) {
-            taskQuery.taskCreatedBefore(DateUtils.localDateTimeToDate(pageVO.getEndCreateTime()));
+            taskQuery.taskCreatedBefore(DateUtils.of(pageVO.getEndCreateTime()));
         }
         // 执行查询
         List<HistoricTaskInstance> tasks = taskQuery.listPage(PageUtils.getStart(pageVO), pageVO.getPageSize());

yudao-ui-admin/src/views/pay/refund/index.vue

@@ -111,7 +111,7 @@
         </template>
       </el-table-column>
       <el-table-column label="退款金额(元)" align="center" prop="refundAmount" width="100">
-        <template scope="scope">
+        <template v-slot="scope">
           ￥{{ parseFloat(scope.row.refundAmount / 100).toFixed(2) }}
         </template>
       </el-table-column>