diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs index b8d75ec7b..40a7e5a0c 100644 --- a/Service/ServiceImplementations/OperationsServiceImp.cs +++ b/Service/ServiceImplementations/OperationsServiceImp.cs @@ -25,6 +25,7 @@ using BS.Shared.DataContracts.Reports; using BS.Shared.Extensions; using BS.Shared.Services; using Dakota.Logic; +using DevExpress.DataProcessing; using Newtonsoft.Json; using RestSharp; using System; @@ -9279,7 +9280,40 @@ namespace BeWo.Service.ServiceImplementations dict.Remove(oid); } } - return dict.Values.ToList(); + + + + + //Zuletzt verwendet am zufügen: + //Prüfe, ob es einen ServiceRecord gibt, der innerhalb der Frist entstanden ist + + var oidString = String.Join(",", dict.Keys); + + sql = String.Format(@"select sr.CustomerOid, max(sr.EndDate) + from servicerecord sr + WHERE + sr.CustomerOid in ({0}) + group by sr.CustomerOid", oidString); + + + sqlresult = DAOFactory.SearchDAO.GetSqlResult(sql); + oidlist = new List(); + foreach (object[] row in sqlresult) + { + long oid = (long)row[0]; + var datum = (DateTime?)row[1]; + + if (dict.ContainsKey(oid)) + { + dict[oid].LastUsedOn = datum; + } + } + + + + newList = dict.Values.ToList(); + + return newList; } private bool CheckIfInactive(int jahreUngenutzt, InactivePersonDC item)