Compare commits

..

No commits in common. "87bf5bbe61551c0bd6b4a029481300b1366fb4ef" and "938de5e6a23cf9f4ea318012725a3709d850cb57" have entirely different histories.

View File

@ -282,8 +282,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
result.SumSubMode = Convert.ToDecimal(dtSubInfoSum.Rows[0]["SumMODE"].ToString());
}
var listSubTypeCount = new Dictionary<string, int>();
result.listSubTypeCount = new Dictionary<string, int>();
if (dtSubTypeSum != null && dtSubTypeSum.Rows.Count > 0)
{
string NameType = string.Empty;
@ -296,35 +295,18 @@ 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 (listSubTypeCount.ContainsKey(NameType))
if (result.listSubTypeCount.ContainsKey(NameType))
{
listSubTypeCount[NameType] += CountRow;
result.listSubTypeCount[NameType] += CountRow;
}
else
{
listSubTypeCount.Add(NameType, CountRow);
result.listSubTypeCount.Add(NameType, CountRow);
}
}
catch { }
}
}
result.listSubTypeCount = new Dictionary<string, int>();
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;
});
}