duhongyu 4 年 前
コミット
381fa10142
共有32 個のファイルを変更した6651 個の追加4663 個の削除を含む
  1. 1 0
      CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj
  2. 7 1
      CallCenterApi/CallCenterApi.BLL/T_Bus_Feedback_Next.cs
  3. 164 0
      CallCenterApi/CallCenterApi.BLL/T_Sys_Affairs.cs
  4. 1 0
      CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj
  5. 24 0
      CallCenterApi/CallCenterApi.DAL/T_Bus_Feedback_Next.cs
  6. 5 0
      CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs
  7. 415 0
      CallCenterApi/CallCenterApi.DAL/T_Sys_Affairs.cs
  8. 2 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj
  9. 17 0
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Sms/SMSController.cs
  10. 2 2
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/FunctionsController.cs
  11. 2 2
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/HotspotGlossaryController.cs
  12. 2 2
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/LawGuideController.cs
  13. 3 3
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/NounInterpretationController.cs
  14. 2 2
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/PolicyController.cs
  15. 2 2
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/ProfessorController.cs
  16. 1 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs
  17. 71 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs
  18. 13 224
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/APPSController.cs
  19. 4706 0
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs
  20. 516 545
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs
  21. 0 3372
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/ZhengWuController.cs
  22. 5 2
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs
  23. 44 6
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs
  24. 1 0
      CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj
  25. 14 11
      CallCenterApi/CallCenterApi.Model/T_Bus_Supervision.cs
  26. 36 36
      CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs
  27. 2 0
      CallCenterApi/CallCenterApi.Model/T_Call_CallRecords.cs
  28. 129 0
      CallCenterApi/CallCenterApi.Model/T_Sys_Affairs.cs
  29. 118 61
      CallCenterCommon/CallCenter.QuartzService/ZhengWuDuiJie.cs
  30. 4 0
      CallCenterCommon/CallCenter.Utility/Http/HttpMethods.cs
  31. 7 0
      CallCenterCommon/CallCenter.Utility/NPOI/MergerHot.cs
  32. 335 389
      CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

+ 1 - 0
CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -128,6 +128,7 @@
128 128
     <Compile Include="T_Sms_SmsModel.cs" />
129 129
     <Compile Include="T_Sys_Accessories.cs" />
130 130
     <Compile Include="T_Sys_Achievements.cs" />
131
+    <Compile Include="T_Sys_Affairs.cs" />
131 132
     <Compile Include="T_Sys_Area.cs" />
132 133
     <Compile Include="T_Sys_Class.cs" />
133 134
     <Compile Include="T_Sys_Department.cs" />

+ 7 - 1
CallCenterApi/CallCenterApi.BLL/T_Bus_Feedback_Next.cs

@@ -61,7 +61,13 @@ namespace CallCenterApi.BLL
61 61
 
62 62
             return dal.GetModel(F_Id);
63 63
         }
64
-
64
+        /// <summary>
65
+        /// 根据工单编号得到一个最新对象实体
66
+        /// </summary>
67
+        public CallCenterApi.Model.T_Bus_Feedback_Next GetNewModelByWorkOrderID(string F_WorkOrderId)
68
+        {
69
+            return dal.GetNewModelByWorkOrderID(F_WorkOrderId);
70
+        }
65 71
         /// <summary>
66 72
         /// 获得数据列表
67 73
         /// </summary>

+ 164 - 0
CallCenterApi/CallCenterApi.BLL/T_Sys_Affairs.cs

@@ -0,0 +1,164 @@
1
+using System;
2
+using System.Collections.Generic;
3
+using System.Data;
4
+using System.Linq;
5
+using System.Text;
6
+using System.Threading.Tasks;
7
+
8
+namespace CallCenterApi.BLL
9
+{
10
+    /// <summary>
11
+    /// T_Sys_Affairs
12
+    /// </summary>
13
+    public partial class T_Sys_Affairs
14
+    {
15
+        private readonly CallCenterApi.DAL.T_Sys_Affairs dal = new CallCenterApi.DAL.T_Sys_Affairs();
16
+        public T_Sys_Affairs()
17
+        { }
18
+        #region  BasicMethod
19
+
20
+        /// <summary>
21
+        /// 得到最大ID
22
+        /// </summary>
23
+        public int GetMaxId()
24
+        {
25
+            return dal.GetMaxId();
26
+        }
27
+
28
+        /// <summary>
29
+        /// 是否存在该记录
30
+        /// </summary>
31
+        public bool Exists(int F_ID)
32
+        {
33
+            return dal.Exists(F_ID);
34
+        }
35
+
36
+        /// <summary>
37
+        /// 增加一条数据
38
+        /// </summary>
39
+        public int Add(CallCenterApi.Model.T_Sys_Affairs model)
40
+        {
41
+            return dal.Add(model);
42
+        }
43
+
44
+        /// <summary>
45
+        /// 更新一条数据
46
+        /// </summary>
47
+        public bool Update(CallCenterApi.Model.T_Sys_Affairs model)
48
+        {
49
+            return dal.Update(model);
50
+        }
51
+
52
+        /// <summary>
53
+        /// 删除一条数据
54
+        /// </summary>
55
+        public bool Delete(int F_ID)
56
+        {
57
+
58
+            return dal.Delete(F_ID);
59
+        }
60
+        /// <summary>
61
+        /// 删除一条数据
62
+        /// </summary>
63
+        public bool DeleteList(string F_IDlist)
64
+        {
65
+            return dal.DeleteList(F_IDlist);
66
+        }
67
+
68
+        /// <summary>
69
+        /// 得到一个对象实体
70
+        /// </summary>
71
+        public CallCenterApi.Model.T_Sys_Affairs GetModel(int F_ID)
72
+        {
73
+
74
+            return dal.GetModel(F_ID);
75
+        }
76
+
77
+        /// <summary>
78
+        /// 得到一个对象实体
79
+        /// </summary>
80
+        public CallCenterApi.Model.T_Sys_Affairs GetModel(string F_WorkOrderId)
81
+        {
82
+            return dal.GetModel(F_WorkOrderId);
83
+        }
84
+
85
+        /// <summary>
86
+        /// 获得数据列表
87
+        /// </summary>
88
+        public DataSet GetList(string strWhere)
89
+        {
90
+            return dal.GetList(strWhere);
91
+        }
92
+        /// <summary>
93
+        /// 获得前几行数据
94
+        /// </summary>
95
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
96
+        {
97
+            return dal.GetList(Top, strWhere, filedOrder);
98
+        }
99
+        /// <summary>
100
+        /// 获得数据列表
101
+        /// </summary>
102
+        public List<CallCenterApi.Model.T_Sys_Affairs> GetModelList(string strWhere)
103
+        {
104
+            DataSet ds = dal.GetList(strWhere);
105
+            return DataTableToList(ds.Tables[0]);
106
+        }
107
+        /// <summary>
108
+        /// 获得数据列表
109
+        /// </summary>
110
+        public List<CallCenterApi.Model.T_Sys_Affairs> DataTableToList(DataTable dt)
111
+        {
112
+            List<CallCenterApi.Model.T_Sys_Affairs> modelList = new List<CallCenterApi.Model.T_Sys_Affairs>();
113
+            int rowsCount = dt.Rows.Count;
114
+            if (rowsCount > 0)
115
+            {
116
+                CallCenterApi.Model.T_Sys_Affairs model;
117
+                for (int n = 0; n < rowsCount; n++)
118
+                {
119
+                    model = dal.DataRowToModel(dt.Rows[n]);
120
+                    if (model != null)
121
+                    {
122
+                        modelList.Add(model);
123
+                    }
124
+                }
125
+            }
126
+            return modelList;
127
+        }
128
+
129
+        /// <summary>
130
+        /// 获得数据列表
131
+        /// </summary>
132
+        public DataSet GetAllList()
133
+        {
134
+            return GetList("");
135
+        }
136
+
137
+        /// <summary>
138
+        /// 分页获取数据列表
139
+        /// </summary>
140
+        public int GetRecordCount(string strWhere)
141
+        {
142
+            return dal.GetRecordCount(strWhere);
143
+        }
144
+        /// <summary>
145
+        /// 分页获取数据列表
146
+        /// </summary>
147
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
148
+        {
149
+            return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
150
+        }
151
+        /// <summary>
152
+        /// 分页获取数据列表
153
+        /// </summary>
154
+        //public DataSet GetList(int PageSize,int PageIndex,string strWhere)
155
+        //{
156
+        //return dal.GetList(PageSize,PageIndex,strWhere);
157
+        //}
158
+
159
+        #endregion  BasicMethod
160
+        #region  ExtensionMethod
161
+
162
+        #endregion  ExtensionMethod
163
+    }
164
+}

+ 1 - 0
CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -128,6 +128,7 @@
128 128
     <Compile Include="T_Sms_SmsModel.cs" />
129 129
     <Compile Include="T_Sys_Accessories.cs" />
130 130
     <Compile Include="T_Sys_Achievements.cs" />
131
+    <Compile Include="T_Sys_Affairs.cs" />
131 132
     <Compile Include="T_Sys_Area.cs" />
132 133
     <Compile Include="T_Sys_Class.cs" />
133 134
     <Compile Include="T_Sys_Department.cs" />

+ 24 - 0
CallCenterApi/CallCenterApi.DAL/T_Bus_Feedback_Next.cs

@@ -269,7 +269,31 @@ namespace CallCenterApi.DAL
269 269
             }
270 270
         }
271 271
 
272
+        /// <summary>
273
+        /// 根据工单编号得到一个最新对象实体
274
+        /// </summary>
275
+        public CallCenterApi.Model.T_Bus_Feedback_Next GetNewModelByWorkOrderID(string F_WorkOrderId)
276
+        {
277
+
278
+            StringBuilder strSql = new StringBuilder();
279
+            strSql.Append("select  top 1 * from T_Bus_Feedback_Next ");
280
+            strSql.Append(" where F_WorkOrderId=@F_WorkOrderId and F_IsDelete=0");
281
+            strSql.Append(" order by F_Id desc");
282
+            SqlParameter[] parameters = {
283
+                    new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,50)
284
+            };
285
+            parameters[0].Value = F_WorkOrderId;
272 286
 
287
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
288
+            if (ds.Tables[0].Rows.Count > 0)
289
+            {
290
+                return DataRowToModel(ds.Tables[0].Rows[0]); ;
291
+            }
292
+            else
293
+            {
294
+                return null;
295
+            }
296
+        }
273 297
         /// <summary>
274 298
         /// 得到一个对象实体
275 299
         /// </summary>

+ 5 - 0
CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -733,6 +733,11 @@ namespace CallCenterApi.DAL
733 733
                 {
734 734
                     model.PhoneType = row["PhoneType"].ToString();
735 735
                 }
736
+                if (row["Callback"] != null && row["Callback"].ToString() != "")
737
+                {
738
+                    model.Callback = int.Parse(row["Callback"].ToString());
739
+                }
740
+                
736 741
             }
737 742
             return model;
738 743
         }

+ 415 - 0
CallCenterApi/CallCenterApi.DAL/T_Sys_Affairs.cs

@@ -0,0 +1,415 @@
1
+using CallCenterApi.DB;
2
+using System;
3
+using System.Collections.Generic;
4
+using System.Data;
5
+using System.Data.SqlClient;
6
+using System.Linq;
7
+using System.Text;
8
+using System.Threading.Tasks;
9
+
10
+namespace CallCenterApi.DAL
11
+{
12
+    /// <summary>
13
+    /// 数据访问类:T_Sys_Affairs
14
+    /// </summary>
15
+    public partial class T_Sys_Affairs
16
+    {
17
+        public T_Sys_Affairs()
18
+        { }
19
+        #region  BasicMethod
20
+
21
+        /// <summary>
22
+        /// 得到最大ID
23
+        /// </summary>
24
+        public int GetMaxId()
25
+        {
26
+            return DbHelperSQL.GetMaxID("F_ID", "T_Sys_Affairs");
27
+        }
28
+
29
+        /// <summary>
30
+        /// 是否存在该记录
31
+        /// </summary>
32
+        public bool Exists(int F_ID)
33
+        {
34
+            StringBuilder strSql = new StringBuilder();
35
+            strSql.Append("select count(1) from T_Sys_Affairs");
36
+            strSql.Append(" where F_ID=@F_ID");
37
+            SqlParameter[] parameters = {
38
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)
39
+            };
40
+            parameters[0].Value = F_ID;
41
+
42
+            return DbHelperSQL.Exists(strSql.ToString(), parameters);
43
+        }
44
+
45
+
46
+        /// <summary>
47
+        /// 增加一条数据
48
+        /// </summary>
49
+        public int Add(CallCenterApi.Model.T_Sys_Affairs model)
50
+        {
51
+            StringBuilder strSql = new StringBuilder();
52
+            strSql.Append("insert into T_Sys_Affairs(");
53
+            strSql.Append("F_WorkOrderId,TROWGUID,CASE_SERIAL,TSIGNTIME_BF,TBACKTIME_BF,SEND_TIME,SEND_CONTENT,CASE_TIME,TFDBACKTIME_BF,FILES,CreateTime)");
54
+            strSql.Append(" values (");
55
+            strSql.Append("@F_WorkOrderId,@TROWGUID,@CASE_SERIAL,@TSIGNTIME_BF,@TBACKTIME_BF,@SEND_TIME,@SEND_CONTENT,@CASE_TIME,@TFDBACKTIME_BF,@FILES,@CreateTime)");
56
+            strSql.Append(";select @@IDENTITY");
57
+            SqlParameter[] parameters = {
58
+                    new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,100),
59
+                    new SqlParameter("@TROWGUID", SqlDbType.NVarChar,500),
60
+                    new SqlParameter("@CASE_SERIAL", SqlDbType.NVarChar,500),
61
+                    new SqlParameter("@TSIGNTIME_BF", SqlDbType.NVarChar,500),
62
+                    new SqlParameter("@TBACKTIME_BF", SqlDbType.NVarChar,500),
63
+                    new SqlParameter("@SEND_TIME", SqlDbType.NVarChar,500),
64
+                    new SqlParameter("@SEND_CONTENT", SqlDbType.NVarChar,500),
65
+                    new SqlParameter("@CASE_TIME", SqlDbType.NVarChar,500),
66
+                    new SqlParameter("@TFDBACKTIME_BF", SqlDbType.NVarChar,500),
67
+                    new SqlParameter("@FILES", SqlDbType.NVarChar,50),
68
+                    new SqlParameter("@CreateTime", SqlDbType.DateTime)};
69
+            parameters[0].Value = model.F_WorkOrderId;
70
+            parameters[1].Value = model.TROWGUID;
71
+            parameters[2].Value = model.CASE_SERIAL;
72
+            parameters[3].Value = model.TSIGNTIME_BF;
73
+            parameters[4].Value = model.TBACKTIME_BF;
74
+            parameters[5].Value = model.SEND_TIME;
75
+            parameters[6].Value = model.SEND_CONTENT;
76
+            parameters[7].Value = model.CASE_TIME;
77
+            parameters[8].Value = model.TFDBACKTIME_BF;
78
+            parameters[9].Value = model.FILES;
79
+            parameters[10].Value = model.CreateTime;
80
+
81
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
82
+            if (obj == null)
83
+            {
84
+                return 0;
85
+            }
86
+            else
87
+            {
88
+                return Convert.ToInt32(obj);
89
+            }
90
+        }
91
+        /// <summary>
92
+        /// 更新一条数据
93
+        /// </summary>
94
+        public bool Update(CallCenterApi.Model.T_Sys_Affairs model)
95
+        {
96
+            StringBuilder strSql = new StringBuilder();
97
+            strSql.Append("update T_Sys_Affairs set ");
98
+            strSql.Append("F_WorkOrderId=@F_WorkOrderId,");
99
+            strSql.Append("TROWGUID=@TROWGUID,");
100
+            strSql.Append("CASE_SERIAL=@CASE_SERIAL,");
101
+            strSql.Append("TSIGNTIME_BF=@TSIGNTIME_BF,");
102
+            strSql.Append("TBACKTIME_BF=@TBACKTIME_BF,");
103
+            strSql.Append("SEND_TIME=@SEND_TIME,");
104
+            strSql.Append("SEND_CONTENT=@SEND_CONTENT,");
105
+            strSql.Append("CASE_TIME=@CASE_TIME,");
106
+            strSql.Append("TFDBACKTIME_BF=@TFDBACKTIME_BF,");
107
+            strSql.Append("FILES=@FILES,");
108
+            strSql.Append("CreateTime=@CreateTime");
109
+            strSql.Append(" where F_ID=@F_ID");
110
+            SqlParameter[] parameters = {
111
+                    new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,100),
112
+                    new SqlParameter("@TROWGUID", SqlDbType.NVarChar,500),
113
+                    new SqlParameter("@CASE_SERIAL", SqlDbType.NVarChar,500),
114
+                    new SqlParameter("@TSIGNTIME_BF", SqlDbType.NVarChar,500),
115
+                    new SqlParameter("@TBACKTIME_BF", SqlDbType.NVarChar,500),
116
+                    new SqlParameter("@SEND_TIME", SqlDbType.NVarChar,500),
117
+                    new SqlParameter("@SEND_CONTENT", SqlDbType.NVarChar,500),
118
+                    new SqlParameter("@CASE_TIME", SqlDbType.NVarChar,500),
119
+                    new SqlParameter("@TFDBACKTIME_BF", SqlDbType.NVarChar,500),
120
+                    new SqlParameter("@FILES", SqlDbType.NVarChar,50),
121
+                    new SqlParameter("@CreateTime", SqlDbType.DateTime),
122
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)};
123
+            parameters[0].Value = model.F_WorkOrderId;
124
+            parameters[1].Value = model.TROWGUID;
125
+            parameters[2].Value = model.CASE_SERIAL;
126
+            parameters[3].Value = model.TSIGNTIME_BF;
127
+            parameters[4].Value = model.TBACKTIME_BF;
128
+            parameters[5].Value = model.SEND_TIME;
129
+            parameters[6].Value = model.SEND_CONTENT;
130
+            parameters[7].Value = model.CASE_TIME;
131
+            parameters[8].Value = model.TFDBACKTIME_BF;
132
+            parameters[9].Value = model.FILES;
133
+            parameters[10].Value = model.CreateTime;
134
+            parameters[11].Value = model.F_ID;
135
+
136
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
137
+            if (rows > 0)
138
+            {
139
+                return true;
140
+            }
141
+            else
142
+            {
143
+                return false;
144
+            }
145
+        }
146
+
147
+        /// <summary>
148
+        /// 删除一条数据
149
+        /// </summary>
150
+        public bool Delete(int F_ID)
151
+        {
152
+
153
+            StringBuilder strSql = new StringBuilder();
154
+            strSql.Append("delete from T_Sys_Affairs ");
155
+            strSql.Append(" where F_ID=@F_ID");
156
+            SqlParameter[] parameters = {
157
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)
158
+            };
159
+            parameters[0].Value = F_ID;
160
+
161
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
162
+            if (rows > 0)
163
+            {
164
+                return true;
165
+            }
166
+            else
167
+            {
168
+                return false;
169
+            }
170
+        }
171
+        /// <summary>
172
+        /// 批量删除数据
173
+        /// </summary>
174
+        public bool DeleteList(string F_IDlist)
175
+        {
176
+            StringBuilder strSql = new StringBuilder();
177
+            strSql.Append("delete from T_Sys_Affairs ");
178
+            strSql.Append(" where F_ID in (" + F_IDlist + ")  ");
179
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
180
+            if (rows > 0)
181
+            {
182
+                return true;
183
+            }
184
+            else
185
+            {
186
+                return false;
187
+            }
188
+        }
189
+
190
+
191
+        /// <summary>
192
+        /// 得到一个对象实体
193
+        /// </summary>
194
+        public CallCenterApi.Model.T_Sys_Affairs GetModel(int F_ID)
195
+        {
196
+
197
+            StringBuilder strSql = new StringBuilder();
198
+            strSql.Append("select  top 1 F_ID,F_WorkOrderId,TROWGUID,CASE_SERIAL,TSIGNTIME_BF,TBACKTIME_BF,SEND_TIME,SEND_CONTENT,CASE_TIME,TFDBACKTIME_BF,FILES,CreateTime from T_Sys_Affairs ");
199
+            strSql.Append(" where F_ID=@F_ID");
200
+            SqlParameter[] parameters = {
201
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)
202
+            };
203
+            parameters[0].Value = F_ID;
204
+
205
+            CallCenterApi.Model.T_Sys_Affairs model = new CallCenterApi.Model.T_Sys_Affairs();
206
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
207
+            if (ds.Tables[0].Rows.Count > 0)
208
+            {
209
+                return DataRowToModel(ds.Tables[0].Rows[0]);
210
+            }
211
+            else
212
+            {
213
+                return null;
214
+            }
215
+        }
216
+        /// <summary>
217
+        /// 得到一个对象实体
218
+        /// </summary>
219
+        public CallCenterApi.Model.T_Sys_Affairs GetModel(string F_WorkOrderId)
220
+        {
221
+
222
+            StringBuilder strSql = new StringBuilder();
223
+            strSql.Append("select  top 1 * from T_Sys_Affairs WITH(NOLOCK) ");
224
+            strSql.Append(" where F_WorkOrderId=@F_WorkOrderId");
225
+            SqlParameter[] parameters = {
226
+                    new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,100)
227
+            };
228
+            parameters[0].Value = F_WorkOrderId;
229
+
230
+            CallCenterApi.Model.T_Sys_Affairs model = new CallCenterApi.Model.T_Sys_Affairs();
231
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
232
+            if (ds.Tables[0].Rows.Count > 0)
233
+            {
234
+                return DataRowToModel(ds.Tables[0].Rows[0]);
235
+            }
236
+            else
237
+            {
238
+                return null;
239
+            }
240
+        }
241
+
242
+        /// <summary>
243
+        /// 得到一个对象实体
244
+        /// </summary>
245
+        public CallCenterApi.Model.T_Sys_Affairs DataRowToModel(DataRow row)
246
+        {
247
+            CallCenterApi.Model.T_Sys_Affairs model = new CallCenterApi.Model.T_Sys_Affairs();
248
+            if (row != null)
249
+            {
250
+                if (row["F_ID"] != null && row["F_ID"].ToString() != "")
251
+                {
252
+                    model.F_ID = int.Parse(row["F_ID"].ToString());
253
+                }
254
+                if (row["F_WorkOrderId"] != null)
255
+                {
256
+                    model.F_WorkOrderId = row["F_WorkOrderId"].ToString();
257
+                }
258
+                if (row["TROWGUID"] != null)
259
+                {
260
+                    model.TROWGUID = row["TROWGUID"].ToString();
261
+                }
262
+                if (row["CASE_SERIAL"] != null)
263
+                {
264
+                    model.CASE_SERIAL = row["CASE_SERIAL"].ToString();
265
+                }
266
+                if (row["TSIGNTIME_BF"] != null)
267
+                {
268
+                    model.TSIGNTIME_BF = row["TSIGNTIME_BF"].ToString();
269
+                }
270
+                if (row["TBACKTIME_BF"] != null)
271
+                {
272
+                    model.TBACKTIME_BF = row["TBACKTIME_BF"].ToString();
273
+                }
274
+                if (row["SEND_TIME"] != null)
275
+                {
276
+                    model.SEND_TIME = row["SEND_TIME"].ToString();
277
+                }
278
+                if (row["SEND_CONTENT"] != null)
279
+                {
280
+                    model.SEND_CONTENT = row["SEND_CONTENT"].ToString();
281
+                }
282
+                if (row["CASE_TIME"] != null)
283
+                {
284
+                    model.CASE_TIME = row["CASE_TIME"].ToString();
285
+                }
286
+                if (row["TFDBACKTIME_BF"] != null)
287
+                {
288
+                    model.TFDBACKTIME_BF = row["TFDBACKTIME_BF"].ToString();
289
+                }
290
+                if (row["FILES"] != null)
291
+                {
292
+                    model.FILES = row["FILES"].ToString();
293
+                }
294
+                if (row["CreateTime"] != null && row["CreateTime"].ToString() != "")
295
+                {
296
+                    model.CreateTime = DateTime.Parse(row["CreateTime"].ToString());
297
+                }
298
+            }
299
+            return model;
300
+        }
301
+
302
+        /// <summary>
303
+        /// 获得数据列表
304
+        /// </summary>
305
+        public DataSet GetList(string strWhere)
306
+        {
307
+            StringBuilder strSql = new StringBuilder();
308
+            strSql.Append("select F_ID,F_WorkOrderId,TROWGUID,CASE_SERIAL,TSIGNTIME_BF,TBACKTIME_BF,SEND_TIME,SEND_CONTENT,CASE_TIME,TFDBACKTIME_BF,FILES,CreateTime ");
309
+            strSql.Append(" FROM T_Sys_Affairs ");
310
+            if (strWhere.Trim() != "")
311
+            {
312
+                strSql.Append(" where " + strWhere);
313
+            }
314
+            return DbHelperSQL.Query(strSql.ToString());
315
+        }
316
+
317
+        /// <summary>
318
+        /// 获得前几行数据
319
+        /// </summary>
320
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
321
+        {
322
+            StringBuilder strSql = new StringBuilder();
323
+            strSql.Append("select ");
324
+            if (Top > 0)
325
+            {
326
+                strSql.Append(" top " + Top.ToString());
327
+            }
328
+            strSql.Append(" F_ID,F_WorkOrderId,TROWGUID,CASE_SERIAL,TSIGNTIME_BF,TBACKTIME_BF,SEND_TIME,SEND_CONTENT,CASE_TIME,TFDBACKTIME_BF,FILES,CreateTime ");
329
+            strSql.Append(" FROM T_Sys_Affairs ");
330
+            if (strWhere.Trim() != "")
331
+            {
332
+                strSql.Append(" where " + strWhere);
333
+            }
334
+            strSql.Append(" order by " + filedOrder);
335
+            return DbHelperSQL.Query(strSql.ToString());
336
+        }
337
+
338
+        /// <summary>
339
+        /// 获取记录总数
340
+        /// </summary>
341
+        public int GetRecordCount(string strWhere)
342
+        {
343
+            StringBuilder strSql = new StringBuilder();
344
+            strSql.Append("select count(1) FROM T_Sys_Affairs ");
345
+            if (strWhere.Trim() != "")
346
+            {
347
+                strSql.Append(" where " + strWhere);
348
+            }
349
+            object obj = DbHelperSQL.GetSingle(strSql.ToString());
350
+            if (obj == null)
351
+            {
352
+                return 0;
353
+            }
354
+            else
355
+            {
356
+                return Convert.ToInt32(obj);
357
+            }
358
+        }
359
+        /// <summary>
360
+        /// 分页获取数据列表
361
+        /// </summary>
362
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
363
+        {
364
+            StringBuilder strSql = new StringBuilder();
365
+            strSql.Append("SELECT * FROM ( ");
366
+            strSql.Append(" SELECT ROW_NUMBER() OVER (");
367
+            if (!string.IsNullOrEmpty(orderby.Trim()))
368
+            {
369
+                strSql.Append("order by T." + orderby);
370
+            }
371
+            else
372
+            {
373
+                strSql.Append("order by T.F_ID desc");
374
+            }
375
+            strSql.Append(")AS Row, T.*  from T_Sys_Affairs T ");
376
+            if (!string.IsNullOrEmpty(strWhere.Trim()))
377
+            {
378
+                strSql.Append(" WHERE " + strWhere);
379
+            }
380
+            strSql.Append(" ) TT");
381
+            strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex);
382
+            return DbHelperSQL.Query(strSql.ToString());
383
+        }
384
+
385
+        /*
386
+		/// <summary>
387
+		/// 分页获取数据列表
388
+		/// </summary>
389
+		public DataSet GetList(int PageSize,int PageIndex,string strWhere)
390
+		{
391
+			SqlParameter[] parameters = {
392
+					new SqlParameter("@tblName", SqlDbType.VarChar, 255),
393
+					new SqlParameter("@fldName", SqlDbType.VarChar, 255),
394
+					new SqlParameter("@PageSize", SqlDbType.Int),
395
+					new SqlParameter("@PageIndex", SqlDbType.Int),
396
+					new SqlParameter("@IsReCount", SqlDbType.Bit),
397
+					new SqlParameter("@OrderType", SqlDbType.Bit),
398
+					new SqlParameter("@strWhere", SqlDbType.VarChar,1000),
399
+					};
400
+			parameters[0].Value = "T_Sys_Affairs";
401
+			parameters[1].Value = "F_ID";
402
+			parameters[2].Value = PageSize;
403
+			parameters[3].Value = PageIndex;
404
+			parameters[4].Value = 0;
405
+			parameters[5].Value = 0;
406
+			parameters[6].Value = strWhere;	
407
+			return CallCenterApi.RunProcedure("UP_GetRecordByPage",parameters,"ds");
408
+		}*/
409
+
410
+        #endregion  BasicMethod
411
+        #region  ExtensionMethod
412
+
413
+        #endregion  ExtensionMethod
414
+    }
415
+}

+ 2 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -276,6 +276,7 @@
276 276
     <Compile Include="Controllers\Wiki\NounInterpretationController.cs" />
277 277
     <Compile Include="Controllers\Wiki\PolicyController.cs" />
278 278
     <Compile Include="Controllers\Wiki\ProfessorController.cs" />
279
+    <Compile Include="Controllers\workorder\AffairsController.cs" />
279 280
     <Compile Include="Controllers\workorder\APPSController.cs" />
280 281
     <Compile Include="Controllers\workorder\AYWorkOrderController.cs" />
281 282
     <Compile Include="Controllers\workorder\NoticeCriticismController.cs" />
@@ -283,7 +284,6 @@
283 284
     <Compile Include="Controllers\workorder\WorkOrderController.cs" />
284 285
     <Compile Include="Controllers\workorder\WorkOrderNewController.cs" />
285 286
     <Compile Include="Controllers\workorder\WOVisitRecordsController.cs" />
286
-    <Compile Include="Controllers\workorder\ZhengWuController.cs" />
287 287
     <Compile Include="Global.asax.cs">
288 288
       <DependentUpon>Global.asax</DependentUpon>
289 289
     </Compile>
@@ -354,6 +354,7 @@
354 354
   </ItemGroup>
355 355
   <ItemGroup>
356 356
     <Folder Include="App_Data\" />
357
+    <Folder Include="Views\Affairs\" />
357 358
     <Folder Include="Views\Functions\" />
358 359
     <Folder Include="Views\NounInterpretation\" />
359 360
     <Folder Include="Views\QCResult\" />

+ 17 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Sms/SMSController.cs

@@ -229,7 +229,24 @@ namespace CallCenterApi.Interface.Controllers
229 229
                 return Error ("获取失败");
230 230
             }
231 231
         }
232
+        /// <summary>
233
+        /// 发送市长信箱短信
234
+        /// </summary>
235
+        /// <param name="phone"></param>
236
+        /// <param name="WorkOrderId"></param>
237
+        /// <returns></returns>
238
+        public ActionResult SendMailbox(string phone)
239
+        {
232 240
 
241
+            string count = "市长信箱留言网址:https://zwfw.anyang.gov.cn/#/mayor_mail";
242
+            string mag = "";
243
+            bool n = AddSmS(0, mag, count, phone, "272044", "", "");
244
+            if (n)
245
+                return Success("发送成功");
246
+            else
247
+                return Error("发送失败");
248
+           
249
+        }
233 250
 
234 251
         #region 接收短信
235 252
         [Authority]

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/FunctionsController.cs

@@ -65,11 +65,11 @@ namespace CallCenterApi.Interface.Controllers.Wiki
65 65
 
66 66
             if (stime.Trim() != "" && stime != "undefined")
67 67
             {
68
-                sql += " and F_FaBuShiJian >= '" + stime + " 00:00:00" + "' ";
68
+                sql += " and F_FaBuShiJian >= '" + stime  + "' ";
69 69
             }
70 70
             if (etime.Trim() != "" && etime != "undefined")
71 71
             {
72
-                sql += " and F_FaBuShiJian <= '" + etime + " 23:59:59" + "' ";
72
+                sql += " and F_FaBuShiJian <= '" + etime + "' ";
73 73
             }
74 74
             if (key > 0)
75 75
             {

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/HotspotGlossaryController.cs

@@ -67,11 +67,11 @@ namespace CallCenterApi.Interface.Controllers.Wiki
67 67
 
68 68
             if (stime.Trim() != "" && stime != "undefined")
69 69
             {
70
-                sql += " and F_FaBuShiJian >= '" + stime + " 00:00:00" + "' ";
70
+                sql += " and F_FaBuShiJian >= '" + stime  + "' ";
71 71
             }
72 72
             if (etime.Trim() != "" && etime != "undefined")
73 73
             {
74
-                sql += " and F_FaBuShiJian <= '" + etime + " 23:59:59" + "' ";
74
+                sql += " and F_FaBuShiJian <= '" + etime  + "' ";
75 75
             }
76 76
 
77 77
             if (key > 0)

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/LawGuideController.cs

@@ -67,11 +67,11 @@ namespace CallCenterApi.Interface.Controllers.Wiki
67 67
 
68 68
             if (stime.Trim() != "" && stime != "undefined")
69 69
             {
70
-                sql += " and F_FaBuShiJian >= '" + stime + " 00:00:00" + "' ";
70
+                sql += " and F_FaBuShiJian >= '" + stime + "' ";
71 71
             }
72 72
             if (etime.Trim() != "" && etime != "undefined")
73 73
             {
74
-                sql += " and F_FaBuShiJian <= '" + etime + " 23:59:59" + "' ";
74
+                sql += " and F_FaBuShiJian <= '" + etime + "' ";
75 75
             }
76 76
 
77 77
             if (key>0)

File diff suppressed because it is too large
+ 3 - 3
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/NounInterpretationController.cs


+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/PolicyController.cs

@@ -66,11 +66,11 @@ namespace CallCenterApi.Interface.Controllers.Wiki
66 66
 
67 67
             if (stime.Trim() != "" && stime != "undefined")
68 68
             {
69
-                sql += " and F_FaBuShiJian >= '" + stime + " 00:00:00" + "' ";
69
+                sql += " and F_FaBuShiJian >= '" + stime + "' ";
70 70
             }
71 71
             if (etime.Trim() != "" && etime != "undefined")
72 72
             {
73
-                sql += " and F_FaBuShiJian <= '" + etime + " 23:59:59" + "' ";
73
+                sql += " and F_FaBuShiJian <= '" + etime + "' ";
74 74
             }
75 75
             if (key > 0)
76 76
             {

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/ProfessorController.cs

@@ -58,11 +58,11 @@ namespace CallCenterApi.Interface.Controllers.Wiki
58 58
 
59 59
             if (stime.Trim() != "" && stime != "undefined")
60 60
             {
61
-                sql += " and F_FaBuShiJian >= '" + stime + " 00:00:00" + "' ";
61
+                sql += " and F_FaBuShiJian >= '" + stime  + "' ";
62 62
             }
63 63
             if (etime.Trim() != "" && etime != "undefined")
64 64
             {
65
-                sql += " and F_FaBuShiJian <= '" + etime + " 23:59:59" + "' ";
65
+                sql += " and F_FaBuShiJian <= '" + etime  + "' ";
66 66
             }
67 67
 
68 68
             if (!string.IsNullOrEmpty(keyvalue))

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -56,7 +56,7 @@ namespace CallCenterApi.Interface.Controllers.customer
56 56
             }
57 57
             if (isdc>0)
58 58
             {
59
-                var dtdc = DbHelperSQL.Query("select F_CustomerName 联系人姓名,F_Mobile 联系人电话,F_Email 邮箱,F_Address 地址,(select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and F_CusPhone=a.F_Mobile) as 工单数量 (select count(1) from dbo.T_Call_CallRecords where CallType=0  and CallNumber=a.F_Mobile ) as 来电数量"
59
+                var dtdc = DbHelperSQL.Query("select F_CustomerName 联系人姓名,F_Mobile 联系人电话,F_Email 邮箱,F_Address 地址,(select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and F_CusPhone=a.F_Mobile) as 工单数量 ,(select count(1) from dbo.T_Call_CallRecords where CallType=0  and CallNumber=a.F_Mobile ) as 来电数量"
60 60
                  + " from T_Cus_CustomerBase a WITH(NOLOCK) where 1=1 " + sql ).Tables[0];
61 61
                 var msg = new NPOIHelper().ExportToExcel("市民资料", dtdc);
62 62
                 if (msg == "")

+ 71 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

@@ -1339,11 +1339,20 @@ namespace CallCenterApi.Interface.Controllers.report
1339 1339
                     MergerHot.MergerHotSource mergerHotSources = new MergerHot.MergerHotSource();
1340 1340
                     mergerHotSources.Data  = dt.ToString("MM月dd日");
1341 1341
                     mergerHotSources.MergerHot = new List<MergerHot.MergerHots>();
1342
-                    for (int i = 0; i < source.Count + 2; i++)
1342
+                    for (int i = 0; i < source.Count + 3; i++)
1343 1343
                     {
1344 1344
                         if (i < source.Count)
1345 1345
                         {
1346
+                            
1346 1347
                             MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
1348
+                            if (source[i].F_Value == "12345")
1349
+                            {
1350
+                                mergerHot.sort = source.Count;
1351
+                            }
1352
+                            else
1353
+                            {
1354
+                                mergerHot.sort = i-1;
1355
+                            }
1347 1356
                                 mergerHot.Source  = source[i ].F_Value ;
1348 1357
                                 mergerHot.Call = CallRecords.Where(x => x.BeginTime
1349 1358
                                 .Value.Day   ==dt .Day && x.PhoneType == source[i].F_Value).Count();
@@ -1372,6 +1381,7 @@ namespace CallCenterApi.Interface.Controllers.report
1372 1381
                         {
1373 1382
                             MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
1374 1383
                             mergerHot.Source = "当日小计";
1384
+                            mergerHot.sort = source.Count + 1;
1375 1385
                             mergerHot.Call = CallRecords.Where(x => x.BeginTime
1376 1386
                             .Value.Day == dt.Day).Count();
1377 1387
                             mergerHot.Connect = CallRecords.Where(x => x.BeginTime
@@ -1396,6 +1406,7 @@ namespace CallCenterApi.Interface.Controllers.report
1396 1406
                         {
1397 1407
                             MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
1398 1408
                             mergerHot.Source = "累计";
1409
+                            mergerHot.sort = source.Count+2;
1399 1410
                             mergerHot.Call = CallRecords.Where(x => x.BeginTime 
1400 1411
                             .Value.Date  >=starttime  .Value.Date && x.BeginTime
1401 1412
                             .Value.Date <= dt.Date ).Count();
@@ -1420,7 +1431,36 @@ namespace CallCenterApi.Interface.Controllers.report
1420 1431
                             }
1421 1432
                             mergerHotSources.MergerHot.Add(mergerHot);
1422 1433
                         }
1434
+                        else if (i == source.Count+2)
1435
+                        {
1436
+                            MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
1437
+                            mergerHot.Source = "归并热线小计";
1438
+                            mergerHot.sort = source.Count-1;
1439
+                            mergerHot.Call = CallRecords.Where(x => x.BeginTime
1440
+                            .Value.Day == dt.Day&&x.PhoneType !="12345").Count();
1441
+                            mergerHot.Connect = CallRecords.Where(x => x.BeginTime
1442
+                            .Value.Day == dt.Day && x.CallState == 1 && x.PhoneType != "12345").Count();
1443
+                            mergerHot.Notconnected = CallRecords.Where(x => x.BeginTime
1444
+                          .Value.Day == dt.Day && x.CallState == 0 && x.UserCode != ""
1445
+                         && x.UserCode != null && x.PhoneType != "12345").Count();
1446
+                            mergerHot.voluntarily = CallRecords.Where(x => x.BeginTime
1447
+                          .Value.Day == dt.Day && x.CallState == 0 && (x.UserCode == ""
1448
+                         || x.UserCode == null) && x.PhoneType != "12345").Count();
1449
+                            mergerHot.callback = CallRecords.Where(x => x.BeginTime
1450
+                         .Value.Day == dt.Day &&x .PhoneType != "12345" && x.Callback == 1).Count();
1451
+                          
1452
+                            if (mergerHot.Call > 0)
1453
+                            {
1454
+                                mergerHot.rate = string.Format("{0:f2}%", (float)mergerHot.Connect / (float)mergerHot.Call * 100);
1455
+                            }
1456
+                            else
1457
+                            {
1458
+                                mergerHot.rate = "100%";
1459
+                            }
1460
+                            mergerHotSources.MergerHot.Add(mergerHot);
1461
+                        }
1423 1462
                     }
1463
+                    mergerHotSources.MergerHot= mergerHotSources.MergerHot.OrderBy(x => x.sort).ToList ();
1424 1464
                     MergerHotSource.Add(mergerHotSources);
1425 1465
                 }
1426 1466
             }
@@ -1443,6 +1483,7 @@ namespace CallCenterApi.Interface.Controllers.report
1443 1483
                      || x.UserCode == null)).Count();
1444 1484
                         if (source[i].F_Value=="12345")
1445 1485
                         {
1486
+                            mergerHot.sort = source.Count ;
1446 1487
                             if (mergerHot.Call > 0)
1447 1488
                             {
1448 1489
                                 mergerHot.rate = string.Format("{0:f2}%", (float)mergerHot.Connect / (float)mergerHot.Call * 100);
@@ -1452,6 +1493,10 @@ namespace CallCenterApi.Interface.Controllers.report
1452 1493
                                 mergerHot.rate = "100%";
1453 1494
                             }
1454 1495
                         }
1496
+                        else
1497
+                        {
1498
+                            mergerHot.sort =i -1;
1499
+                        }
1455 1500
                        
1456 1501
                         mergerHotSources.MergerHot.Add(mergerHot);
1457 1502
 
@@ -1460,6 +1505,7 @@ namespace CallCenterApi.Interface.Controllers.report
1460 1505
                     {
1461 1506
                         MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
1462 1507
                         mergerHot.Source ="当日小计";
1508
+                        mergerHot.sort = source.Count + 1;
1463 1509
                         mergerHot.Call = CallRecords.Count();
1464 1510
                         mergerHot.Connect = CallRecords.Where(x =>x.CallState == 1).Count();
1465 1511
                         mergerHot.Notconnected = CallRecords.Where(x =>  x.CallState == 0 &&   x.UserCode != ""
@@ -1476,7 +1522,31 @@ namespace CallCenterApi.Interface.Controllers.report
1476 1522
                         }
1477 1523
                         mergerHotSources.MergerHot.Add(mergerHot);
1478 1524
                     }
1525
+                    else if (i == source.Count+1)
1526
+                    {
1527
+                        MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
1528
+                        mergerHot.Source = "归并热线小计";
1529
+                        mergerHot.sort = source.Count - 1;
1530
+                        mergerHot.Call = CallRecords.Where(x =>  x.PhoneType != "12345").Count();
1531
+                        mergerHot.Connect = CallRecords.Where(x =>  x.PhoneType != "12345").Count();
1532
+                        mergerHot.Notconnected = CallRecords.Where(x =>x.CallState == 0 && x.UserCode != ""
1533
+                     && x.UserCode != null && x.PhoneType != "12345").Count();
1534
+                        mergerHot.voluntarily = CallRecords.Where(x =>   x.CallState == 0 && (x.UserCode == ""
1535
+                     || x.UserCode == null && x.PhoneType != "12345")).Count();
1536
+                        mergerHot.callback = CallRecords.Where(x => x.PhoneType != "12345" && x.Callback == 1).Count();
1537
+
1538
+                        if (mergerHot.Call > 0)
1539
+                        {
1540
+                            mergerHot.rate = string.Format("{0:f2}%", (float)mergerHot.Connect / (float)mergerHot.Call * 100);
1541
+                        }
1542
+                        else
1543
+                        {
1544
+                            mergerHot.rate = "100%";
1545
+                        }
1546
+                        mergerHotSources.MergerHot.Add(mergerHot);
1547
+                    }
1479 1548
                 }
1549
+                mergerHotSources.MergerHot = mergerHotSources.MergerHot.OrderBy(x => x.sort).ToList();
1480 1550
                 MergerHotSource.Add(mergerHotSources);
1481 1551
             }
1482 1552
             if (isExport)

+ 13 - 224
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/APPSController.cs

@@ -1960,7 +1960,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
1960 1960
 
1961 1961
                 string count = "您反映的事项已受理并转交相关部门处理,感谢您拨打市长热线!";
1962 1962
                 bool n = SMSController.AddSmS(133, "", count, modelT_Bus_WorkOrder.F_CusPhone, "146926", "");
1963
-
1963
+                Task.Run(() =>
1964
+                {
1965
+                    case_info(modelT_Bus_WorkOrder.F_WorkOrderId, "case_info");
1966
+                }).ContinueWith(p => {
1967
+                    System.Diagnostics.Debug.WriteLine(DateTime.Now);
1968
+                });
1964 1969
                 trans.Complete();
1965 1970
             }
1966 1971
             var obj = new
@@ -3913,232 +3918,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
3913 3918
             return Content(obj.ToJson());
3914 3919
         }
3915 3920
         #region 政务对接
3916
-        public class submit_case_info
3917
-        {
3918
-            public List<jsonList> jsonList { set; get; }
3919
-        }
3920
-        public class jsonList
3921
-        {
3922
-            /// <summary>
3923
-            /// "工单编号",
3924
-            /// </summary>
3925
-            public string CASE_SERIAL { set; get; }
3926
-            /// <summary>
3927
-            /// "行政区划代码",
3928
-            /// </summary>
3929
-            public string AREA_CODE { set; get; }//"",
3930
-                                                 /// <summary>
3931
-                                                 /// "工单唯一标识",
3932
-                                                 /// </summary>
3933
-            public string CASE_ID { set; get; }//
3934
-            /// <summary>
3935
-            /// 诉求人姓名
3936
-            /// </summary>
3937
-            public string APPLICANT_NAME { set; get; }//"",
3938
-            /// <summary>
3939
-            /// 诉求人性别
3940
-            /// </summary>
3941
-            public string APPLICANT_SEX { set; get; }//"",
3942
-                                                     /// <summary>
3943
-                                                     /// 诉求人年龄
3944
-                                                     /// </summary>
3945
-            public string APPLICANT_AGE { set; get; }//"",
3946
-                                                     /// <summary>
3947
-                                                     /// 诉求人联系电话
3948
-                                                     /// </summary>
3949
-            public string APPLICAN_NUMBER { set; get; }//"",
3950
-            /// <summary>
3951
-            /// 诉求时间
3952
-            /// </summary>
3953
-            public string APPLICAN_TIME { set; get; }//"",
3954
-            /// <summary>
3955
-            /// 话务员姓名
3956
-            /// </summary>
3957
-            public string HWY_NAME { set; get; }//"",
3958
-                                                /// <summary>
3959
-                                                /// 话务员工号
3960
-                                                /// </summary>
3961
-            public string HWY_LOGINID { set; get; }//"",
3962
-            /// <summary>
3963
-            /// 登记时间
3964
-            /// </summary>
3965
-            public string CASE_TIME { set; get; }//"",
3966
-            /// <summary>
3967
-            /// 服务工单标题
3968
-            /// </summary>
3969
-            public string CASE_TITLE { set; get; }//"",
3970
-            /// <summary>
3971
-            /// 服务工单内容
3972
-            /// </summary>
3973
-            public string CASE_CONTENT { set; get; }//"",
3974
-            /// <summary>
3975
-            /// 诉求渠道
3976
-            /// </summary>
3977
-            public string CASE_SOURCE { set; get; }//"",
3978
-            /// <summary>
3979
-            /// 诉求类型
3980
-            /// </summary>
3981
-            public string CASE_TYPE { set; get; }//"",
3982
-            /// <summary>
3983
-            /// 诉求归口
3984
-            /// </summary>
3985
-            public string CASE_ACCORD { set; get; }//"",
3986
-                                                   /// <summary>
3987
-                                                   /// 诉求人信息是否公开
3988
-                                                   /// </summary>
3989
-            public string CASE_ISPUBLIC { set; get; }//"",
3990
-                                                     /// <summary>
3991
-                                                     /// 是否回访
3992
-                                                     /// </summary>
3993
-            public string CASE_ISVISIT { set; get; }//"",
3994
-                                                    /// <summary>
3995
-                                                    /// 紧急程度
3996
-                                                    /// </summary>
3997
-            public string CASE_ISURGENT { set; get; }//"",
3998
-                                                     /// <summary>
3999
-                                                     /// 经纬度
4000
-                                                     /// </summary>
4001
-            public string CASE_LNGLAT { set; get; }//"",
4002
-                                                   /// <summary>
4003
-                                                   /// 诉求情感
4004
-                                                   /// </summary>
4005
-            public string CASE_EMOTION { set; get; }//"",
4006
-                                                    /// <summary>
4007
-                                                    /// 诉求详细地址
4008
-                                                    /// </summary>
4009
-            public string CASE_ADDRESS { set; get; }//""
4010
-        }
4011
-        /// <summary>
4012
-        /// 服务工单受理
4013
-        /// </summary>
4014
-        /// <param name="sender"></param>
4015
-        /// <param name="e"></param>
4016
-        private void case_info(T_Bus_WorkOrder model)
4017
-        {
4018
-            submit_case_info paras = new submit_case_info();
4019
-            paras.jsonList = new List<jsonList>();
4020
-            jsonList jsonList = new jsonList();
4021
-            jsonList.CASE_SERIAL = model.F_WorkOrderId;
4022
-            jsonList.AREA_CODE = DbHelperSQL.GetSingle(" select dbo.GetAreaCode('" + model.F_SourceArea + "')").ToString();
4023
-            jsonList.CASE_ID = model.F_Id.ToString();
4024
-            jsonList.APPLICANT_NAME = model.F_CusName.ToString();
4025
-            if (model.F_CusSex == "0")
4026
-                jsonList.APPLICANT_SEX = "1";
4027
-            else if (model.F_CusSex == "1")
4028
-                jsonList.APPLICANT_SEX = "2";
4029
-            else
4030
-                jsonList.APPLICANT_SEX = "3";
4031
-            jsonList.APPLICANT_AGE = "";//没有
4032
-            jsonList.APPLICAN_NUMBER = model.F_CusPhone;
4033
-            jsonList.APPLICAN_TIME = model.F_CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");//没有
4034
-            jsonList.HWY_NAME = DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_CreateUser + "')").ToString();
4035
-            jsonList.HWY_LOGINID = model.F_CreateUser;
4036
-            jsonList.CASE_TIME = model.F_CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
4037
-            jsonList.CASE_TITLE = model.F_ComTitle;
4038
-            jsonList.CASE_CONTENT = model.F_ComContent;
4039
-            if (model.F_InfoSource == 1)
4040
-                jsonList.CASE_SOURCE = "DH";
4041
-            else if (model.F_InfoSource == 2527)
4042
-                jsonList.CASE_SOURCE = "AP";
4043
-            else if (model.F_InfoSource == 5)
4044
-                jsonList.CASE_SOURCE = "WX";
4045
-            else if (model.F_InfoSource == 3)
4046
-                jsonList.CASE_SOURCE = "WB";
4047
-            else
4048
-                jsonList.CASE_SOURCE = "QT";//缺失
4049
-            if (model.F_InfoType == 9)
4050
-                jsonList.CASE_TYPE = "10";
4051
-            else if (model.F_InfoType == 12)
4052
-                jsonList.CASE_SOURCE = "15";
4053
-            else if (model.F_InfoType == 11)
4054
-                jsonList.CASE_SOURCE = "20";
4055
-            else if (model.F_InfoType == 89)
4056
-                jsonList.CASE_SOURCE = "25";
4057
-            else if (model.F_InfoType == 10)
4058
-                jsonList.CASE_SOURCE = "30";
4059
-            else if (model.F_InfoType == 13)
4060
-                jsonList.CASE_SOURCE = "35";
4061
-            else
4062
-                jsonList.CASE_SOURCE = "40";
4063
-            jsonList.CASE_ACCORD = DbHelperSQL.GetSingle(" select dbo.GetDicRemark('" + model.F_Key + "')").ToString();
4064
-            jsonList.CASE_ISPUBLIC = model.F_IsOpen.ToString();
4065
-            if (model.F_IsResult == 0)
4066
-                jsonList.CASE_ISPUBLIC = "1";
4067
-            else
4068
-                jsonList.CASE_ISPUBLIC = "0";
4069
-            if (model.F_Level == 2)
4070
-            {
4071
-                jsonList.CASE_ISURGENT = "20";
4072
-            }
4073
-            else
4074
-            {
4075
-                jsonList.CASE_ISURGENT = "30";
4076
-            }
4077
-            jsonList.CASE_LNGLAT = "lat<" + model.F_Latitude + ">,lng<" + model.F_Longitude + ">";
4078
-            jsonList.CASE_EMOTION = "";
4079
-            jsonList.CASE_ADDRESS = model.F_SourceAddress;
4080
-            //序列化参数
4081
-            var jsonParam = JsonConvert.SerializeObject(paras);
4082
-            var responseString = HttpMethods.HttpPost("submit_case_info", jsonParam, "application/json;charset=UTF-8");
4083
-            Push jo = JsonConvert.DeserializeObject<Push>(responseString);
4084
-            if (jo.code == "1")
4085
-            {
4086
-
4087
-                string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
4088
-                   values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", "", jsonParam, DateTime.Now, jo.code, jo.message, "实时服务信息上报接口", "", "推送成功数:" + jo.body.successCount + " 推送总数:" + jo.body.totalCount);
4089
-                object objres = DbHelperSQL.GetSingle(strSql);
4090
-            }
4091
-            else
4092
-            {
4093
-                string error = "";
4094
-                if (jo.body.errorObjs != null && jo.body.errorObjs.Length > 0)
4095
-                {
4096
-                    foreach (var it in jo.body.errorObjs)
4097
-                    {
4098
-                        if (!string.IsNullOrEmpty(it.resturl))
4099
-                        {
4100
-                            error += " 推送接口名称:" + it.resturl;
4101
-                        }
4102
-                        if (!string.IsNullOrEmpty(it.caseserial))
4103
-                        {
4104
-                            error += " 推送工单号:" + it.caseserial;
4105
-                        }
4106
-                        if (!string.IsNullOrEmpty(it.resturl))
4107
-                        {
4108
-                            error += " 推送标识:" + it.errorid;
4109
-                        }
4110
-                        if (!string.IsNullOrEmpty(it.resturl))
4111
-                        {
4112
-                            error += " 推送失败原因:" + it.errormsg;
4113
-                        }
4114
-                    }
4115
-                }
4116
-                string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
4117
-                   values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", "", jsonParam, DateTime.Now, jo.code, jo.message, "实时服务信息上报接口", error, "推送成功数:" + jo.body.successCount + " 推送总数:" + jo.body.totalCount);
4118
-                object objres = DbHelperSQL.GetSingle(strSql);
3921
+        string url = "http://172.16.0.10/Affairs/";
3922
+        //  string url = "http://localhost:63660/Affairs/";
4119 3923
 
4120
-            }
4121
-        }
4122
-        public class Push
3924
+        public void case_info(string workorderid, string parameter)
4123 3925
         {
4124
-            public string code { set; get; }
4125
-            public string message { set; get; }
4126
-
4127
-            public body body { set; get; }
4128
-        }
4129
-        public class body
4130
-        {
4131
-            public errorObjs[] errorObjs { set; get; }
4132
-            public string successCount { set; get; }
4133
-            public string totalCount { set; get; }
4134
-        }
4135
-        public class errorObjs
4136
-        {
4137
-            public string resturl { set; get; }
4138
-            public string errorid { set; get; }
4139
-            public string errormsg { set; get; }
4140
-            public string caseserial { set; get; }
3926
+            WebClient web = new WebClient();
3927
+            web.Encoding = Encoding.UTF8;
3928
+            string Dataurl = web.DownloadString(url + parameter + "?workorderid=" + workorderid);
4141 3929
         }
3930
+
4142 3931
         #endregion
4143 3932
     }
4144 3933
 }

File diff suppressed because it is too large
+ 4706 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs


File diff suppressed because it is too large
+ 516 - 545
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs


File diff suppressed because it is too large
+ 0 - 3372
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/ZhengWuController.cs


+ 5 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -24,8 +24,11 @@ namespace CallCenterApi.Interface
24 24
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
25 25
 
26 26
             _worker = new QuartzWorker();
27
-            var satisfactionClose = new SatisfactionClose();
28
-            _worker.AddWork(satisfactionClose);
27
+          //  var satisfactionClose = new SatisfactionClose();
28
+          //  _worker.AddWork(satisfactionClose);
29
+           // _worker.Start();
30
+            var ZhengWuDuiJie = new ZhengWuDuiJie();
31
+            _worker.AddWork(ZhengWuDuiJie);
29 32
             _worker.Start();
30 33
         }
31 34
 

+ 44 - 6
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -171,6 +171,30 @@ namespace CallCenterApi.Interface.Models.Common
171 171
         {
172 172
             return new button(43, "审核拒绝");
173 173
         }
174
+        public static button Signfor()
175
+        {
176
+            return new button(44, "签收");
177
+        }
178
+        public static button Sendback()
179
+        {
180
+            return new button(45, "退回");
181
+        }
182
+        public static button delayback()
183
+        {
184
+            return new button(46, "退回申请延时");
185
+        }
186
+        public static button visits()
187
+        {
188
+            return new button(47, "省平台结案");
189
+        }
190
+        public static button ejdelay()
191
+        {
192
+            return new button(48, "省平台申请延时");
193
+        }
194
+        public static button Report()
195
+        {
196
+            return new button(49, "上报");
197
+        }
174 198
         /// <summary>
175 199
         /// 审核员退回
176 200
         /// </summary>
@@ -230,7 +254,7 @@ namespace CallCenterApi.Interface.Models.Common
230 254
         /// <param name="iszb"></param>
231 255
         /// <returns></returns>
232 256
         public static List<button> GetButtons(string state, string code, string iszb="", string iszbdw="",string ispd=""
233
-            ,int isproresult=0)
257
+            ,int isproresult=0,string user="")
234 258
         {
235 259
             //中心话务员(ZXHWY) 二级网络单位(WLDW) 管理员(GLY) 坐席班长(ZXBZ) 调度专员(ZXLD)
236 260
             //中心领导管理员(ZXLDGLYGLY) 话务主管(ZXBZ) 中心领导(ZXLDGLY) 话务组长(ZXBZ)
@@ -245,7 +269,7 @@ namespace CallCenterApi.Interface.Models.Common
245 269
                     //调度专员 质检专员可以进行编辑 zhengbingbing 20191017
246 270
                     if (code == "ZXLD" || code == "YSZY" || code == "ZJZY")
247 271
                         buttons.Add(edit());
248
-
272
+                   
249 273
                     //中心话务员 坐席班长 管理员
250 274
                     if (code == "ZXHWY" || code == "ZXBZ" || code == "GLY" || code == "DDZG")
251 275
                     {
@@ -265,7 +289,7 @@ namespace CallCenterApi.Interface.Models.Common
265 289
                     //调度专员 中心领导管理员 管理员
266 290
                     if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
267 291
                     {
268
-
292
+                        buttons.Add(Report());
269 293
                         buttons.Add(edit());
270 294
                         buttons.Add(back());// buttons.Add(assign());
271 295
                         //buttons.Add(approval());
@@ -308,6 +332,10 @@ namespace CallCenterApi.Interface.Models.Common
308 332
                         buttons.Add(feedback()); buttons.Add(reback());
309 333
                         if (iszbdw == "1" || code == "GLY" || code == "DDZG")
310 334
                         {
335
+                            
336
+                                if (user =="省平台")
337
+                                buttons.Add(ejdelay());
338
+                            else 
311 339
                             buttons.Add(delay());
312 340
                             if (ispd == "0" || ispd == "")
313 341
                             {
@@ -354,7 +382,7 @@ namespace CallCenterApi.Interface.Models.Common
354 382
                     //调度专员 中心领导管理员 管理员
355 383
                     if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
356 384
                     {
357
-                        buttons.Add(edit());
385
+                     //   buttons.Add(edit());
358 386
                         buttons.Add(auditdelay());
359 387
                     }
360 388
                     //三级网络单位
@@ -393,12 +421,18 @@ namespace CallCenterApi.Interface.Models.Common
393 421
                         {
394 422
                             if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "YSZY" || code == "DDZG" || code == "MTDD")
395 423
                             {
424
+                                if (user=="省平台")
425
+                                    buttons.Add(visits());
426
+                                else
396 427
                                 buttons.Add(visit());
397 428
                                 //  buttons.Add(modify());
398 429
                             }
399 430
                             if (code == "ZXHWY")
400 431
                             {
401
-                                buttons.Add(visit());
432
+                                if (user == "省平台")
433
+                                    buttons.Add(visits());
434
+                                else
435
+                                    buttons.Add(visit());
402 436
                             }
403 437
                         }
404 438
                         //调度专员 中心领导管理员 管理员
@@ -442,7 +476,11 @@ namespace CallCenterApi.Interface.Models.Common
442 476
                     if (code == "WLDW" || code == "GLY" || code == "DDZG")
443 477
                     {
444 478
 
445
-                        buttons.Add(feedback()); buttons.Add(delay());
479
+                        buttons.Add(feedback());
480
+                        if (user == "省平台")
481
+                            buttons.Add(ejdelay());
482
+                        else
483
+                            buttons.Add(delay());
446 484
                         buttons.Add(split());
447 485
 
448 486
                         buttons.Add(reback());

+ 1 - 0
CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -92,6 +92,7 @@
92 92
     <Compile Include="T_Repository_Operation.cs" />
93 93
     <Compile Include="T_SMS_Receive.cs" />
94 94
     <Compile Include="T_Sys_Achievements.cs" />
95
+    <Compile Include="T_Sys_Affairs.cs" />
95 96
     <Compile Include="T_Sys_Class.cs" />
96 97
     <Compile Include="T_Msg_Chat.cs" />
97 98
     <Compile Include="T_Msg_Chat_Map.cs" />

+ 14 - 11
CallCenterApi/CallCenterApi.Model/T_Bus_Supervision.cs

@@ -41,7 +41,7 @@ namespace CallCenterApi.Model
41 41
             get { return _f_id; }
42 42
         }
43 43
         /// <summary>
44
-        /// 
44
+        /// 编号
45 45
         /// </summary>
46 46
         public string F_Code
47 47
         {
@@ -65,7 +65,7 @@ namespace CallCenterApi.Model
65 65
             get { return _f_serialnum; }
66 66
         }
67 67
         /// <summary>
68
-        /// 
68
+        /// 工单编号
69 69
         /// </summary>
70 70
         public string F_WorkOrderId
71 71
         {
@@ -73,7 +73,7 @@ namespace CallCenterApi.Model
73 73
             get { return _f_workorderid; }
74 74
         }
75 75
         /// <summary>
76
-        /// 
76
+        /// 标题
77 77
         /// </summary>
78 78
         public string F_Title
79 79
         {
@@ -81,7 +81,7 @@ namespace CallCenterApi.Model
81 81
             get { return _f_title; }
82 82
         }
83 83
         /// <summary>
84
-        /// 
84
+        /// 等级
85 85
         /// </summary>
86 86
         public string  F_Level
87 87
         {
@@ -89,7 +89,7 @@ namespace CallCenterApi.Model
89 89
             get { return _f_level; }
90 90
         }
91 91
         /// <summary>
92
-        /// 
92
+        /// 时限
93 93
         /// </summary>
94 94
         public DateTime? F_LimitTime
95 95
         {
@@ -97,7 +97,7 @@ namespace CallCenterApi.Model
97 97
             get { return _f_limittime; }
98 98
         }
99 99
         /// <summary>
100
-        /// 
100
+        /// 意见
101 101
         /// </summary>
102 102
         public string F_Opinion
103 103
         {
@@ -105,7 +105,7 @@ namespace CallCenterApi.Model
105 105
             get { return _f_opinion; }
106 106
         }
107 107
         /// <summary>
108
-        /// 
108
+        /// 创建时间
109 109
         /// </summary>
110 110
         public DateTime? F_CreateTime
111 111
         {
@@ -121,7 +121,7 @@ namespace CallCenterApi.Model
121 121
             get { return _f_dealuser; }
122 122
         }
123 123
         /// <summary>
124
-        /// 
124
+        /// 反馈意见
125 125
         /// </summary>
126 126
         public string F_Result
127 127
         {
@@ -153,7 +153,7 @@ namespace CallCenterApi.Model
153 153
             get { return _f_isdelete; }
154 154
         }
155 155
         /// <summary>
156
-        /// 
156
+        /// 涉嫌违规情形
157 157
         /// </summary>
158 158
         public string F_Situation
159 159
         {
@@ -161,7 +161,7 @@ namespace CallCenterApi.Model
161 161
             get { return _f_situation; }
162 162
         }
163 163
         /// <summary>
164
-        /// 
164
+        /// 附件
165 165
         /// </summary>
166 166
         public string F_File
167 167
         {
@@ -169,13 +169,16 @@ namespace CallCenterApi.Model
169 169
             get { return _f_file; }
170 170
         }
171 171
         /// <summary>
172
-        /// 
172
+        /// 内容
173 173
         /// </summary>
174 174
         public string F_Content
175 175
         {
176 176
             set { _f_content = value; }
177 177
             get { return _f_content; }
178 178
         }
179
+        /// <summary>
180
+        /// 是否回复
181
+        /// </summary>
179 182
         public int F_State { set; get; }
180 183
         #endregion Model
181 184
 

+ 36 - 36
CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -715,42 +715,42 @@ namespace CallCenterApi.Model
715 715
         /// </summary>
716 716
         public DateTime? F_VisitExamineTime { set; get; }
717 717
         public string F_VisitAssignUser { set; get; }
718
-        /// <summary>
719
-        ///任务单唯一标识
720
-        /// </summary>
721
-        public string TROWGUID { set; get; }
722
-        /// <summary>
723
-        ///工单编号
724
-        /// </summary>
725
-        public string CASE_SERIAL { set; get; }
726
-        /// <summary>
727
-        ///应签收时限
728
-        /// </summary>
729
-        public string TSIGNTIME_BF { set; get; }
730
-        /// <summary>
731
-        ///应退回时限
732
-        /// </summary>
733
-        public string TBACKTIME_BF { set; get; }
734
-        /// <summary>
735
-        ///交办时间
736
-        /// </summary>
737
-        public string SEND_TIME { set; get; }
738
-        /// <summary>
739
-        ///交办意见
740
-        /// </summary>
741
-        public string SEND_CONTENT { set; get; }
742
-        /// <summary>
743
-        ///登记时间
744
-        /// </summary>
745
-        public string CASE_TIME { set; get; }
746
-        /// <summary>
747
-        ///应办结时间
748
-        /// </summary>
749
-        public string TFDBACKTIME_BF { set; get; }
750
-        /// <summary>
751
-        ///结案回传附件
752
-        /// </summary>
753
-        public string FILE { set; get; }
718
+        ///// <summary>
719
+        /////任务单唯一标识
720
+        ///// </summary>
721
+        //public string TROWGUID { set; get; }
722
+        ///// <summary>
723
+        /////工单编号
724
+        ///// </summary>
725
+        //public string CASE_SERIAL { set; get; }
726
+        ///// <summary>
727
+        /////应签收时限
728
+        ///// </summary>
729
+        //public string TSIGNTIME_BF { set; get; }
730
+        ///// <summary>
731
+        /////应退回时限
732
+        ///// </summary>
733
+        //public string TBACKTIME_BF { set; get; }
734
+        ///// <summary>
735
+        /////交办时间
736
+        ///// </summary>
737
+        //public string SEND_TIME { set; get; }
738
+        ///// <summary>
739
+        /////交办意见
740
+        ///// </summary>
741
+        //public string SEND_CONTENT { set; get; }
742
+        ///// <summary>
743
+        /////登记时间
744
+        ///// </summary>
745
+        //public string CASE_TIME { set; get; }
746
+        ///// <summary>
747
+        /////应办结时间
748
+        ///// </summary>
749
+        //public string TFDBACKTIME_BF { set; get; }
750
+        ///// <summary>
751
+        /////结案回传附件
752
+        ///// </summary>
753
+        //public string FILES { set; get; }
754 754
         #endregion Model
755 755
 
756 756
     }

+ 2 - 0
CallCenterApi/CallCenterApi.Model/T_Call_CallRecords.cs

@@ -553,6 +553,8 @@ namespace CallCenterApi.Model
553 553
         }
554 554
         public string WorkOrderId { set; get; }
555 555
         public string PhoneType { set; get; }
556
+
557
+        public int? Callback { set; get; }
556 558
         #endregion Model
557 559
 
558 560
     }

+ 129 - 0
CallCenterApi/CallCenterApi.Model/T_Sys_Affairs.cs

@@ -0,0 +1,129 @@
1
+using System;
2
+using System.Collections.Generic;
3
+using System.Linq;
4
+using System.Text;
5
+using System.Threading.Tasks;
6
+
7
+namespace CallCenterApi.Model
8
+{
9
+    /// <summary>
10
+    /// T_Sys_Affairs:实体类(属性说明自动提取数据库字段的描述信息)
11
+    /// </summary>
12
+    [Serializable]
13
+    public partial class T_Sys_Affairs
14
+    {
15
+        public T_Sys_Affairs()
16
+        { }
17
+        #region Model
18
+        private int _f_id;
19
+        private string _f_workorderid;
20
+        private string _trowguid;
21
+        private string _case_serial;
22
+        private string _tsigntime_bf;
23
+        private string _tbacktime_bf;
24
+        private string _send_time;
25
+        private string _send_content;
26
+        private string _case_time;
27
+        private string _tfdbacktime_bf;
28
+        private string _files;
29
+        private DateTime? _createtime;
30
+        /// <summary>
31
+        /// 
32
+        /// </summary>
33
+        public int F_ID
34
+        {
35
+            set { _f_id = value; }
36
+            get { return _f_id; }
37
+        }
38
+        /// <summary>
39
+        /// 
40
+        /// </summary>
41
+        public string F_WorkOrderId
42
+        {
43
+            set { _f_workorderid = value; }
44
+            get { return _f_workorderid; }
45
+        }
46
+        /// <summary>
47
+        /// 任务单唯一标识
48
+        /// </summary>
49
+        public string TROWGUID
50
+        {
51
+            set { _trowguid = value; }
52
+            get { return _trowguid; }
53
+        }
54
+        /// <summary>
55
+        /// 工单编号
56
+        /// </summary>
57
+        public string CASE_SERIAL
58
+        {
59
+            set { _case_serial = value; }
60
+            get { return _case_serial; }
61
+        }
62
+        /// <summary>
63
+        /// 应签收时限
64
+        /// </summary>
65
+        public string TSIGNTIME_BF
66
+        {
67
+            set { _tsigntime_bf = value; }
68
+            get { return _tsigntime_bf; }
69
+        }
70
+        /// <summary>
71
+        /// 应退回时限
72
+        /// </summary>
73
+        public string TBACKTIME_BF
74
+        {
75
+            set { _tbacktime_bf = value; }
76
+            get { return _tbacktime_bf; }
77
+        }
78
+        /// <summary>
79
+        /// 交办时间
80
+        /// </summary>
81
+        public string SEND_TIME
82
+        {
83
+            set { _send_time = value; }
84
+            get { return _send_time; }
85
+        }
86
+        /// <summary>
87
+        /// 交办意见
88
+        /// </summary>
89
+        public string SEND_CONTENT
90
+        {
91
+            set { _send_content = value; }
92
+            get { return _send_content; }
93
+        }
94
+        /// <summary>
95
+        /// 登记时间
96
+        /// </summary>
97
+        public string CASE_TIME
98
+        {
99
+            set { _case_time = value; }
100
+            get { return _case_time; }
101
+        }
102
+        /// <summary>
103
+        /// 应办结时间
104
+        /// </summary>
105
+        public string TFDBACKTIME_BF
106
+        {
107
+            set { _tfdbacktime_bf = value; }
108
+            get { return _tfdbacktime_bf; }
109
+        }
110
+        /// <summary>
111
+        /// 结案回传附件
112
+        /// </summary>
113
+        public string FILES
114
+        {
115
+            set { _files = value; }
116
+            get { return _files; }
117
+        }
118
+        /// <summary>
119
+        /// 
120
+        /// </summary>
121
+        public DateTime? CreateTime
122
+        {
123
+            set { _createtime = value; }
124
+            get { return _createtime; }
125
+        }
126
+        #endregion Model
127
+
128
+    }
129
+}

+ 118 - 61
CallCenterCommon/CallCenter.QuartzService/ZhengWuDuiJie.cs

@@ -16,8 +16,8 @@ namespace CallCenter.QuartzService
16 16
 
17 17
         public ZhengWuDuiJie()
18 18
         {
19
-            CronExpression = "0 0 0 * * ? *";
20
-          //  DoWork += MyWork_DoWork;
19
+            CronExpression = "0 0/5 * * * ? ";
20
+           DoWork += submit_dept_crnt_status;
21 21
         }
22 22
        public class Push
23 23
         {
@@ -36,40 +36,59 @@ namespace CallCenter.QuartzService
36 36
             public string errorid { set; get; }
37 37
             public string errormsg { set; get; }
38 38
         }
39
+        public class paras
40
+        {
41
+            public string AREA_CODE { set; get; }
42
+            public string CRNT_SEATNUM { set; get; }
43
+            public string CRNT_TELNUM { set; get; }
44
+            public string TDY_NUM { set; get; }
45
+            public string TDY_TELNUM { set; get; }
46
+            public string TDY_ZWNUM { set; get; }
47
+            public string TDY_WZNUM { set; get; }
48
+            public string TDY_WXNUM { set; get; }
49
+            public string TDY_APNUM { set; get; }
50
+            public string TDY_OTNUM { set; get; }
51
+            public string TDY_TELRATE { set; get; }
52
+        }
39 53
         /// <summary>
40 54
         /// 实时服务信息上报接口
41 55
         /// </summary>
42 56
         /// <param name="sender"></param>
43 57
         /// <param name="e"></param>
44 58
         private void submit_dept_crnt_status(object sender, EventArgs e)
59
+
45 60
         {
61
+            string token = GetToken();
62
+           
63
+            paras paras = new paras();
64
+            paras.AREA_CODE = "410500";
46 65
             string ZX = " select top 1  Checkin from rep_service WITH(NOLOCK)  ";
47
-            var CRNT_SEATNUM = DbHelperSQL.GetSingle(ZX);
66
+            paras. CRNT_SEATNUM = DbHelperSQL.GetSingle(ZX).ToString ();
48 67
 
49 68
             string TH = "select top 1  Conversation from rep_service WITH(NOLOCK)  ";
50
-            var CRNT_TELNUM = DbHelperSQL.GetSingle(TH);
69
+            paras.CRNT_TELNUM = DbHelperSQL.GetSingle(TH).ToString();
51 70
 
52 71
             string GDCount = "select COUNT(1) from  T_Bus_WorkOrder WITH(NOLOCK)  where datediff(day , F_CreateTime   , getdate())= 0  ";
53
-            var TDY_NUM = DbHelperSQL.GetSingle(GDCount);
72
+            paras.TDY_NUM = DbHelperSQL.GetSingle(GDCount).ToString();
54 73
 
55 74
             string ldCount = "SELECT COUNT(1) FROM T_Call_CallRecords  WITH(NOLOCK)  WHERE datediff(day , BeginTime    , getdate())= 0   ";
56
-            var TDY_TELNUM = DbHelperSQL.GetSingle(ldCount);
75
+            paras.TDY_TELNUM = DbHelperSQL.GetSingle(ldCount).ToString();
57 76
 
58 77
             string DHCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource = 1 AND datediff(day , F_CreateTime   , getdate())= 0    ";
59
-            var TDY_ZWNUM = DbHelperSQL.GetSingle(DHCount);
78
+            paras.TDY_ZWNUM = DbHelperSQL.GetSingle(DHCount).ToString();
60 79
 
61 80
             //暂时不知
62
-            string WZCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource = '' AND datediff(day , F_CreateTime   , getdate())= 0    ";
63
-            var TDY_WZNUM = DbHelperSQL.GetSingle(WZCount);
81
+            string WZCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource in(4,7,2459) AND datediff(day , F_CreateTime   , getdate())= 0    ";
82
+            paras.TDY_WZNUM = DbHelperSQL.GetSingle(WZCount).ToString();
64 83
 
65 84
             string WXCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource =5 AND datediff(day , F_CreateTime   , getdate())= 0    ";
66
-            var TDY_WXNUM = DbHelperSQL.GetSingle(WXCount);
85
+            paras.TDY_WXNUM = DbHelperSQL.GetSingle(WXCount).ToString();
67 86
 
68
-            string APPCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource =2527 AND datediff(day , F_CreateTime   , getdate())= 0    ";
69
-            var TDY_APNUM = DbHelperSQL.GetSingle(APPCount);
87
+            string APPCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource in (2527,2458 )AND datediff(day , F_CreateTime   , getdate())= 0    ";
88
+            paras.TDY_APNUM = DbHelperSQL.GetSingle(APPCount).ToString();
70 89
 
71 90
             string WBCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource =3 AND datediff(day , F_CreateTime   , getdate())= 0    ";
72
-            var TDY_OTNUM = DbHelperSQL.GetSingle(WBCount);
91
+            paras.TDY_OTNUM = DbHelperSQL.GetSingle(WBCount).ToString();
73 92
 
74 93
 
75 94
             string jt = "SELECT COUNT(1) FROM T_Call_CallRecords  WITH(NOLOCK)  WHERE datediff(day , BeginTime    , getdate())= 0 AND CallState =1  ";
@@ -86,57 +105,95 @@ namespace CallCenter.QuartzService
86 105
             catch
87 106
             {
88 107
             }
89
-            var paras = new SortedDictionary<string, string>
90
-            {
91
-                {"AREA_CODE", "410500"},
92
-                {"CRNT_SEATNUM", CRNT_SEATNUM.ToString ()},
93
-                {"CRNT_TELNUM", CRNT_TELNUM.ToString ()},
94
-                {"TDY_NUM", TDY_NUM.ToString ()},
95
-                {"TDY_TELNUM",TDY_TELNUM.ToString ()},
96
-                {"TDY_ZWNUM", TDY_ZWNUM.ToString ()},
97
-                {"TDY_WZNUM", TDY_WZNUM.ToString ()},
98
-                {"TDY_WXNUM", TDY_WXNUM.ToString ()},
99
-                {"TDY_APNUM", TDY_WXNUM.ToString ()},
100
-                {"TDY_OTNUM", TDY_OTNUM.ToString ()},
101
-                {"TDY_TELRATE", TDY_TELRATE.ToString ()},
102
-            };
108
+
109
+            paras.TDY_TELRATE = TDY_TELRATE;
110
+
111
+            //Dictionary<string, object> values = new Dictionary<string, object>();
112
+            //values.Add("access_token", token);
113
+            //values.Add("paras", paras);
114
+            //var jsonParam = JsonConvert.SerializeObject(values);
103 115
             //序列化参数
104
-            var jsonParam = JsonConvert.SerializeObject(paras);
105
-            var responseString = HttpMethods.HttpPost("submit_dept_crnt_status", jsonParam, "application/json;charset=UTF-8");
106
-            Push jo =JsonConvert.DeserializeObject<Push>(responseString);
107
-             if (jo .code =="0")
108
-            {
109
-                string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
110
-                   values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", "", jsonParam, DateTime.Now, jo.code, jo.message , "实时服务信息上报接口", "", "");
111
-                object objres = DbHelperSQL.GetSingle(strSql);
112
-            }
113
-             else
114
-            {
115
-                string error = "";
116
-                if (jo .body .errorObjs  !=null && jo.body.errorObjs.Length >0)
117
-                {
118
-                    foreach (var it in jo.body.errorObjs)
119
-                    {
120
-                        if (!string .IsNullOrEmpty (it.resturl ))
121
-                        {
122
-                            error += " 推送接口名称:" + it.resturl;
123
-                        }
124
-                        if (!string.IsNullOrEmpty(it.resturl))
125
-                        {
126
-                            error += " 推送标识:" + it.errorid;
127
-                        }
128
-                        if (!string.IsNullOrEmpty(it.resturl))
129
-                        {
130
-                            error += " 推送失败原因:" + it.errormsg;
131
-                        }
132
-                    }
133
-                }
134
-                    string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
135
-                   values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", "", jsonParam, DateTime.Now, jo.code, jo.message, "实时服务信息上报接口", error, "");
136
-                object objres = DbHelperSQL.GetSingle(strSql);
116
+            string jsonParam = "access_token=" + token + "&paras=" + paras.ToJson();
117
+            var responseString = HttpMethods.HttpPost("http://59.227.104.19:8000/share/submit_dept_crnt_status", jsonParam);
118
+            //Push jo =JsonConvert.DeserializeObject<Push>(responseString);
119
+            // if (jo .code =="0")
120
+            //{
121
+            //    string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
122
+            //       values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", "", jsonParam, DateTime.Now, jo.code, jo.message , "实时服务信息上报接口", "", "");
123
+            //    object objres = DbHelperSQL.GetSingle(strSql);
124
+            //}
125
+            // else
126
+            //{
127
+            //    string error = "";
128
+            //    if (jo .body .errorObjs  !=null && jo.body.errorObjs.Length >0)
129
+            //    {
130
+            //        foreach (var it in jo.body.errorObjs)
131
+            //        {
132
+            //            if (!string .IsNullOrEmpty (it.resturl ))
133
+            //            {
134
+            //                error += " 推送接口名称:" + it.resturl;
135
+            //            }
136
+            //            if (!string.IsNullOrEmpty(it.resturl))
137
+            //            {
138
+            //                error += " 推送标识:" + it.errorid;
139
+            //            }
140
+            //            if (!string.IsNullOrEmpty(it.resturl))
141
+            //            {
142
+            //                error += " 推送失败原因:" + it.errormsg;
143
+            //            }
144
+            //        }
145
+            //    }
146
+            //        string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
147
+            //       values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", "", jsonParam, DateTime.Now, jo.code, jo.message, "实时服务信息上报接口", error, "");
148
+            //    object objres = DbHelperSQL.GetSingle(strSql);
137 149
                 
138
-            }
150
+            //}
139 151
           
140 152
         }
153
+        private string GetToken()
154
+        {
155
+
156
+            //Dictionary<string, object> values = new Dictionary<string, object>();
157
+            //values.Add("client_id", "d620caf2-d00f-41a9-ae99-c6dfd435875e");
158
+            //values.Add("client_secret", "4f75914e-d517-4325-ac64-c321377b12f0");
159
+            //values.Add("grant_type", "client_credentials");
160
+            //var jsonParam = JsonConvert.SerializeObject(values);
161
+
162
+            string jsonParam = "client_id=d620caf2-d00f-41a9-ae99-c6dfd435875e&client_secret=4f75914e-d517-4325-ac64-c321377b12f0&grant_type=client_credentials";
163
+            var responseString = HttpMethods.HttpPost("http://59.227.104.17/epoint-sso-web/rest/oauth2/token", jsonParam);
164
+            Token jo = JsonConvert.DeserializeObject<Token>(responseString);
165
+            if (jo.status.code == "1")
166
+            {
167
+                if (!string.IsNullOrEmpty(jo.custom.access_token))
168
+                    return jo.custom.access_token;
169
+                else
170
+                    return "";
171
+            }
172
+            else
173
+                return "";
174
+
175
+        }
176
+        public class Token
177
+        {
178
+            public List<Controls> controls { set; get; }
179
+            public Custom custom { set; get; }
180
+            public Status status { set; get; }
181
+        }
182
+        public class Controls
183
+        {
184
+
185
+        }
186
+        public class Custom
187
+        {
188
+            public string access_token { set; get; }
189
+            public string refresh_token { set; get; }
190
+            public string jsessionid { set; get; }
191
+            public string expires_in { set; get; }
192
+        }
193
+        public class Status
194
+        {
195
+            public string code { set; get; }
196
+        }
197
+
141 198
     }
142 199
 }

+ 4 - 0
CallCenterCommon/CallCenter.Utility/Http/HttpMethods.cs

@@ -49,6 +49,8 @@ namespace CallCenter.Utility
49 49
 
50 50
             try
51 51
             {
52
+                LogFactory.GetLogger("HttpPost").Debug(url + "\r\n" + param + "\r\n");
53
+
52 54
                 requestStream = new StreamWriter(request.GetRequestStream());
53 55
                 requestStream.Write(param);
54 56
                 requestStream.Close();
@@ -60,6 +62,8 @@ namespace CallCenter.Utility
60 62
                     responseStr = reader.ReadToEnd();
61 63
                     reader.Close();
62 64
                 }
65
+
66
+                LogFactory.GetLogger("HttpPost").Debug(url + "\r\n" + param + "\r\n" + responseStr);
63 67
             }
64 68
             catch (Exception ex)
65 69
             {

+ 7 - 0
CallCenterCommon/CallCenter.Utility/NPOI/MergerHot.cs

@@ -38,6 +38,13 @@ namespace CallCenter.Utility
38 38
             /// 接通率
39 39
             /// </summary>
40 40
             public string rate { set; get; }
41
+
42
+            /// <summary>
43
+            /// 回拨量
44
+            /// </summary>
45
+            public int  callback { set; get; }
46
+
47
+            public int sort { set; get; }
41 48
         }
42 49
     }
43 50
 }

+ 335 - 389
CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -1206,80 +1206,61 @@ namespace CallCenter.Utility
1206 1206
                         indexsource = 0;
1207 1207
                         sheet.SetColumnWidth(0, 12 * 300);
1208 1208
                     }
1209
-                    else if (i >0&&i <= MergerHotSource[0].MergerHot.Count-2)
1209
+                    else if (i >0&&i <= MergerHotSource[0].MergerHot.Count-4)
1210 1210
                     {
1211 1211
                         ICell cell = irow2.CreateCell(indexsource+1);
1212 1212
                         cell.SetCellValue(MergerHotSource[0].MergerHot[i - 1].Source);
1213 1213
                         cell.CellStyle = cellStylebt2;
1214 1214
                         if (i ==1 )
1215 1215
                         {
1216
-                            if (MergerHotSource[0].MergerHot[i - 1].Source=="12345")
1216
+                            indexsource = 5;
1217
+                            for (int z = 2; z <= indexsource - 1; z++)
1217 1218
                             {
1218
-                                indexsource = 6;
1219
-                                for (int z=2;z <= indexsource - 1;z++)
1220
-                                {
1221
-                                    ICell cell4 = irow2.CreateCell(z);
1222
-                                    cell4.CellStyle = cellStylebt2;
1223
-                                }
1224
-                                sheet.AddMergedRegion(new CellRangeAddress(3, 3, 1, indexsource-1));
1225
-                            }
1226
-                            else
1227
-                            {
1228
-                                indexsource = 5;
1229
-                                for (int z = 2; z <= indexsource - 1; z++)
1230
-                                {
1231
-                                    ICell cell4 = irow2.CreateCell(z);
1232
-                                    cell4.CellStyle = cellStylebt2;
1233
-                                }
1234
-                                sheet.AddMergedRegion(new CellRangeAddress(3, 3, 1, indexsource-1));
1219
+                                ICell cell4 = irow2.CreateCell(z);
1220
+                                cell4.CellStyle = cellStylebt2;
1235 1221
                             }
1222
+                            sheet.AddMergedRegion(new CellRangeAddress(3, 3, 1, indexsource - 1));
1236 1223
                         }
1237 1224
                         else
1238 1225
                         {
1239
-                            if (MergerHotSource[0].MergerHot[i - 1].Source == "12345")
1226
+                            for (int z = indexsource + 2; z <= indexsource + 4; z++)
1240 1227
                             {
1241
-                                for (int z = indexsource + 2; z <= indexsource + 5 ; z++)
1242
-                                {
1243
-                                    ICell cell4 = irow2.CreateCell(z);
1244
-                                    cell4.CellStyle = cellStylebt2;
1245
-                                }
1246
-                                sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 5));
1247
-                                indexsource = indexsource + 6;
1248
-
1249
-                            }
1250
-                            else
1251
-                            {
1252
-                                for (int z = indexsource + 2; z <= indexsource + 4; z++)
1253
-                                {
1254
-                                    ICell cell4 = irow2.CreateCell(z);
1255
-                                    cell4.CellStyle = cellStylebt2;
1256
-                                }
1257
-                                sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 4));
1258
-                                indexsource += 5;
1259
-                               
1228
+                                ICell cell4 = irow2.CreateCell(z);
1229
+                                cell4.CellStyle = cellStylebt2;
1260 1230
                             }
1231
+                            sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 4));
1232
+                            indexsource += 5;
1261 1233
                         }
1262 1234
                        
1235
+                       
1263 1236
                     }
1264 1237
                     else
1265 1238
                     {
1266 1239
                         ICell cell = irow2.CreateCell(indexsource + 1);
1267
-                        if (i == MergerHotSource[0].MergerHot.Count - 1)
1268
-                        {
1269
-                            cell.SetCellValue("当日小计");
1270
-                        }
1271
-                        else if (i == MergerHotSource[0].MergerHot.Count )
1240
+                        cell.SetCellValue(MergerHotSource[0].MergerHot[i - 1].Source);
1241
+                        if (i == MergerHotSource[0].MergerHot.Count - 3)
1272 1242
                         {
1273
-                            cell.SetCellValue("累计");
1243
+                            for (int z = indexsource + 2; z <= indexsource + 6; z++)
1244
+                            {
1245
+                                ICell cell4 = irow2.CreateCell(z);
1246
+                                cell4.CellStyle = cellStylebt2;
1247
+                            }
1248
+                            sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 6));
1249
+                            cell.CellStyle = cellStylebt3;
1250
+                            indexsource += 7;
1274 1251
                         }
1275
-                        for (int z = indexsource + 2; z <= indexsource + 5; z++)
1252
+                        else
1276 1253
                         {
1277
-                            ICell cell4 = irow2.CreateCell(z);
1278
-                            cell4.CellStyle = cellStylebt2;
1254
+                            for (int z = indexsource + 2; z <= indexsource + 5; z++)
1255
+                            {
1256
+                                ICell cell4 = irow2.CreateCell(z);
1257
+                                cell4.CellStyle = cellStylebt2;
1258
+                            }
1259
+                            sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 5));
1260
+                            cell.CellStyle = cellStylebt3;
1261
+                            indexsource += 6;
1279 1262
                         }
1280
-                        sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 5));
1281
-                        cell.CellStyle = cellStylebt3;
1282
-                        indexsource += 6;
1263
+                      
1283 1264
                     }
1284 1265
                 }
1285 1266
                 IRow irow3 = sheet.CreateRow(4);
@@ -1293,209 +1274,9 @@ namespace CallCenter.Utility
1293 1274
                         cell.SetCellValue("日期");
1294 1275
                         cell.CellStyle = cellStylebt4;
1295 1276
                     }
1296
-                    else if (i > 0 && i <= MergerHotSource[0].MergerHot.Count - 2)
1277
+                    else if (i > 0 && i <= MergerHotSource[0].MergerHot.Count - 4)
1297 1278
                     {
1298
-                   
1299
-                        if (i == 1)
1300
-                        {
1301
-                            indexsource = 1;
1302
-                            if (MergerHotSource[0].MergerHot[i - 1].Source == "12345")
1303
-                            {
1304
-                                for (int j = 0; j < 5; j++)
1305
-                                {
1306
-                                    ICell cell = irow3.CreateCell(indexsource);
1307
-                                    switch (j)
1308
-                                    {
1309
-                                        case 0:
1310
-                                            cell.SetCellValue("来\n电\n量\n");
1311
-                                        
1312
-                                            cell.CellStyle = cellStylebt5;
1313
-                                          
1314
-                                            sheet.SetColumnWidth(1, 12 * 100);
1315
-                                            break;
1316
-                                        case 1:
1317
-                                            cell.SetCellValue("接\n通\n量\n");
1318
-                                           
1319
-                                            cell.CellStyle = cellStylebt9;
1320
-                                            sheet.SetColumnWidth(2, 12 * 100);
1321
-                                          
1322
-                                            break;
1323
-                                        case 2:
1324
-                                            cell.SetCellValue("接\n通\n率\n");
1325
-                                           
1326
-                                            cell.CellStyle = cellStylebt13;
1327
-                                            sheet.SetColumnWidth(3, 12 * 100);
1328
-                                           
1329
-                                           
1330
-                                            break;
1331
-                                        case 3:
1332
-                                            cell.SetCellValue("未\n接\n通\n");
1333
-                                            
1334
-                                            cell.CellStyle = cellStylebt4;
1335
-                                           
1336
-                                           
1337
-                                            sheet.SetColumnWidth(4, 12 * 100);
1338
-                                            break;
1339
-                                        case 4:
1340
-                                            cell.SetCellValue("主\n动\n放\n弃\n");
1341
-                                           
1342
-                                            cell.CellStyle = cellStylebt4;
1343
-                                            sheet.SetColumnWidth(5, 12 * 100);
1344
-                                            break;
1345
-                                      
1346
-                                    }
1347
-                                    indexsource += 1;
1348
-                                }
1349
-                                sheet.SetColumnWidth(6, 12 * 35);
1350
-                                indexsource = 6;
1351
-                            }
1352
-                            else
1353
-                            {
1354
-                                indexsource = 1;
1355
-                                for (int j = 0; j < 4; j++)
1356
-                                {
1357
-                                    ICell cell = irow3.CreateCell(indexsource);
1358
-                                    switch (j)
1359
-                                    {
1360
-                                        case 0:
1361
-                                            cell.SetCellValue("来\n电\n量\n");
1362
-                                           
1363
-                                            cell.CellStyle = cellStylebt5;
1364
-                                          
1365
-                                            sheet.SetColumnWidth(1, 12 * 100);
1366
-                                          
1367
-                                            break;
1368
-                                        case 1:
1369
-                                            cell.SetCellValue("接\n通\n量\n");
1370
-                                           
1371
-                                            cell.CellStyle = cellStylebt9;
1372
-                                            sheet.SetColumnWidth(2, 12 * 100);
1373
-                                          
1374
-                                          
1375
-                                            break;
1376
-                                        case 2:
1377
-                                            cell.SetCellValue("未\n接\n通\n");
1378
-                                            
1379
-                                            cell.CellStyle = cellStylebt4;
1380
-                                          
1381
-                                          
1382
-                                            sheet.SetColumnWidth(3, 12 * 100);
1383
-                                            break;
1384
-                                        case 3:
1385
-                                            cell.SetCellValue("主\n动\n放\n弃\n");
1386
-                                           
1387
-                                            cell.CellStyle = cellStylebt4;
1388
-                                           
1389
-                                          
1390
-                                            sheet.SetColumnWidth(4, 12 * 100);
1391
-                                            break;
1392
-
1393
-                                    }
1394
-                                  
1395
-                                    indexsource += 1;
1396
-                                }
1397
-                                sheet.SetColumnWidth(5, 12 * 35);
1398
-                                indexsource = 5;
1399
-                            }
1400
-                        }
1401
-                        else
1402
-                        {
1403
-                            if (MergerHotSource[0].MergerHot[i - 1].Source == "12345")
1404
-                            {
1405
-                                for (int j = 0; j < 5; j++)
1406
-                                {
1407
-                                    indexsource += 1;
1408
-                                    ICell cell = irow3.CreateCell(indexsource);
1409
-                                    switch (j)
1410
-                                    {
1411
-                                        case 0:
1412
-                                            cell.SetCellValue("来\n电\n量\n");
1413
-                                            cell.CellStyle = cellStylebt5;
1414
-                                           
1415
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
1416
-                                            break;
1417
-                                        case 1:
1418
-                                            cell.SetCellValue("接\n通\n量\n");
1419
-                                            cell.CellStyle = cellStylebt9;
1420
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
1421
-                                           
1422
-                                            break;
1423
-                                        case 2:
1424
-                                            cell.SetCellValue("接\n通\n率\n");
1425
-                                            cell.CellStyle = cellStylebt2;
1426
-                                            sheet.SetColumnWidth(7, 12 * 100);
1427
-                                           
1428
-                                            break;
1429
-                                        case 3:
1430
-                                            cell.SetCellValue("未\n接\n通\n");
1431
-                                            cell.CellStyle = cellStylebt4;
1432
-                                          
1433
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
1434
-                                            break;
1435
-                                        case 4:
1436
-                                            cell.SetCellValue("主\n动\n放\n弃\n");
1437
-                                            cell.CellStyle = cellStylebt4;
1438
-                                          
1439
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
1440
-                                            break;
1441
-                                    }
1442
-                                  
1443
-                                }
1444
-                                indexsource += 1;
1445
-                                sheet.SetColumnWidth(indexsource, 12 * 35);
1446
-
1447
-                            }
1448
-                            else
1449
-                            {
1450
-                                for (int j = 0; j < 4; j++)
1451
-                                {
1452
-                                    indexsource += 1;
1453
-                                    ICell cell = irow3.CreateCell(indexsource);
1454
-                                    switch (j)
1455
-                                    {
1456
-                                        case 0:
1457
-                                            cell.SetCellValue("来\n电\n量\n");
1458
-                                           
1459
-                                            cell.CellStyle = cellStylebt5;
1460
-                                          
1461
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
1462
-                                            break;
1463
-                                        case 1:
1464
-                                            cell.SetCellValue("接\n通\n量\n");
1465
-                                           
1466
-                                            cell.CellStyle = cellStylebt9;
1467
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
1468
-                                           
1469
-                                            break;
1470
-                                        case 2:
1471
-                                            cell.SetCellValue("未\n接\n通\n");
1472
-                                           
1473
-                                            cell.CellStyle = cellStylebt4;
1474
-                                           
1475
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
1476
-                                            break;
1477
-                                        case 3:
1478
-                                            cell.SetCellValue("主\n动\n放\n弃\n");
1479
-                                          
1480
-                                            cell.CellStyle = cellStylebt4;
1481
-                                          
1482
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
1483
-                                            break;
1484
-
1485
-                                    }
1486
-                                 
1487
-                                  
1488
-                                }
1489
-
1490
-                                indexsource += 1;
1491
-                                sheet.SetColumnWidth(indexsource, 12 * 35);
1492
-                            }
1493
-                          
1494
-                        }
1495
-                    }
1496
-                    else
1497
-                    {
1498
-                        for (int j = 0; j < 5; j++)
1279
+                        for (int j = 0; j < 4; j++)
1499 1280
                         {
1500 1281
                             indexsource += 1;
1501 1282
                             ICell cell = irow3.CreateCell(indexsource);
@@ -1503,47 +1284,205 @@ namespace CallCenter.Utility
1503 1284
                             {
1504 1285
                                 case 0:
1505 1286
                                     cell.SetCellValue("来\n电\n量\n");
1506
-                                
1287
+
1507 1288
                                     cell.CellStyle = cellStylebt5;
1508
-                                  
1509
-                                    sheet.SetColumnWidth(indexsource, 12 * 100);
1289
+                                    sheet.AutoSizeColumn(indexsource);
1290
+                                    //sheet.SetColumnWidth(indexsource, 12 * 150);
1510 1291
                                     break;
1511 1292
                                 case 1:
1512 1293
                                     cell.SetCellValue("接\n通\n量\n");
1513
-                                   
1294
+
1514 1295
                                     cell.CellStyle = cellStylebt9;
1515
-                                    sheet.SetColumnWidth(indexsource, 12 * 100);
1516
-                                   
1296
+                                    sheet.AutoSizeColumn(indexsource);
1297
+                                    // sheet.SetColumnWidth(indexsource, 12 * 150);
1298
+
1517 1299
                                     break;
1518 1300
                                 case 2:
1519 1301
                                     cell.SetCellValue("未\n接\n通\n");
1520
-                                  
1302
+
1521 1303
                                     cell.CellStyle = cellStylebt4;
1522
-                                  
1523
-                                    sheet.SetColumnWidth(indexsource, 12 * 100);
1304
+                                    sheet.AutoSizeColumn(indexsource);
1305
+                                  //  sheet.SetColumnWidth(indexsource, 12 * 150);
1524 1306
                                     break;
1525 1307
                                 case 3:
1526 1308
                                     cell.SetCellValue("主\n动\n放\n弃\n");
1527
-                                  
1309
+
1528 1310
                                     cell.CellStyle = cellStylebt4;
1529
-                                   
1530
-                                    sheet.SetColumnWidth(indexsource, 12 * 100);
1531
-                                    break;
1532
-                                case 4:
1533
-                                    cell.SetCellValue("接\n通\n率\n");
1534
-                                   
1535
-                                    cell.CellStyle = cellStylebt10;
1536
-                                    sheet.SetColumnWidth(indexsource, 12 * 200);
1537
-                                  
1538
-                               
1311
+                                    sheet.AutoSizeColumn(indexsource);
1312
+                                    // sheet.SetColumnWidth(indexsource, 12 * 150);
1539 1313
                                     break;
1314
+
1540 1315
                             }
1541
-                        
1316
+
1542 1317
 
1543 1318
                         }
1544 1319
                         indexsource += 1;
1545 1320
                         sheet.SetColumnWidth(indexsource, 12 * 35);
1546 1321
                     }
1322
+                    else
1323
+                    {
1324
+                        if (MergerHotSource[0].MergerHot[i - 1].Source == "12345")
1325
+                        {
1326
+                            for (int j = 0; j < 5; j++)
1327
+                            {
1328
+                                indexsource += 1;
1329
+                                ICell cell = irow3.CreateCell(indexsource);
1330
+                                switch (j)
1331
+                                {
1332
+                                    case 0:
1333
+                                        cell.SetCellValue("来\n电\n量\n");
1334
+                                        cell.CellStyle = cellStylebt5;
1335
+                                        sheet.AutoSizeColumn(indexsource);
1336
+                                        // sheet.SetColumnWidth(indexsource, 12 * 150);
1337
+                                        break;
1338
+                                    case 1:
1339
+                                        cell.SetCellValue("接\n通\n量\n");
1340
+                                        cell.CellStyle = cellStylebt9;
1341
+                                        sheet.AutoSizeColumn(indexsource);
1342
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
1343
+
1344
+                                        break;
1345
+                                    case 2:
1346
+                                        cell.SetCellValue("接\n通\n率\n");
1347
+                                        cell.CellStyle = cellStylebt2;
1348
+                                        sheet.AutoSizeColumn(indexsource);
1349
+                                        //  sheet.SetColumnWidth(7, 12 * 150);
1350
+
1351
+                                        break;
1352
+                                    case 3:
1353
+                                        cell.SetCellValue("未\n接\n通\n");
1354
+                                        cell.CellStyle = cellStylebt4;
1355
+                                        sheet.AutoSizeColumn(indexsource);
1356
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
1357
+                                        break;
1358
+                                    case 4:
1359
+                                        cell.SetCellValue("主\n动\n放\n弃\n");
1360
+                                        cell.CellStyle = cellStylebt4;
1361
+                                        sheet.AutoSizeColumn(indexsource);
1362
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
1363
+                                        break;
1364
+                                }
1365
+
1366
+                            }
1367
+                            indexsource += 1;
1368
+                            sheet.SetColumnWidth(indexsource, 12 * 35);
1369
+
1370
+                        }
1371
+                        else if (MergerHotSource[0].MergerHot[i - 1].Source == "归并热线小计")
1372
+                        {
1373
+                            for (int j = 0; j < 6; j++)
1374
+                            {
1375
+                                indexsource += 1;
1376
+                                ICell cell = irow3.CreateCell(indexsource);
1377
+                                switch (j)
1378
+                                {
1379
+                                    case 0:
1380
+                                        cell.SetCellValue("来\n电\n量\n");
1381
+
1382
+                                        cell.CellStyle = cellStylebt5;
1383
+                                        sheet.AutoSizeColumn(indexsource);
1384
+                                        //sheet.SetColumnWidth(indexsource, 12 * 150);
1385
+                                        break;
1386
+                                    case 1:
1387
+                                        cell.SetCellValue("接\n通\n量\n");
1388
+
1389
+                                        cell.CellStyle = cellStylebt9;
1390
+                                        sheet.AutoSizeColumn(indexsource);
1391
+                                        // sheet.SetColumnWidth(indexsource, 12 * 150);
1392
+
1393
+                                        break;
1394
+                                    case 2:
1395
+                                        cell.SetCellValue("未\n接\n通\n");
1396
+
1397
+                                        cell.CellStyle = cellStylebt4;
1398
+                                        sheet.AutoSizeColumn(indexsource);
1399
+                                        // sheet.SetColumnWidth(indexsource, 12 * 150);
1400
+                                        break;
1401
+                                    case 3:
1402
+                                        cell.SetCellValue("主\n动\n放\n弃\n");
1403
+
1404
+                                        cell.CellStyle = cellStylebt4;
1405
+                                        sheet.AutoSizeColumn(indexsource);
1406
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
1407
+                                        break;
1408
+                                    case 4:
1409
+                                        cell.SetCellValue("接\n通\n率\n");
1410
+
1411
+                                        cell.CellStyle = cellStylebt10;
1412
+                                        sheet.AutoSizeColumn(indexsource);
1413
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 200);
1414
+
1415
+                                        break;
1416
+                                    case 5:
1417
+                                        cell.SetCellValue("回\n拨\n量\n");
1418
+                                        cell.CellStyle = cellStylebt4;
1419
+                                        sheet.AutoSizeColumn(indexsource);
1420
+                                        //   sheet.SetColumnWidth(indexsource, 12 * 150);
1421
+                                        break;
1422
+                                }
1423
+
1424
+
1425
+                            }
1426
+                            indexsource += 1;
1427
+                            sheet.SetColumnWidth(indexsource, 12 * 35);
1428
+
1429
+                        }
1430
+                        else 
1431
+                        {
1432
+                            for (int j = 0; j < 5; j++)
1433
+                            {
1434
+                                indexsource += 1;
1435
+                                ICell cell = irow3.CreateCell(indexsource);
1436
+                                switch (j)
1437
+                                {
1438
+                                    case 0:
1439
+                                        cell.SetCellValue("来\n电\n量\n");
1440
+
1441
+                                        cell.CellStyle = cellStylebt5;
1442
+                                        sheet.AutoSizeColumn(indexsource);
1443
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
1444
+                                        break;
1445
+                                    case 1:
1446
+                                        cell.SetCellValue("接\n通\n量\n");
1447
+
1448
+                                        cell.CellStyle = cellStylebt9;
1449
+                                        sheet.AutoSizeColumn(indexsource);
1450
+                                        //   sheet.SetColumnWidth(indexsource, 12 * 150);
1451
+
1452
+                                        break;
1453
+                                    case 2:
1454
+                                        cell.SetCellValue("未\n接\n通\n");
1455
+
1456
+                                        cell.CellStyle = cellStylebt4;
1457
+                                        sheet.AutoSizeColumn(indexsource);
1458
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
1459
+                                        break;
1460
+                                    case 3:
1461
+                                        cell.SetCellValue("主\n动\n放\n弃\n");
1462
+
1463
+                                        cell.CellStyle = cellStylebt4;
1464
+                                        sheet.AutoSizeColumn(indexsource);
1465
+                                        // sheet.SetColumnWidth(indexsource, 12 * 150);
1466
+                                        break;
1467
+                                    case 4:
1468
+                                        cell.SetCellValue("接\n通\n率\n");
1469
+
1470
+                                        cell.CellStyle = cellStylebt10;
1471
+                                        sheet.AutoSizeColumn(indexsource);
1472
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 200);
1473
+
1474
+                                        break;
1475
+                                    
1476
+                                }
1477
+
1478
+
1479
+                            }
1480
+                            indexsource += 1;
1481
+                            sheet.SetColumnWidth(indexsource, 12 * 35);
1482
+
1483
+                        }
1484
+
1485
+                    }
1547 1486
                 }
1548 1487
 
1549 1488
                 for (int i=0;i< MergerHotSource.Count; i++)
@@ -1564,6 +1503,42 @@ namespace CallCenter.Utility
1564 1503
                             {
1565 1504
                                 if (j == 1)
1566 1505
                                 {
1506
+                                    for (int z = 0; z < 4; z++)
1507
+                                    {
1508
+                                        indexsource += 1;
1509
+                                        ICell cell = irow4.CreateCell(indexsource);
1510
+                                        switch (z)
1511
+                                        {
1512
+                                            case 0:
1513
+                                                cell.SetCellValue(MergerHotSource[i]
1514
+                                                    .MergerHot[j - 1].Call);
1515
+                                                cell.CellStyle = cellStylebt8;
1516
+                                                break;
1517
+                                            case 1:
1518
+                                                cell.SetCellValue(MergerHotSource[i]
1519
+                                                    .MergerHot[j - 1].Connect);
1520
+                                                cell.CellStyle = cellStylebt8;
1521
+                                                break;
1522
+
1523
+                                            case 2:
1524
+                                                cell.SetCellValue(MergerHotSource[i]
1525
+                                                    .MergerHot[j - 1].Notconnected);
1526
+                                                cell.CellStyle = cellStylebt8;
1527
+                                                break;
1528
+                                            case 3:
1529
+                                                cell.SetCellValue(MergerHotSource[i]
1530
+                                                    .MergerHot[j - 1].voluntarily);
1531
+                                                cell.CellStyle = cellStylebt8;
1532
+
1533
+
1534
+                                                break;
1535
+
1536
+                                        }
1537
+                                    }
1538
+                                    indexsource += 1;
1539
+                                }
1540
+                                else
1541
+                                {
1567 1542
                                     if (MergerHotSource[i].MergerHot[j - 1].Source == "12345")
1568 1543
                                     {
1569 1544
                                         for (int z = 0; z < 5; z++)
@@ -1576,59 +1551,33 @@ namespace CallCenter.Utility
1576 1551
                                                     cell.SetCellValue(MergerHotSource[i]
1577 1552
                                                         .MergerHot[j - 1].Call);
1578 1553
                                                     cell.CellStyle = cellStylebt8;
1554
+
1555
+
1579 1556
                                                     break;
1580 1557
                                                 case 1:
1581 1558
                                                     cell.SetCellValue(MergerHotSource[i]
1582 1559
                                                         .MergerHot[j - 1].Connect);
1583 1560
                                                     cell.CellStyle = cellStylebt8;
1561
+
1562
+
1563
+
1584 1564
                                                     break;
1585 1565
                                                 case 2:
1586 1566
                                                     cell.SetCellValue(MergerHotSource[i]
1587 1567
                                                         .MergerHot[j - 1].rate);
1588 1568
                                                     cell.CellStyle = cellStylebt8;
1589
-                                                    break;
1590
-                                                case 3:
1591
-                                                    cell.SetCellValue(MergerHotSource[i]
1592
-                                                        .MergerHot[j - 1].Notconnected);
1593
-                                                    cell.CellStyle = cellStylebt8;
1594 1569
 
1595
-                                                    break;
1596
-                                                case 4:
1597
-                                                    cell.SetCellValue(MergerHotSource[i]
1598
-                                                        .MergerHot[j - 1].voluntarily);
1599
-                                                    cell.CellStyle = cellStylebt8;
1600
-                                                    break;
1601 1570
 
1602
-                                            }
1603
-                                        }
1604
-                                        indexsource += 1;
1605 1571
 
1606
-                                    }
1607
-                                    else
1608
-                                    {
1609
-                                        for (int z = 0; z < 4; z++)
1610
-                                        {
1611
-                                            indexsource += 1;
1612
-                                            ICell cell = irow4.CreateCell(indexsource);
1613
-                                            switch (z)
1614
-                                            {
1615
-                                                case 0:
1616
-                                                    cell.SetCellValue(MergerHotSource[i]
1617
-                                                        .MergerHot[j - 1].Call);
1618
-                                                    cell.CellStyle = cellStylebt8;
1619 1572
                                                     break;
1620
-                                                case 1:
1621
-                                                    cell.SetCellValue(MergerHotSource[i]
1622
-                                                        .MergerHot[j - 1].Connect);
1623
-                                                    cell.CellStyle = cellStylebt8;
1624
-                                                    break;
1625
-
1626
-                                                case 2:
1573
+                                                case 3:
1627 1574
                                                     cell.SetCellValue(MergerHotSource[i]
1628 1575
                                                         .MergerHot[j - 1].Notconnected);
1629 1576
                                                     cell.CellStyle = cellStylebt8;
1577
+
1578
+
1630 1579
                                                     break;
1631
-                                                case 3:
1580
+                                                case 4:
1632 1581
                                                     cell.SetCellValue(MergerHotSource[i]
1633 1582
                                                         .MergerHot[j - 1].voluntarily);
1634 1583
                                                     cell.CellStyle = cellStylebt8;
@@ -1639,12 +1588,13 @@ namespace CallCenter.Utility
1639 1588
                                             }
1640 1589
                                         }
1641 1590
                                         indexsource += 1;
1591
+
1592
+
1642 1593
                                     }
1643
-                                }
1644
-                                else
1645
-                                {
1646
-                                    if (MergerHotSource[i].MergerHot[j - 1].Source == "12345")
1594
+                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "当日小计"
1595
+                                        || MergerHotSource[i].MergerHot[j - 1].Source == "累计")
1647 1596
                                     {
1597
+
1648 1598
                                         for (int z = 0; z < 5; z++)
1649 1599
                                         {
1650 1600
                                             indexsource += 1;
@@ -1655,38 +1605,26 @@ namespace CallCenter.Utility
1655 1605
                                                     cell.SetCellValue(MergerHotSource[i]
1656 1606
                                                         .MergerHot[j - 1].Call);
1657 1607
                                                     cell.CellStyle = cellStylebt8;
1658
-
1659
-
1660 1608
                                                     break;
1661 1609
                                                 case 1:
1662 1610
                                                     cell.SetCellValue(MergerHotSource[i]
1663 1611
                                                         .MergerHot[j - 1].Connect);
1664 1612
                                                     cell.CellStyle = cellStylebt8;
1665
-
1666
-
1667
-
1668 1613
                                                     break;
1669 1614
                                                 case 2:
1670 1615
                                                     cell.SetCellValue(MergerHotSource[i]
1671
-                                                        .MergerHot[j - 1].rate);
1616
+                                                        .MergerHot[j - 1].Notconnected);
1672 1617
                                                     cell.CellStyle = cellStylebt8;
1673
-
1674
-
1675
-
1676 1618
                                                     break;
1677 1619
                                                 case 3:
1678 1620
                                                     cell.SetCellValue(MergerHotSource[i]
1679
-                                                        .MergerHot[j - 1].Notconnected);
1621
+                                                        .MergerHot[j - 1].voluntarily);
1680 1622
                                                     cell.CellStyle = cellStylebt8;
1681
-
1682
-
1683 1623
                                                     break;
1684 1624
                                                 case 4:
1685 1625
                                                     cell.SetCellValue(MergerHotSource[i]
1686
-                                                        .MergerHot[j - 1].voluntarily);
1626
+                                                        .MergerHot[j - 1].rate);
1687 1627
                                                     cell.CellStyle = cellStylebt8;
1688
-
1689
-
1690 1628
                                                     break;
1691 1629
 
1692 1630
                                             }
@@ -1695,11 +1633,11 @@ namespace CallCenter.Utility
1695 1633
 
1696 1634
 
1697 1635
                                     }
1698
-                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "当日小计"
1699
-                                        || MergerHotSource[i].MergerHot[j - 1].Source == "累计")
1636
+                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "归并热线小计"
1637
+                                    )
1700 1638
                                     {
1701 1639
 
1702
-                                        for (int z = 0; z < 5; z++)
1640
+                                        for (int z = 0; z < 6; z++)
1703 1641
                                         {
1704 1642
                                             indexsource += 1;
1705 1643
                                             ICell cell = irow4.CreateCell(indexsource);
@@ -1730,6 +1668,11 @@ namespace CallCenter.Utility
1730 1668
                                                         .MergerHot[j - 1].rate);
1731 1669
                                                     cell.CellStyle = cellStylebt8;
1732 1670
                                                     break;
1671
+                                                case 5:
1672
+                                                    cell.SetCellValue(MergerHotSource[i]
1673
+                                                        .MergerHot[j - 1].callback );
1674
+                                                    cell.CellStyle = cellStylebt8;
1675
+                                                    break;
1733 1676
 
1734 1677
                                             }
1735 1678
                                         }
@@ -1783,6 +1726,42 @@ namespace CallCenter.Utility
1783 1726
                             {
1784 1727
                                 if (j == 1)
1785 1728
                                 {
1729
+                                    for (int z = 0; z < 4; z++)
1730
+                                    {
1731
+                                        indexsource += 1;
1732
+                                        ICell cell = irow4.CreateCell(indexsource);
1733
+                                        switch (z)
1734
+                                        {
1735
+                                            case 0:
1736
+                                                cell.SetCellValue(MergerHotSource[i]
1737
+                                                    .MergerHot[j - 1].Call);
1738
+                                                cell.CellStyle = cellStylebt15;
1739
+                                                break;
1740
+                                            case 1:
1741
+                                                cell.SetCellValue(MergerHotSource[i]
1742
+                                                    .MergerHot[j - 1].Connect);
1743
+                                                cell.CellStyle = cellStylebt14;
1744
+                                                break;
1745
+
1746
+                                            case 2:
1747
+                                                cell.SetCellValue(MergerHotSource[i]
1748
+                                                    .MergerHot[j - 1].Notconnected);
1749
+                                                cell.CellStyle = cellStylebt11;
1750
+                                                break;
1751
+                                            case 3:
1752
+                                                cell.SetCellValue(MergerHotSource[i]
1753
+                                                    .MergerHot[j - 1].voluntarily);
1754
+                                                cell.CellStyle = cellStylebt11;
1755
+
1756
+
1757
+                                                break;
1758
+
1759
+                                        }
1760
+                                    }
1761
+                                    indexsource += 1;
1762
+                                }
1763
+                                else
1764
+                                {
1786 1765
                                     if (MergerHotSource[i].MergerHot[j - 1].Source == "12345")
1787 1766
                                     {
1788 1767
                                         for (int z = 0; z < 5; z++)
@@ -1795,37 +1774,51 @@ namespace CallCenter.Utility
1795 1774
                                                     cell.SetCellValue(MergerHotSource[i]
1796 1775
                                                         .MergerHot[j - 1].Call);
1797 1776
                                                     cell.CellStyle = cellStylebt15;
1777
+
1778
+
1798 1779
                                                     break;
1799 1780
                                                 case 1:
1800 1781
                                                     cell.SetCellValue(MergerHotSource[i]
1801 1782
                                                         .MergerHot[j - 1].Connect);
1802 1783
                                                     cell.CellStyle = cellStylebt14;
1784
+
1785
+
1786
+
1803 1787
                                                     break;
1804 1788
                                                 case 2:
1805 1789
                                                     cell.SetCellValue(MergerHotSource[i]
1806 1790
                                                         .MergerHot[j - 1].rate);
1807 1791
                                                     cell.CellStyle = cellStylebt6;
1792
+
1793
+
1794
+
1808 1795
                                                     break;
1809 1796
                                                 case 3:
1810 1797
                                                     cell.SetCellValue(MergerHotSource[i]
1811 1798
                                                         .MergerHot[j - 1].Notconnected);
1812 1799
                                                     cell.CellStyle = cellStylebt11;
1813 1800
 
1801
+
1814 1802
                                                     break;
1815 1803
                                                 case 4:
1816 1804
                                                     cell.SetCellValue(MergerHotSource[i]
1817 1805
                                                         .MergerHot[j - 1].voluntarily);
1818 1806
                                                     cell.CellStyle = cellStylebt11;
1807
+
1808
+
1819 1809
                                                     break;
1820 1810
 
1821 1811
                                             }
1822 1812
                                         }
1823 1813
                                         indexsource += 1;
1824 1814
 
1815
+
1825 1816
                                     }
1826
-                                    else
1817
+                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "当日小计"
1818
+                                        || MergerHotSource[i].MergerHot[j - 1].Source == "累计")
1827 1819
                                     {
1828
-                                        for (int z = 0; z < 4; z++)
1820
+
1821
+                                        for (int z = 0; z < 5; z++)
1829 1822
                                         {
1830 1823
                                             indexsource += 1;
1831 1824
                                             ICell cell = irow4.CreateCell(indexsource);
@@ -1841,7 +1834,6 @@ namespace CallCenter.Utility
1841 1834
                                                         .MergerHot[j - 1].Connect);
1842 1835
                                                     cell.CellStyle = cellStylebt14;
1843 1836
                                                     break;
1844
-
1845 1837
                                                 case 2:
1846 1838
                                                     cell.SetCellValue(MergerHotSource[i]
1847 1839
                                                         .MergerHot[j - 1].Notconnected);
@@ -1851,61 +1843,11 @@ namespace CallCenter.Utility
1851 1843
                                                     cell.SetCellValue(MergerHotSource[i]
1852 1844
                                                         .MergerHot[j - 1].voluntarily);
1853 1845
                                                     cell.CellStyle = cellStylebt11;
1854
-
1855
-
1856
-                                                    break;
1857
-
1858
-                                            }
1859
-                                        }
1860
-                                        indexsource += 1;
1861
-                                    }
1862
-                                }
1863
-                                else
1864
-                                {
1865
-                                    if (MergerHotSource[i].MergerHot[j - 1].Source == "12345")
1866
-                                    {
1867
-                                        for (int z = 0; z < 5; z++)
1868
-                                        {
1869
-                                            indexsource += 1;
1870
-                                            ICell cell = irow4.CreateCell(indexsource);
1871
-                                            switch (z)
1872
-                                            {
1873
-                                                case 0:
1874
-                                                    cell.SetCellValue(MergerHotSource[i]
1875
-                                                        .MergerHot[j - 1].Call);
1876
-                                                    cell.CellStyle = cellStylebt15;
1877
-
1878
-
1879
-                                                    break;
1880
-                                                case 1:
1881
-                                                    cell.SetCellValue(MergerHotSource[i]
1882
-                                                        .MergerHot[j - 1].Connect);
1883
-                                                    cell.CellStyle = cellStylebt14;
1884
-
1885
-
1886
-
1887
-                                                    break;
1888
-                                                case 2:
1889
-                                                    cell.SetCellValue(MergerHotSource[i]
1890
-                                                        .MergerHot[j - 1].rate);
1891
-                                                    cell.CellStyle = cellStylebt6;
1892
-
1893
-
1894
-
1895
-                                                    break;
1896
-                                                case 3:
1897
-                                                    cell.SetCellValue(MergerHotSource[i]
1898
-                                                        .MergerHot[j - 1].Notconnected);
1899
-                                                    cell.CellStyle = cellStylebt11;
1900
-
1901
-
1902 1846
                                                     break;
1903 1847
                                                 case 4:
1904 1848
                                                     cell.SetCellValue(MergerHotSource[i]
1905
-                                                        .MergerHot[j - 1].voluntarily);
1906
-                                                    cell.CellStyle = cellStylebt11;
1907
-
1908
-
1849
+                                                        .MergerHot[j - 1].rate);
1850
+                                                    cell.CellStyle = cellStylebt12;
1909 1851
                                                     break;
1910 1852
 
1911 1853
                                             }
@@ -1914,11 +1856,10 @@ namespace CallCenter.Utility
1914 1856
 
1915 1857
 
1916 1858
                                     }
1917
-                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "当日小计"
1918
-                                        || MergerHotSource[i].MergerHot[j - 1].Source == "累计")
1859
+                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "归并热线小计")
1919 1860
                                     {
1920 1861
 
1921
-                                        for (int z = 0; z < 5; z++)
1862
+                                        for (int z = 0; z < 6; z++)
1922 1863
                                         {
1923 1864
                                             indexsource += 1;
1924 1865
                                             ICell cell = irow4.CreateCell(indexsource);
@@ -1949,6 +1890,11 @@ namespace CallCenter.Utility
1949 1890
                                                         .MergerHot[j - 1].rate);
1950 1891
                                                     cell.CellStyle = cellStylebt12;
1951 1892
                                                     break;
1893
+                                                case 5:
1894
+                                                    cell.SetCellValue(MergerHotSource[i]
1895
+                                                        .MergerHot[j - 1].callback );
1896
+                                                    cell.CellStyle = cellStylebt11;
1897
+                                                    break;
1952 1898
 
1953 1899
                                             }
1954 1900
                                         }