Commit 0ee9c580 by 丁伟峰

统一字段类型

1 parent b4cf818c
......@@ -8,6 +8,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import java.time.LocalDate;
import java.util.Date;
@Repository
......@@ -15,12 +16,12 @@ import java.util.Date;
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")
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")
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")
Page<OrderChangeEntity> findAllByGroupId(String groupId, Date date, Pageable pageable);
Page<OrderChangeEntity> findAllByGroupId(String groupId, LocalDate date, Pageable pageable);
}
......@@ -3,6 +3,7 @@ package com.dituhui.pea.order.dto;
import com.dituhui.pea.order.config.OrderConfig;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@lombok.Data
......@@ -18,7 +19,7 @@ public class OrderChangeListReqDTO {
private int page = OrderConfig.DEFAULT_PAGE_INDEX;
private int size = OrderConfig.DEFAULT_PAGE_SIZE;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime date = LocalDateTime.now();
private LocalDate date = LocalDate.now();
/**
* 排序
*/
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!