统一字段类型

project-order/src/main/java/com/dituhui/pea/order/dao/OrderChangeDao.java

@@ -8,6 +8,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.Date;
 
 
 @Repository
 @Repository
@@ -15,12 +16,12 @@ import java.util.Date;
 public interface OrderChangeDao extends JpaRepository<OrderChangeEntity, Integer> {
 public interface OrderChangeDao extends JpaRepository<OrderChangeEntity, Integer> {
 
 
     @Query("select a from OrderChangeEntity a join OrderRequestEntity b on a.orderId=b.orderId where b.orgClusterId = :clusterId and Date(a.createTime) = :date")
     @Query("select a from OrderChangeEntity a join OrderRequestEntity b on a.orderId=b.orderId where b.orgClusterId = :clusterId and Date(a.createTime) = :date")
-    Page<OrderChangeEntity> findAllByClusterId(String clusterId, Date date, Pageable pageable);
+    Page<OrderChangeEntity> findAllByClusterId(String clusterId, LocalDate date, Pageable pageable);
 
 
     @Query("select a from OrderChangeEntity a join OrderRequestEntity b on a.orderId=b.orderId where b.orgBranchId = :branchId and Date(a.createTime) = :date")
     @Query("select a from OrderChangeEntity a join OrderRequestEntity b on a.orderId=b.orderId where b.orgBranchId = :branchId and Date(a.createTime) = :date")
-    Page<OrderChangeEntity> findAllByBranchId(String branchId, Date date,  Pageable pageable);
+    Page<OrderChangeEntity> findAllByBranchId(String branchId, LocalDate date,  Pageable pageable);
 
 
 
 
     @Query("select a from OrderChangeEntity a join OrderRequestEntity b on a.orderId=b.orderId where b.orgGroupId = :groupId and Date(a.createTime) = :date")
     @Query("select a from OrderChangeEntity a join OrderRequestEntity b on a.orderId=b.orderId where b.orgGroupId = :groupId and Date(a.createTime) = :date")
-    Page<OrderChangeEntity> findAllByGroupId(String groupId, Date date, Pageable pageable);
+    Page<OrderChangeEntity> findAllByGroupId(String groupId, LocalDate date, Pageable pageable);
 }
 }

project-order/src/main/java/com/dituhui/pea/order/dto/OrderChangeListReqDTO.java

@@ -3,6 +3,7 @@ package com.dituhui.pea.order.dto;
 import com.dituhui.pea.order.config.OrderConfig;
 import com.dituhui.pea.order.config.OrderConfig;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
 @lombok.Data
 @lombok.Data
@@ -18,7 +19,7 @@ public class OrderChangeListReqDTO {
     private int page = OrderConfig.DEFAULT_PAGE_INDEX;
     private int page = OrderConfig.DEFAULT_PAGE_INDEX;
     private int size = OrderConfig.DEFAULT_PAGE_SIZE;
     private int size = OrderConfig.DEFAULT_PAGE_SIZE;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime date = LocalDateTime.now();
+    private LocalDate date = LocalDate.now();
     /**
     /**
      * 排序
      * 排序
      */
      */