From b1fc5223e20c5aaee90d899befdc9d0cb890a5e9 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 8 Jul 2022 18:53:50 +0000 Subject: [PATCH] --- server/AyaNova/biz/WorkOrderBiz.cs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index e8374674..01707143 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -339,9 +339,9 @@ namespace AyaNova.Biz // internal async Task> GetAccountingListBillable(long workOrderStatusId) { - + //if a specific status is requested then it doesn't matter if it's locked or not but if a specific status is not requested then any locked status is acceptable - string statusFragment=workOrderStatusId==0?"and aworkorderstatus.locked=true":$"and aworkorder.laststatusid={workOrderStatusId}"; + string statusFragment = workOrderStatusId == 0 ? "and aworkorderstatus.locked=true" : $"and aworkorder.laststatusid={workOrderStatusId}"; var ret = new List(); using (var command = ct.Database.GetDbConnection().CreateCommand()) @@ -364,16 +364,24 @@ namespace AyaNova.Biz { if (await dr.ReadAsync()) { - // o.LastWorkOrderViz = dr.GetInt64(0); - // o.LastServiceDateViz = dr.GetDateTime(1); + + var i = new WorkOrderAccountingListItem(); + i.Id = dr.GetInt64(0); + i.CustomerId = dr.GetInt64(1); + i.Serial = dr.GetInt64(2); + if (!dr.IsDBNull(3)) + i.ServiceDate = dr.GetDateTime(3); + i.CustomerName=dr.GetString(4); + i.ProjectName=dr.GetString(5); + i.WorkorderStatusName=dr.GetString(6); + i.Color=dr.GetString(7); + ret.Add(i); } } await ct.Database.CloseConnectionAsync(); } - - return ret; }