diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs index 34e87e9..9b233b1 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs @@ -546,11 +546,11 @@ namespace APT.SC.WebApi.Controllers.Api.BI { //按生产单元 获取数据 HomeResult result = new HomeResult(); - if (string.IsNullOrEmpty(filter.Keyword)) - { - return result; - } - int MineType = int.Parse(filter.Keyword); + //if (string.IsNullOrEmpty(filter.Keyword)) + //{ + // return result; + //} + //int MineType = int.Parse(filter.Keyword); #region Collection was modified, enumeration operation may not execute(foreach) 不要 SelectField 看看结果 如果继续报错 返回来 //TODO wyw SelectField @@ -559,14 +559,14 @@ namespace APT.SC.WebApi.Controllers.Api.BI //filterD.SelectField = new List { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID", "MineType" }; //var listDep1MineType = GetEntities(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 0, filterD, null);//部门就可以了 因为都相向 统计了 - var listDep1MineType = GetEntities(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 0, null, null);//部门就可以了 因为都相向 统计了 + var listDep1MineType = GetEntities(t => t.DEPARTMENT_TYPE == 0, null, null);//t.MineType.HasValue && t.MineType == MineType && //部门就可以了 因为都相向 统计了 #endregion - if (listDep1MineType == null || !listDep1MineType.Any()) - { - return result; - } + //if (listDep1MineType == null || !listDep1MineType.Any()) + //{ + // return result; + //} List listDep = new List(); DateTime dtNow = DateTime.Now; @@ -901,23 +901,24 @@ namespace APT.SC.WebApi.Controllers.Api.BI List ListSafeCheckYearMonthT = BIHomeService.GetHomeCheckCountMonth(filter.OrgId, listDep.ToList(), befoMonth).ToList(); var listCheckTypeIDT = ListSafeCheckYearMonthT.Select(e => e.SOURCEID).Distinct().ToList(); - var enums = GetEntity(e => e.VALUE == MineType && e.CODE == "BSMineTypeEnum"); - if (enums != null) + //var enums = GetEntity(e => e.VALUE == MineType && e.CODE == "BSMineTypeEnum"); + //if (enums != null) + //{ + //var listTypeMine = GetEntities(e => e.MINETYPE_ENUMS_ID == enums.ID, null, null); + var listTypeMine = GetEntities(e => 1 == 1, null, null); + if (listTypeMine != null && listTypeMine.Any()) { - var listTypeMine = GetEntities(e => e.MINETYPE_ENUMS_ID == enums.ID, null, null); - if (listTypeMine != null && listTypeMine.Any()) + var listMineCheckTypeID = listTypeMine.Where(e => e.CHECK_TYPE_ID.HasValue).Select(e => e.CHECK_TYPE_ID.Value); + for (int i = 0; i < listCheckTypeIDT.Count; i++) { - var listMineCheckTypeID = listTypeMine.Where(e => e.CHECK_TYPE_ID.HasValue).Select(e => e.CHECK_TYPE_ID.Value); - for (int i = 0; i < listCheckTypeIDT.Count; i++) + if (!listMineCheckTypeID.Contains(listCheckTypeIDT[i])) { - if (!listMineCheckTypeID.Contains(listCheckTypeIDT[i])) - { - listCheckTypeIDT.RemoveAt(i); - i--; - } + listCheckTypeIDT.RemoveAt(i); + i--; } } } + //} var listCheckType = GetEntities(e => listCheckTypeIDT.Contains(e.ID), null, null).OrderBy(e => e.PARENT_ID).ThenBy(e => e.NUM).ToList();