diff --git a/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationHeadVo.java b/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationHeadVo.java index 63cb5a6..e2cdae3 100644 --- a/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationHeadVo.java +++ b/src/main/java/com/gaotao/modules/inboundNotification/entity/vo/InboundNotificationHeadVo.java @@ -20,6 +20,12 @@ public class InboundNotificationHeadVo extends InboundNotificationHeadEntity { @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createdStartDate; // 创建时间开始 + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createdEndDate; // 创建时间结束 private String userName; private String supplierName; private List submitList; diff --git a/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java b/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java index 76502b1..eaf39a3 100644 --- a/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java +++ b/src/main/java/com/gaotao/modules/outboundNotification/entity/vo/OutboundNotificationHeadVo.java @@ -19,6 +19,12 @@ public class OutboundNotificationHeadVo extends OutboundNotificationHeadEntity { @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createdStartDate; // 创建时间开始 + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createdEndDate; // 创建时间结束 private String userName; private String customerName; private String customerAbb; // 客户简称 diff --git a/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml b/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml index 7fe54be..e198d1f 100644 --- a/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml +++ b/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml @@ -191,7 +191,14 @@ AND a.department_no = #{query.departmentNo} + + AND a.created_date >= #{query.createdStartDate} + + + AND a.created_date <= DATEADD(DAY, 1, #{query.createdEndDate}) + + ORDER BY a.created_date DESC diff --git a/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml b/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml index 449ed27..f837bf3 100644 --- a/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml +++ b/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml @@ -85,6 +85,12 @@ OR s.SupplierName LIKE '%' + #{query.customerName} + '%' ) + + AND a.created_date >= #{query.createdStartDate} + + + AND a.created_date <= DATEADD(DAY, 1, #{query.createdEndDate}) + ORDER BY a.created_date DESC