From ba46746a8e4cdf94f7746dc39f31a0d34e663605 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Tue, 30 Jan 2024 15:39:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 4 ++-- src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs | 4 ++-- src/WMS.Web.Repositories/BoxMarkRepositories.cs | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index b435179e..3fd18065 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -335,12 +335,12 @@ 操作人 - + 生成开始时间 - + 生成结束时间 diff --git a/src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs b/src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs index 4774e8a1..d6cf22d9 100644 --- a/src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs @@ -37,10 +37,10 @@ namespace WMS.Web.Core.Dto /// /// 生成开始时间 /// - public DateTime? BeginTime { get; set; } = null; + public DateTime? BeginDate { get; set; } = null; /// /// 生成结束时间 /// - public DateTime? EndTime { get; set; } = null; + public DateTime? EndDate { get; set; } = null; } } diff --git a/src/WMS.Web.Repositories/BoxMarkRepositories.cs b/src/WMS.Web.Repositories/BoxMarkRepositories.cs index fd323d21..c8764a75 100644 --- a/src/WMS.Web.Repositories/BoxMarkRepositories.cs +++ b/src/WMS.Web.Repositories/BoxMarkRepositories.cs @@ -120,10 +120,10 @@ namespace WMS.Web.Repositories if (cr_ids.Count != 0) query = query.Where(w => cr_ids.Contains(w.CreatorId)); - if (dto.BeginTime != null) - query = query.Where(w => w.CreateTime >= dto.BeginTime.Value); - if (dto.EndTime != null) - query = query.Where(w => w.CreateTime <= dto.EndTime.Value); + if (dto.BeginDate != null) + query = query.Where(w => w.CreateTime >= dto.BeginDate.Value); + if (dto.EndDate != null) + query = query.Where(w => w.CreateTime <= dto.EndDate.Value); int total = await query.CountAsync(); var list = await query.Select(s => new BoxMarkQueryResponse()