1

hutongqing

2024-10-30 ea0628889f64f802768c4fdf17d2223424e5e29f

 WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DispatchInfoService.cs

@@ -47,7 +47,7 @@
        /// <returns>返回调度服务JobDTO集合。</returns>
        public List<DispatchInfoDTO> QueryDispatchInfos()
        {
            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,
@@ -63,8 +63,28 @@
                ModifyDate = a.ModifyDate,
                Name = a.Name,
                Remark = a.Remark,
                DeviceType = b.DeviceType
                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();
        }
    }
}