no message

移动系统liao

11 小时以前 757e9a10418043eb1a5c5e41975d3eb39db66a80

 cylsg/cylsg.Application/CyOS/CyOSSettingController.cs

@@ -49,7 +49,7 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]

        [AllowAnonymous]
        public async Task<List<OaSubjectSet>> getKeMuList()
        {
            return await _client.Queryable<OaSubjectSet>().Where(x => x.Status == true && x.FirmId == _oAServices.firmId && x.SubjectType == "贷").Select(x => new OaSubjectSet
@@ -74,7 +74,7 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [AllowAnonymous]
        //[AllowAnonymous]
        public async Task<object> GeCorporateClients()
        {
             return  await _client.Queryable<OA_CorporateClients>()
@@ -95,18 +95,57 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        
        public async Task<List<OaStaff>> Getdrivers()
        {
            return await _client.Queryable<OaStaff>().Where(x => x.Status == "在职" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
            return await _client.Queryable<OaStaff>().Includes(x=>x.Car).Where(x => x.Status == "在职" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
            {
                Name = x.Name,
                MemberId = x.MemberId,
                Keyid = x.Keyid,
                Car=x.Car

            }).WithCache(60).ToListAsync();
            }).ToListAsync();
        }


        /// <summary>
        /// 获取车辆列表
        /// </summary>
        /// <returns></returns>
        [HttpGet]       
        public async Task<List<OA_CarManage>> GetCarList()
        {
            var listdata= await _client.Queryable<OA_CarManage>().Includes(x => x.Staff).Where(x =>  x.MemberID == _oAServices.firmId ).Select(x=>new OA_CarManage
            {
                 Keyid = x.Keyid,
                 CarNumber = x.CarNumber,
                 Staff=x.Staff
            })
           .ToListAsync();

            foreach (var item in listdata)
            {
                if(item.Staff!=null)
                {
                    if (item.Staff.Status != "在职")
                    {
                        item.Mark = "该员工不属于在职状态,派车后可能无法完成后续流程";
                    }
                    if (item.Staff.BF_IsDriver )
                    {
                        item.Mark+= "该员工不是专职司机";
                    }
                    item.CarNumber = item.CarNumber + "(" + item.Staff.Name + ")";
                    item.Staff = null;
                }
                item.StaffID = 0;
               
                
            }
           
            return listdata;
        }
        /// <summary>
        /// 获取7天内司机列表
        /// </summary>
@@ -117,13 +156,14 @@
        {
           
            var list = await _client.Queryable<OA_DeliverPlanPaiche>().Where(x =>( x.DeliverTime.Value.Date < DateTime.Now.AddDays(8).Date) && (x.DeliverTime.Value.Date >= DateTime.Now.Date)).Select(x => x.DriverId).ToListAsync();
            return await _client.Queryable<OaStaff>().Where(x=>list.Contains(x.Keyid)).Where(x => x.Status == "在职" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
            return await _client.Queryable<OaStaff>().Includes(x=>x.Car).Where(x=>list.Contains(x.Keyid)).Where(x => x.Status == "在职" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
            {
                Name = x.Name,
                MemberId = x.MemberId,
                Keyid = x.Keyid,
                Car=x.Car

            }).WithCache(60).ToListAsync();
            })/*.WithCache(30)*/.ToListAsync(); //Includes(x => x.Car)加缓存会报错
            ////      return await _client.Queryable<OA_DeliverPlan>()
            ////.LeftJoin<OaStaff>((dp, os) => dp.DriverId == os.Keyid)
            ////.Where((dp, os) => SqlFunc.ToDate(dp.DeliverTime) < DateTime.Now.AddDays(8).Date
@@ -142,9 +182,25 @@
            ////.ToListAsync();
             }

        /// <summary>
        /// 获取员工列表
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public async Task<List<OaStaff>>GetStaffList()
        {
            return await _client.Queryable<OaStaff>().Where(x => x.Status == "在职" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
            {
                Name = x.Name,
                MemberId = x.MemberId,
                Keyid = x.Keyid,
             



            }).WithCache(30).ToListAsync();
        }

        }


  
}