From b07695709c5e519f7f76258820485d445f5c0244 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 6 Feb 2026 10:57:21 +0800 Subject: [PATCH] =?UTF-8?q?2026-02-06=20=E6=94=B6=E8=B4=A7=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=E9=80=9A=E7=9F=A5=20=E6=8B=A3?= =?UTF-8?q?=E8=B4=A7=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/vo/InboundNotificationHeadVo.java | 6 ++++++ .../entity/vo/OutboundNotificationHeadVo.java | 6 ++++++ .../inboundNotification/InboundNotificationHeadMapper.xml | 7 +++++++ .../OutboundNotificationHeadMapper.xml | 6 ++++++ 4 files changed, 25 insertions(+) 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