From 3ec3e0c1913bc902dbbcaeae2959897df6212ec2 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 28 十一月 2024 15:41:23 +0800
Subject: [PATCH] 更新
---
WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs
index 673bbda..7e20958 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs
@@ -47,7 +47,7 @@
/// <returns>杩斿洖璋冨害鏈嶅姟JobDTO闆嗗悎銆�</returns>
public List<DispatchInfoDTO> QueryDispatchInfos()
{
- return Db.Queryable<Dt_DispatchInfo>().LeftJoin<Dt_DeviceInfo>((a, b) => a.JobGroup == b.DeviceType).Select((a, b) => new DispatchInfoDTO
+ return Db.Queryable<Dt_DispatchInfo>().LeftJoin<Dt_DeviceInfo>((a, b) => a.Id == b.DispatchId).Select((a, b) => new DispatchInfoDTO
{
JobGroup = a.JobGroup,
AssemblyName = a.AssemblyName,
@@ -65,7 +65,7 @@
Remark = a.Remark,
DeviceType = b.DeviceType,
Enable = (b.DeviceStatus) ?? (((int)DeviceStatusEnum.Enable).ToString())
- }).ToList();
+ }).ToList().Where(b => b.Enable == ((int)DeviceStatusEnum.Enable).ToString()).ToList();
}
}
}
--
Gitblit v1.9.3