ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GetHomeInfo 去除生产单元

Browse Source
This commit is contained in:
wyw 2024-06-05 14:48:42 +08:00
parent 956503400c
commit a48b8ee4c8
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
View File

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