This commit is contained in:
2025-10-10 17:40:09 +08:00
parent b8e282f672
commit 7a4cd1d6ea
10 changed files with 263 additions and 180 deletions
@@ -396,6 +396,7 @@ namespace FineUIPro.Web.HSSE.Manager
int sumD03 = getLists.Sum(x => x.D03) ?? 0;
int sumD04 = getLists.Sum(x => x.D04) ?? 0;
int sumS01 = getLists.Sum(x => x.S01) ?? 0;
int sumS02 = getLists.Sum(x => x.S02) ?? 0;
if (this.GvSeDinMonthReport4Item.Rows.Count > 0)
{
JObject summary = new JObject
@@ -412,7 +413,8 @@ namespace FineUIPro.Web.HSSE.Manager
{ "D03", sumD03 },
{ "D04", sumD04 },
{ "S01", sumS01 },
{ "TotalNum", sumS01+sumT02+sumT03+sumT04+sumT05+sumT06+sumD01+sumD02+sumD03+sumD04+sumS01 }
{ "S02", sumS02 },
{ "TotalNum", sumT01+sumT02+sumT03+sumT04+sumT05+sumT06+sumD01+sumD02+sumD03+sumD04+sumS01+sumS02 }
};
GvSeDinMonthReport5Item.SummaryData = summary;
}
@@ -878,6 +880,7 @@ namespace FineUIPro.Web.HSSE.Manager
var d03 = values.Value<string>("D03");
var d04 = values.Value<string>("D04");
var s01 = values.Value<string>("S01");
var s02 = values.Value<string>("S02");
Model.SeDinMonthReport5Item newReport5Item = new Model.SeDinMonthReport5Item();
newReport5Item.UnitName = unitName;
newReport5Item.T01 = Funs.GetNewInt(t01);
@@ -891,6 +894,7 @@ namespace FineUIPro.Web.HSSE.Manager
newReport5Item.D03 = Funs.GetNewInt(d03);
newReport5Item.D04 = Funs.GetNewInt(d04);
newReport5Item.S01 = Funs.GetNewInt(s01);
newReport5Item.S02 = Funs.GetNewInt(s02);
listSeDinMonthReport5Item.Add(newReport5Item);
}
newItem.SeDinMonthReport5Item = listSeDinMonthReport5Item;