diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs index 69d32ac..35b62ab 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs @@ -282,7 +282,8 @@ namespace APT.SC.WebApi.Controllers.Api.BI result.SumSubMode = Convert.ToDecimal(dtSubInfoSum.Rows[0]["SumMODE"].ToString()); } - result.listSubTypeCount = new Dictionary(); + + var listSubTypeCount = new Dictionary(); if (dtSubTypeSum != null && dtSubTypeSum.Rows.Count > 0) { string NameType = string.Empty; @@ -295,18 +296,35 @@ namespace APT.SC.WebApi.Controllers.Api.BI PRODUCTION = int.Parse(item["PRODUCTION"].ToString().Trim()); NameType = ((PRODUCTIONEnum)PRODUCTION).GetDescription(); CountRow = int.Parse(item["cdCount"].ToString().Trim()); - if (result.listSubTypeCount.ContainsKey(NameType)) + if (listSubTypeCount.ContainsKey(NameType)) { - result.listSubTypeCount[NameType] += CountRow; + listSubTypeCount[NameType] += CountRow; } else { - result.listSubTypeCount.Add(NameType, CountRow); + listSubTypeCount.Add(NameType, CountRow); } } catch { } } } + result.listSubTypeCount = new Dictionary(); + if (listSubTypeCount.ContainsKey(PRODUCTIONEnum.Mine.GetDescription())) + { + result.listSubTypeCount.Add(PRODUCTIONEnum.Mine.GetDescription(), listSubTypeCount[PRODUCTIONEnum.Mine.GetDescription()]); + } + if (listSubTypeCount.ContainsKey(PRODUCTIONEnum.MineUnderGround.GetDescription())) + { + result.listSubTypeCount.Add(PRODUCTIONEnum.MineUnderGround.GetDescription(), listSubTypeCount[PRODUCTIONEnum.MineUnderGround.GetDescription()]); + } + if (listSubTypeCount.ContainsKey(PRODUCTIONEnum.MineChoose.GetDescription())) + { + result.listSubTypeCount.Add(PRODUCTIONEnum.MineChoose.GetDescription(), listSubTypeCount[PRODUCTIONEnum.MineChoose.GetDescription()]); + } + if (listSubTypeCount.ContainsKey(PRODUCTIONEnum.Minelast.GetDescription())) + { + result.listSubTypeCount.Add(PRODUCTIONEnum.Minelast.GetDescription(), listSubTypeCount[PRODUCTIONEnum.Minelast.GetDescription()]); + } return result; }); }