From 97ac729c2bef48ec6dfceb58e98593fe463c8a6d Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期五, 19 九月 2025 10:41:30 +0800
Subject: [PATCH] 增加时间筛选字段
---
CoreCms.Net.Services/CYOAServices/CyinOAService.cs | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/CoreCms.Net.Services/CYOAServices/CyinOAService.cs b/CoreCms.Net.Services/CYOAServices/CyinOAService.cs
index bff2835..bc7e985 100644
--- a/CoreCms.Net.Services/CYOAServices/CyinOAService.cs
+++ b/CoreCms.Net.Services/CYOAServices/CyinOAService.cs
@@ -59,8 +59,7 @@
const string IsSchoolID = "IsShoodsID:";
const string IsSchoolMangerID = "IsSchoolManger:";
const string IsDeliverManageKey = "IsDeliverManageKey:";
- private readonly ISqlSugarClient _CyDbClient;
- private readonly IUnitOfWork _UnitOfWork;
+ private readonly ISqlSugarClient _CyDbClient;
private readonly IHttpContextUser _User;
private readonly ICoreCmsUserServices _coreCmsUserServices;
private readonly IRedisOperationRepository _redisOperationRepository;
@@ -76,7 +75,7 @@
IRedisOperationRepository redisOperationRepository, ICoreCmsUserServices coreCmsUser)
{
- _UnitOfWork = unitOfWork;
+
_CyDbClient = unitOfWork.GetDbClient().GetConnection(AppSettingsConstVars.CYDbDbID);
_User = contextUser;
_coreCmsUserServices = coreCmsUserServices;
@@ -998,6 +997,7 @@
sheng = "",
shi = "",
quxian = "",
+ CreatTime = "",
});
@@ -1048,6 +1048,15 @@
}
+ if (!string.IsNullOrEmpty(obj.CreatTime))
+ {
+ var date = obj.CreatTime.ParseDateTimeRange();
+ if (date.StartDate != null && date.EndDate != null)
+ {
+
+ where = where.And(n => n.createTime > date.StartDate && n.createTime < date.EndDate);
+ }
+ }
if (!string.IsNullOrEmpty(obj.shipAddress))
{
@@ -1073,11 +1082,15 @@
deliverOrder = SqlFunc.Subqueryable<CoreDeliverOrder>().Where(x => x.OrderId == n.id
&& x.OrderState != CoreDeliverOrderType.Faile
&& x.OrderState != CoreDeliverOrderType.Completed
- && (x.DeliveryMoble != "" && x.DeliveryMoble != null)).OrderByDesc(x => x.CreateTime).First()
+ && (x.DeliveryMoble != "" && x.DeliveryMoble != null)).OrderByDesc(x => x.CreateTime).First(),
+ MakeTime = SqlFunc.Subqueryable<CoreDeliverOrder>().Where(x => x.OrderId == n.id
+ && x.OrderState != CoreDeliverOrderType.Faile
+ && x.OrderState != CoreDeliverOrderType.Completed
+ && (x.DeliveryMoble != "" && x.DeliveryMoble != null)).OrderByDesc(x => x.CreateTime).Select(x=>x.MakeTime)
},
true
- ).MergeTable().Where(where).ToPageListAsync(entity.page, entity.limit, totalNumbe);
+ ).MergeTable().Where(where).OrderBy(n=>n.MakeTime).ToPageListAsync(entity.page, entity.limit, totalNumbe);
var data = dlist.Select(x => new
{
@@ -1121,6 +1134,8 @@
shi = "",
quxian = "",
DeliveryMoble="",
+ CreatTime = "",
+
});
@@ -1156,6 +1171,15 @@
{
where = where.And(n => n.deliverOrder.MakeTime > date.StartDate && n.deliverOrder.MakeTime < date.EndDate);
+ }
+ }
+ if (!string.IsNullOrEmpty(obj.CreatTime))
+ {
+ var date = obj.CreatTime.ParseDateTimeRange();
+ if (date.StartDate != null && date.EndDate != null)
+ {
+
+ where = where.And(n => n.createTime > date.StartDate && n.createTime < date.EndDate);
}
}
@@ -1210,7 +1234,7 @@
}
, true
- ).MergeTable().Where(where).ToPageListAsync(entity.page, entity.limit, totalNumbe);
+ ).MergeTable().Where(where).OrderBy(x=>x.MakeTime).ToPageListAsync(entity.page, entity.limit, totalNumbe);
var deliveryList = await _CyDbClient.Queryable<OA_Staff>().Where(x => x.Status == "鍦ㄨ亴" && x.BF_IsDriver == true).Select(x => new
{
@@ -1643,8 +1667,8 @@
shipAddress = "",
shi = "",
quxian = "",
- DeliverState = ""
-
+ DeliverState = "",
+ CreatTime=""
});
@@ -1703,6 +1727,15 @@
}
+ if (!string.IsNullOrEmpty(obj.CreatTime))
+ {
+ var date = obj.CreatTime.ParseDateTimeRange();
+ if (date.StartDate != null && date.EndDate != null)
+ {
+
+ where = where.And(n => n.createTime > date.StartDate && n.createTime < date.EndDate);
+ }
+ }
}
where = where.And(n => n.isdelete == false);
--
Gitblit v1.9.1