From 757e9a10418043eb1a5c5e41975d3eb39db66a80 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期五, 20 六月 2025 14:27:04 +0800
Subject: [PATCH] no message
---
cylsg/cylsg.Application/CyOS/CyOSSettingController.cs | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs b/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
index 538fbb9..dcdb043 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
+++ b/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();
+ }
}
+
+
+
}
--
Gitblit v1.9.1