判断字段为空
This commit is contained in:
parent
769de7e446
commit
badab1ce19
|
@ -48,14 +48,17 @@ namespace CompetitionAPI.Controllers.api
|
||||||
//所有商品按种类累计重量
|
//所有商品按种类累计重量
|
||||||
list.ForEach(a =>
|
list.ForEach(a =>
|
||||||
{
|
{
|
||||||
allWT += a.BILL_GROSS_WT.Value;
|
if (a.BILL_GROSS_WT.HasValue && !string.IsNullOrEmpty(a.GOODS_CODE))
|
||||||
if (!dic.ContainsKey(a.GOODS_CODE))
|
|
||||||
{
|
{
|
||||||
dic.Add(a.GOODS_CODE, a.BILL_GROSS_WT.Value);
|
allWT += a.BILL_GROSS_WT.Value;
|
||||||
}
|
if (!dic.ContainsKey(a.GOODS_CODE))
|
||||||
else
|
{
|
||||||
{
|
dic.Add(a.GOODS_CODE, a.BILL_GROSS_WT.Value);
|
||||||
dic[a.GOODS_CODE] += a.BILL_GROSS_WT.Value;
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
dic[a.GOODS_CODE] += a.BILL_GROSS_WT.Value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
var tmp = dic.OrderByDescending(a => a.Value).ToList();
|
var tmp = dic.OrderByDescending(a => a.Value).ToList();
|
||||||
|
@ -146,7 +149,10 @@ namespace CompetitionAPI.Controllers.api
|
||||||
var list = bll_storage.GetModelList("STOCK_BALANCE > 0").FindAll(a => Tool.IsFuZhouCustom(a.CUSTOMS_CODE));
|
var list = bll_storage.GetModelList("STOCK_BALANCE > 0").FindAll(a => Tool.IsFuZhouCustom(a.CUSTOMS_CODE));
|
||||||
list.ForEach(a =>
|
list.ForEach(a =>
|
||||||
{
|
{
|
||||||
num += a.STOCK_BALANCE.Value;
|
if (a.STOCK_BALANCE.HasValue)
|
||||||
|
{
|
||||||
|
num += a.STOCK_BALANCE.Value;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var data = new { num = num, dw = "kg" };
|
var data = new { num = num, dw = "kg" };
|
||||||
|
@ -164,7 +170,7 @@ namespace CompetitionAPI.Controllers.api
|
||||||
//全年累计进出口传播艘次
|
//全年累计进出口传播艘次
|
||||||
var mysql = Configuration.GetConnectionString("MySQL").ToString();
|
var mysql = Configuration.GetConnectionString("MySQL").ToString();
|
||||||
//按年度,福州海关下的,按VOYAGE_NO+SHIP_NAME_EN 航次+船名算一个艘次
|
//按年度,福州海关下的,按VOYAGE_NO+SHIP_NAME_EN 航次+船名算一个艘次
|
||||||
var list = bll_storage.GetModelList("YEAR(INSTRG_DATE) = " + year).FindAll(a => Tool.IsFuZhouCustom(a.CUSTOMS_CODE)).GroupBy(a => a.VOYAGE_NO + "," + a.SHIP_NAME_EN).ToList();
|
var list = bll_storage.GetModelList("YEAR(INSTRG_DATE) = " + year).FindAll(a => Tool.IsFuZhouCustom(a.CUSTOMS_CODE) && a.INSTRG_DATE.HasValue && !string.IsNullOrEmpty(a.VOYAGE_NO) && !string.IsNullOrEmpty(a.SHIP_NAME_EN)).GroupBy(a => a.VOYAGE_NO + "," + a.SHIP_NAME_EN).ToList();
|
||||||
Dictionary<int, decimal> dic = new Dictionary<int, decimal>();
|
Dictionary<int, decimal> dic = new Dictionary<int, decimal>();
|
||||||
dic.Add(1, 0);
|
dic.Add(1, 0);
|
||||||
dic.Add(2, 0);
|
dic.Add(2, 0);
|
||||||
|
@ -213,7 +219,10 @@ namespace CompetitionAPI.Controllers.api
|
||||||
dic.Add(12, 0);
|
dic.Add(12, 0);
|
||||||
list.ForEach(a =>
|
list.ForEach(a =>
|
||||||
{
|
{
|
||||||
dic[a.INSTRG_DATE.Value.Month] += a.BILL_GROSS_WT.Value;
|
if (a.INSTRG_DATE.HasValue && a.BILL_GROSS_WT.HasValue)
|
||||||
|
{
|
||||||
|
dic[a.INSTRG_DATE.Value.Month] += a.BILL_GROSS_WT.Value;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return Json(Tool.GetJsonWithCode(APICode.Success, dic));
|
return Json(Tool.GetJsonWithCode(APICode.Success, dic));
|
||||||
|
@ -245,7 +254,10 @@ namespace CompetitionAPI.Controllers.api
|
||||||
dic.Add(12, 0);
|
dic.Add(12, 0);
|
||||||
list.ForEach(a =>
|
list.ForEach(a =>
|
||||||
{
|
{
|
||||||
dic[a.INSTRG_DATE.Value.Month] += a.BILL_GROSS_WT.Value;
|
if (a.INSTRG_DATE.HasValue && a.BILL_GROSS_WT.HasValue)
|
||||||
|
{
|
||||||
|
dic[a.INSTRG_DATE.Value.Month] += a.BILL_GROSS_WT.Value;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
//计算总和
|
//计算总和
|
||||||
decimal sumYear = dic.Sum(a => a.Value);
|
decimal sumYear = dic.Sum(a => a.Value);
|
||||||
|
|
Loading…
Reference in New Issue