移动系统liao
2025-02-17 557c2711a3e103ebc3d0492344eca9730d5e92b2
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;
@@ -1073,11 +1072,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
            {
@@ -1210,7 +1213,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
            {