From f142e86b68f5480f342442b1a4ae4c6a4fc3d912 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期二, 17 十二月 2024 09:08:12 +0800
Subject: [PATCH] 1
---
WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs
index 5c694aa..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,26 +65,7 @@
Remark = a.Remark,
DeviceType = b.DeviceType,
Enable = (b.DeviceStatus) ?? (((int)DeviceStatusEnum.Enable).ToString())
- }).ToList();
-
- //return Db.Queryable<Dt_DispatchInfo, Dt_DeviceInfo>((a, b) => a.JobGroup == b.DeviceType && b.DeviceStatus == ((int)DeviceStatusEnum.Enable).ToString()).Select((a, b) => new DispatchInfoDTO
- //{
- // JobGroup = a.JobGroup,
- // AssemblyName = a.AssemblyName,
- // BeginTime = a.BeginTime,
- // ClassName = a.ClassName,
- // CreateDate = a.CreateDate,
- // Creater = a.Creater,
- // CycleHasRunTimes = 0,
- // EndTime = a.EndTime,
- // Id = b.Id,
- // IntervalSecond = a.IntervalSecond,
- // Modifier = a.Modifier,
- // ModifyDate = a.ModifyDate,
- // Name = a.Name,
- // Remark = a.Remark,
- // DeviceType = b.DeviceType
- //}).ToList();
+ }).ToList().Where(b => b.Enable == ((int)DeviceStatusEnum.Enable).ToString()).ToList();
}
}
}
--
Gitblit v1.9.3