|
|
@@ -25,6 +25,7 @@ namespace CallCenterApi.Interface.Controllers.report
|
|
25
|
25
|
{
|
|
26
|
26
|
ActionResult res = NoToken("未知错误,请重新登录");
|
|
27
|
27
|
DataTable dtNew = new DataTable();
|
|
|
28
|
+
|
|
28
|
29
|
//添加第一行标题
|
|
29
|
30
|
//DataColumn dc1 = new DataColumn("");
|
|
30
|
31
|
//dtNew.Columns.Add(dc1);
|
|
|
@@ -109,11 +110,9 @@ namespace CallCenterApi.Interface.Controllers.report
|
|
109
|
110
|
for (int i = 0; i < modelList.Count; i++)
|
|
110
|
111
|
{
|
|
111
|
112
|
string colname = modelList[i].F_CategoryName;
|
|
112
|
|
- //if (dtNew.Columns.Contains(colname))
|
|
113
|
|
- // colname += "_1";
|
|
|
113
|
+ if (colnames.Contains(colname))
|
|
|
114
|
+ colname += "_" + i;
|
|
114
|
115
|
colnames.Add(colname);
|
|
115
|
|
- //dtNew.Columns.Add(new DataColumn(colname));
|
|
116
|
|
- //cateid[i] = modelList[i].F_CategoryId;
|
|
117
|
116
|
}
|
|
118
|
117
|
//dtNew.Columns.Add("总计");
|
|
119
|
118
|
colnames.Add("");
|
|
|
@@ -207,7 +206,7 @@ namespace CallCenterApi.Interface.Controllers.report
|
|
207
|
206
|
{
|
|
208
|
207
|
int ecount = 0;
|
|
209
|
208
|
int sum = 0;
|
|
210
|
|
- for (int j = 1; j < dtNew.Rows.Count; j++)
|
|
|
209
|
+ for (int j = 0; j < dtNew.Rows.Count; j++)
|
|
211
|
210
|
{
|
|
212
|
211
|
if (dtNew.Rows[j][i] != null)
|
|
213
|
212
|
{
|