|
@@ -2477,13 +2477,13 @@ namespace Hotline.Application.StatisticalReport
|
|
|
var total = 0;
|
|
|
for (int l = 0; l < list.Count; l++)
|
|
|
{
|
|
|
- var columnIndex = i + 1;
|
|
|
+ var columnIndex = i + 2;
|
|
|
var value = string.Empty;
|
|
|
var orgName = string.Empty;
|
|
|
foreach (var property in (IDictionary<string, object>)list[l])
|
|
|
{
|
|
|
if (property.Key.ToLower().Equals("orgname")) orgName = property.Value.ToString();
|
|
|
- if (property.Key.ToLower().Equals(columnIndex.ToString()))
|
|
|
+ if (property.Key.ToLower().Equals(dissatisfiedReason[i].Id))
|
|
|
{
|
|
|
value = property.Value.ToString();
|
|
|
total += int.Parse(value!);
|
|
@@ -2497,8 +2497,21 @@ namespace Hotline.Application.StatisticalReport
|
|
|
dicRow["合计"][columnIndex] = total;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
foreach (var item in dicRow)
|
|
|
{
|
|
|
+ //小计
|
|
|
+ var index = 0;
|
|
|
+ var subtotal = 0;
|
|
|
+ foreach (var item2 in item.Value.ItemArray)
|
|
|
+ {
|
|
|
+ if (index >1)
|
|
|
+ {
|
|
|
+ subtotal += int.Parse(item2.ToString());
|
|
|
+ }
|
|
|
+ index++;
|
|
|
+ }
|
|
|
+ item.Value[1] = subtotal.ToString();
|
|
|
dataTable.Rows.Add(item.Value);
|
|
|
}
|
|
|
return dataTable;
|