From 2f75b4c0a67ccc3a443e7cc4f2f0f909defd9a92 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期五, 01 十一月 2024 09:49:23 +0800
Subject: [PATCH] 版本更新
---
WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs
index 1e4180e..673bbda 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs
@@ -41,12 +41,13 @@
_deviceInfoRepository = deviceInfoRepository;
}
+ /// <summary>
+ /// 鏌ヨ璋冨害鏈嶅姟Job涓庡搴旂殑璁惧淇℃伅銆�
+ /// </summary>
+ /// <returns>杩斿洖璋冨害鏈嶅姟JobDTO闆嗗悎銆�</returns>
public List<DispatchInfoDTO> QueryDispatchInfos()
{
- List<Dt_DispatchInfo> dispatchInfos = BaseDal.QueryData();
- List<Dt_DeviceInfo> deviceInfos = _deviceInfoRepository.QueryData();
-
- return Db.Queryable<Dt_DispatchInfo, Dt_DeviceInfo>((a, b) => a.JobGroup == b.DeviceType && b.DeviceStatus == ((int)DeviceStatusEnum.Enable).ToString()).Select((a, b) => new DispatchInfoDTO
+ return Db.Queryable<Dt_DispatchInfo>().LeftJoin<Dt_DeviceInfo>((a, b) => a.JobGroup == b.DeviceType).Select((a, b) => new DispatchInfoDTO
{
JobGroup = a.JobGroup,
AssemblyName = a.AssemblyName,
@@ -62,7 +63,8 @@
ModifyDate = a.ModifyDate,
Name = a.Name,
Remark = a.Remark,
- DeviceStatus = b.DeviceType
+ DeviceType = b.DeviceType,
+ Enable = (b.DeviceStatus) ?? (((int)DeviceStatusEnum.Enable).ToString())
}).ToList();
}
}
--
Gitblit v1.9.3