Fix Search

This commit is contained in:
2021-07-24 13:44:49 +05:00
parent 2eccc7a25d
commit cdefe04db2
17 changed files with 44 additions and 42 deletions

View File

@@ -312,11 +312,11 @@ namespace Diplom_B.DB
var tmp = (from a in db.Dogovory
where
a.Id.ToString().ToLower().Contains(f) ||
a.DogNum.ToLower().Contains(f) ||
(!string.IsNullOrEmpty(a.DogNum) && a.DogNum.ToLower().Contains(f)) ||
a.DataPostavky.ToString("yyyy.MM.dd").Contains(f) ||
a.PrikazZapusk.ToLower().Contains(f) ||
a.Garantiy.ToLower().Contains(f) ||
a.Primechanie.ToLower().Contains(f)
(!string.IsNullOrEmpty(a.PrikazZapusk) && a.PrikazZapusk.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.Garantiy) && a.Garantiy.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.Primechanie) && a.Primechanie.ToLower().Contains(f))
select a).ToArray();
return tmp;
}
@@ -380,7 +380,7 @@ namespace Diplom_B.DB
var tmp = (from a in db.Users
where
a.Id.ToString().ToLower().Contains(f) ||
a.Name.ToLower().Contains(f)
(!string.IsNullOrEmpty(a.Name) && a.Name.ToLower().Contains(f))
select a).ToArray();
return tmp;
}
@@ -456,14 +456,14 @@ namespace Diplom_B.DB
var tmp = (from a in db.Izdeliya
where
a.Id.ToString().ToLower().Contains(f) ||
a.Name.ToLower().Contains(f) ||
a.DecNum.ToLower().Contains(f) ||
a.Shifr.ToLower().Contains(f) ||
a.Litera.ToLower().Contains(f) ||
(!string.IsNullOrEmpty(a.Name) && a.Name.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.DecNum) && a.DecNum.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.Shifr) && a.Shifr.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.Litera) && a.Litera.ToLower().Contains(f)) ||
a.Cena.ToString("F2").ToLower().Contains(f) ||
a.OtdelRazrab.ToString().ToLower().Contains(f) ||
a.Ved.ToLower().Contains(f) ||
a.GlavKonstr.ToLower().Contains(f)
(!string.IsNullOrEmpty(a.Ved) && a.Ved.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.GlavKonstr) && a.GlavKonstr.ToLower().Contains(f))
select a).ToArray();
return tmp;
}
@@ -543,12 +543,12 @@ namespace Diplom_B.DB
var tmp = (from a in db.Izvescheniya
where
a.Id.ToString().ToLower().Contains(f) ||
a.IzvNum.ToLower().Contains(f) ||
(!string.IsNullOrEmpty(a.IzvNum) && a.IzvNum.ToLower().Contains(f)) ||
a.InvNum.ToString().ToLower().Contains(f) ||
a.IzmNum.ToString().ToLower().Contains(f) ||
a.UkazZad.ToLower().Contains(f) ||
a.UkazVnedr.ToLower().Contains(f) ||
a.FileName.ToLower().Contains(f)
(!string.IsNullOrEmpty(a.UkazZad) && a.UkazZad.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.UkazVnedr) && a.UkazVnedr.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.FileName) && a.FileName.ToLower().Contains(f))
select a).ToArray();
return tmp;
}
@@ -628,10 +628,10 @@ namespace Diplom_B.DB
var tmp = (from a in db.Zakazchiki
where
a.Id.ToString().ToLower().Contains(f) ||
a.Name.ToLower().Contains(f) ||
a.Adress.ToLower().Contains(f) ||
a.Phone.ToLower().Contains(f) ||
a.Email.ToLower().Contains(f)
(!string.IsNullOrEmpty(a.Name) && a.Name.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.Adress) && a.Adress.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.Phone) && a.Phone.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.Email) && a.Email.ToLower().Contains(f))
select a).ToArray();
return tmp;
}
@@ -802,10 +802,10 @@ namespace Diplom_B.DB
var tmp = (from a in db.Postavki
where
a.Id.ToString().ToLower().Contains(f) ||
a.ZavNum.ToLower().Contains(f) ||
(!string.IsNullOrEmpty(a.ZavNum) && a.ZavNum.ToLower().Contains(f)) ||
a.DataPostavki.ToString("yyyy.MM.dd").ToLower().Contains(f) ||
a.Status.Stat.ToString().ToLower().Contains(f) ||
a.Primechanie.ToLower().Contains(f)
(!string.IsNullOrEmpty(a.Primechanie) && a.Primechanie.ToLower().Contains(f))
select a).ToArray();
return tmp;
}
@@ -924,11 +924,11 @@ namespace Diplom_B.DB
var tmp = (from a in db.Documenty
where
a.Id.ToString().ToLower().Contains(f) ||
a.InvNum.ToLower().Contains(f) ||
a.DecNum.ToLower().Contains(f) ||
a.Name.ToLower().Contains(f) ||
a.FileName.ToLower().Contains(f) ||
a.Primechanie.ToLower().Contains(f)
(!string.IsNullOrEmpty(a.InvNum) && a.InvNum.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.DecNum) && a.DecNum.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.Name) && a.Name.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.FileName) && a.FileName.ToLower().Contains(f)) ||
(!string.IsNullOrEmpty(a.Primechanie) && a.Primechanie.ToLower().Contains(f))
select a).ToArray();
return tmp;
}