From a247547df86f0fad8f03aebb91de68d3f2bc7918 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 01 五月 2025 10:16:52 +0800
Subject: [PATCH] 修正sugsql导航更新加配置的bug
---
cylsg/cylsg.Application/CyOS/CyOSSettingController.cs | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs b/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
index 687476c..87256d7 100644
--- a/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
+++ b/cylsg/cylsg.Application/CyOS/CyOSSettingController.cs
@@ -7,6 +7,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.ProductOfflineGetSameCityTemplateResponse.Types.Template.Types;
namespace cylsg.Application.CyOS
{
@@ -41,14 +42,14 @@
Name = x.Name,
Keyid = x.Keyid,
Remark = x.Remark,
- }).WithCache(3600).ToListAsync();
+ }).WithCache(60).ToListAsync();
}
/// <summary>
/// 鑾峰彇绉戠洰鍒楄〃
/// </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
@@ -56,7 +57,7 @@
SubjectName = x.SubjectName,
Keyid = x.Keyid,
Remark = x.Remark,
- }).WithCache(3600).ToListAsync();
+ }).WithCache(60).ToListAsync();
}
/// <summary>
/// 鑾峰彇娴佹按鍙�
@@ -73,7 +74,7 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- [AllowAnonymous]
+ //[AllowAnonymous]
public async Task<object> GeCorporateClients()
{
return await _client.Queryable<OA_CorporateClients>()
@@ -94,15 +95,17 @@
/// </summary>
/// <returns></returns>
[HttpGet]
+ [AllowAnonymous]
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(1800).ToListAsync();
+ }).ToListAsync();
}
@@ -114,14 +117,16 @@
[AllowAnonymous]
public async Task<List<OaStaff>> GetDriversOfWithin7days()
{
- var list = await _client.Queryable<OA_DeliverPlan>().Where(x => SqlFunc.ToDate(x.DeliverTime) < DateTime.Now.AddDays(8).Date && SqlFunc.ToDate(x.DeliverTime) >= DateTime.Now.Date).GroupBy(x => x.DriverId).Select(x => x.DriverId).ToListAsync();
- return await _client.Queryable<OaStaff>().In(list).Where(x => x.Status == "鍦ㄨ亴" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
+
+ 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>().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(1800).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
--
Gitblit v1.9.1