wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备保养pda接口修改

Browse Source
This commit is contained in:
qianjiawei
2023-12-06 11:38:39 +08:00
parent 1ee00e692a
commit 5c099f7ee9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs
View File

@@ -106,7 +106,11 @@ namespace Tnb.EquipMgr
a.last_execute_time = a.date_last_execute_time == null ? "" : a.date_last_execute_time.Value.ToString("yyyy-MM-dd HH:mm:ss"); a.last_execute_time = a.date_last_execute_time == null ? "" : a.date_last_execute_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
}) })
.ToPagedListAsync(input?.currentPage ?? 1, input?.pageSize ?? 50); .ToPagedListAsync(input?.currentPage ?? 1, input?.pageSize ?? 50);
var EqpMaintainRecordHs = await db.Queryable<EqpMaintainRecordH>().Where(p => list.list.Select(p => p.equip_id_id).ToList().Contains(p.equip_id)).ToListAsync();
foreach (var data in list.list)
{
data.last_execute_time = EqpMaintainRecordHs.Where(x => data.equip_id_id == x.equip_id && x.execute_time != null).Any() ? EqpMaintainRecordHs.Where(x => data.equip_id_id == x.equip_id && x.execute_time != null).OrderByDescending(x => x.execute_time).FirstOrDefault()!.execute_time!.Value.ToString("yyyy-MM-dd HH:mm:ss") : "";
}
return PageResult<EqpMaintainRecordListOutput>.SqlSugarPageResult(list); return PageResult<EqpMaintainRecordListOutput>.SqlSugarPageResult(list);
} }