This commit is contained in:
parent
b120986fdc
commit
49c52159da
|
|
@ -40,7 +40,9 @@ namespace BLL
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static IEnumerable getListData(string projectId, string states, string checkType, string checkItemSetId, DateTime? startTime, DateTime? endTime, Grid Grid1)
|
public static IEnumerable getListData(string projectId, string states, string checkType, string checkItemSetId, DateTime? startTime, DateTime? endTime, Grid Grid1)
|
||||||
{
|
{
|
||||||
IQueryable<Model.Check_CheckSpecial> getDataList = getDataLists;
|
Model.SGGLDB db = Funs.DB;
|
||||||
|
IQueryable<Model.Check_CheckSpecial> getDataList = from x in db.Check_CheckSpecial
|
||||||
|
select x;
|
||||||
if (!string.IsNullOrEmpty(projectId))
|
if (!string.IsNullOrEmpty(projectId))
|
||||||
{
|
{
|
||||||
getDataList = getDataList.Where(e => e.ProjectId == projectId);
|
getDataList = getDataList.Where(e => e.ProjectId == projectId);
|
||||||
|
|
@ -87,7 +89,7 @@ namespace BLL
|
||||||
x.CheckSpecialId,
|
x.CheckSpecialId,
|
||||||
x.CheckTime,
|
x.CheckTime,
|
||||||
x.CheckSpecialCode,
|
x.CheckSpecialCode,
|
||||||
CheckItemName = Funs.DB.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItemSetId).CheckItemName,
|
CheckItemName = db.Technique_CheckItemSet.First(y => y.CheckItemSetId == x.CheckItemSetId).CheckItemName,
|
||||||
CheckTypeName = x.CheckType == "1" ? "联合检查" : "专项检查",
|
CheckTypeName = x.CheckType == "1" ? "联合检查" : "专项检查",
|
||||||
StatesName = x.States == "2" ? "已完成" : (x.States == "1" ? "待整改" : "待提交"),
|
StatesName = x.States == "2" ? "已完成" : (x.States == "1" ? "待整改" : "待提交"),
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue