diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs
index 9f91a030..1b697546 100644
--- a/MP.Data/Controllers/MpStatsController.cs
+++ b/MP.Data/Controllers/MpStatsController.cs
@@ -83,15 +83,27 @@ namespace MP.Data.Controllers
///
///
///
- public List StatControlliGetAll(int numRecord, string searchVal = "")
+ public List StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
{
List dbResult = new List();
+ //dbResult = dbCtx
+ // .DbSetControlli
+ // .Where(x => x.Note.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal))
+ // .OrderByDescending(x => x.DataOra)
+ // .Take(numRecord)
+ // .ToList();
+
+ var dataFrom = new SqlParameter("@dataFrom", DataStart);
+ var dataTo = new SqlParameter("@dataTo", DataEnd);
+ var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina);
+ var idxODL = new SqlParameter("@IdxODL", IdxODL);
+ var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta);
+ var codArticolo = new SqlParameter("@CodArticolo", CodArticolo);
+
dbResult = dbCtx
.DbSetControlli
- .Where(x => x.Note.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal))
- .OrderByDescending(x => x.DataOra)
- .Take(numRecord)
+ .FromSqlRaw("EXEC stp_UI_RC_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo)
.ToList();
return dbResult;
@@ -176,15 +188,27 @@ namespace MP.Data.Controllers
///
///
///
- public List StatUserLogGetAll(int numRecord, string searchVal = "")
+ public List StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
{
List dbResult = new List();
+ //dbResult = dbCtx
+ // .DbSetUserLog
+ // .Where(x => x.Valore.Contains(searchVal) || x.Cognome.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal))
+ // .OrderByDescending(x => x.DataOraRif)
+ // .Take(numRecord)
+ // .ToList();
+
+ var dataFrom = new SqlParameter("@dataFrom", DataStart);
+ var dataTo = new SqlParameter("@dataTo", DataEnd);
+ var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina);
+ var idxODL = new SqlParameter("@IdxODL", IdxODL);
+ var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta);
+ var codArticolo = new SqlParameter("@CodArticolo", CodArticolo);
+
dbResult = dbCtx
.DbSetUserLog
- .Where(x => x.Valore.Contains(searchVal) || x.Cognome.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal))
- .OrderByDescending(x => x.DataOraRif)
- .Take(numRecord)
+ .FromSqlRaw("EXEC stp_UI_UL_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo)
.ToList();
return dbResult;
diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs
index 619b6e5e..35e34fb4 100644
--- a/MP.Stats/Data/MpStatsService.cs
+++ b/MP.Stats/Data/MpStatsService.cs
@@ -69,9 +69,9 @@ namespace MP.Stats.Data
dbController.RollBackEntity(item);
}
- public Task StatControlliGetAll(int numRecord, string searchVal = "")
+ public Task StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "")
{
- return Task.FromResult(dbController.StatControlliGetAll(numRecord, searchVal).ToArray());
+ return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray());
}
public Task StatDdbGetAll(int numRecord, string searchVal = "")
@@ -90,9 +90,9 @@ namespace MP.Stats.Data
return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray());
}
- public Task StatUserLogGetAll(int numRecord, string searchVal = "")
+ public Task StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "")
{
- return Task.FromResult(dbController.StatUserLogGetAll(numRecord, searchVal).ToArray());
+ return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray());
}
#endregion Public Methods