Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe
This commit is contained in:
commit
9b367d7889
@ -282,7 +282,8 @@ namespace APT.SC.WebApi.Controllers.Api.BI
|
|||||||
result.SumSubMode = Convert.ToDecimal(dtSubInfoSum.Rows[0]["SumMODE"].ToString());
|
result.SumSubMode = Convert.ToDecimal(dtSubInfoSum.Rows[0]["SumMODE"].ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
result.listSubTypeCount = new Dictionary<string, int>();
|
|
||||||
|
var listSubTypeCount = new Dictionary<string, int>();
|
||||||
if (dtSubTypeSum != null && dtSubTypeSum.Rows.Count > 0)
|
if (dtSubTypeSum != null && dtSubTypeSum.Rows.Count > 0)
|
||||||
{
|
{
|
||||||
string NameType = string.Empty;
|
string NameType = string.Empty;
|
||||||
@ -295,18 +296,35 @@ namespace APT.SC.WebApi.Controllers.Api.BI
|
|||||||
PRODUCTION = int.Parse(item["PRODUCTION"].ToString().Trim());
|
PRODUCTION = int.Parse(item["PRODUCTION"].ToString().Trim());
|
||||||
NameType = ((PRODUCTIONEnum)PRODUCTION).GetDescription();
|
NameType = ((PRODUCTIONEnum)PRODUCTION).GetDescription();
|
||||||
CountRow = int.Parse(item["cdCount"].ToString().Trim());
|
CountRow = int.Parse(item["cdCount"].ToString().Trim());
|
||||||
if (result.listSubTypeCount.ContainsKey(NameType))
|
if (listSubTypeCount.ContainsKey(NameType))
|
||||||
{
|
{
|
||||||
result.listSubTypeCount[NameType] += CountRow;
|
listSubTypeCount[NameType] += CountRow;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
result.listSubTypeCount.Add(NameType, CountRow);
|
listSubTypeCount.Add(NameType, CountRow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch { }
|
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;
|
return result;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user