安全巡检闪退bug修复
This commit is contained in:
parent
c31c70a828
commit
aa7f9f9499
|
|
@ -45,7 +45,10 @@ namespace BLL
|
||||||
public static IEnumerable getListData(string projectId, string checkMan, string type, string workAreaName, string responsibilityUnitName, DateTime? startTime, DateTime? endTime, DateTime? startRectificationTime, DateTime? endRectificationTime
|
public static IEnumerable getListData(string projectId, string checkMan, string type, string workAreaName, string responsibilityUnitName, DateTime? startTime, DateTime? endTime, DateTime? startRectificationTime, DateTime? endRectificationTime
|
||||||
, string states, string personId, string unitId, Grid Grid1)
|
, string states, string personId, string unitId, Grid Grid1)
|
||||||
{
|
{
|
||||||
IQueryable<Model.View_Hazard_HazardRegisterList> getDataList = getDataLists;
|
var db= Funs.DB;
|
||||||
|
IQueryable<Model.View_Hazard_HazardRegisterList> getDataList = from x in db.View_Hazard_HazardRegisterList
|
||||||
|
where x.ProblemTypes == "1"
|
||||||
|
select x;
|
||||||
if (!string.IsNullOrEmpty(projectId))
|
if (!string.IsNullOrEmpty(projectId))
|
||||||
{
|
{
|
||||||
getDataList = getDataList.Where(e => e.ProjectId == projectId);
|
getDataList = getDataList.Where(e => e.ProjectId == projectId);
|
||||||
|
|
@ -101,7 +104,7 @@ namespace BLL
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
|
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
|
||||||
return from x in getDataList
|
return (from x in getDataList
|
||||||
select new
|
select new
|
||||||
{
|
{
|
||||||
x.HazardRegisterId,
|
x.HazardRegisterId,
|
||||||
|
|
@ -122,7 +125,7 @@ namespace BLL
|
||||||
x.CheckManName,
|
x.CheckManName,
|
||||||
x.RegisterDate,
|
x.RegisterDate,
|
||||||
x.StatesStr,
|
x.StatesStr,
|
||||||
};
|
}).ToList();
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue