duhongyu лет назад: 4
Родитель
Сommit
7f49e1288a

+ 16 - 9
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -252,7 +252,7 @@ namespace CallCenterApi.Interface.Controllers
252 252
             string strDate = date.ToString("yyyy-MM-dd");
253 253
             string strMonth = date.ToString("yyyy-MM");
254 254
 
255
-            string where = " F_IsDelete=0 ";
255
+            string where = "  ";
256 256
             if (User.F_RoleCode == "ZXHWY")
257 257
             {
258 258
                 where += " and F_CreateUser='" + User.F_UserCode + "' ";
@@ -265,17 +265,24 @@ namespace CallCenterApi.Interface.Controllers
265 265
             //var list4 = bll.GetList(" F_USERID='" + User.F_UserId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
266 266
 
267 267
             BLL.T_Bus_WorkOrder bll = new BLL.T_Bus_WorkOrder();
268
-            var list1 = bll.GetList(where + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_WorkState =9 and F_IsDelete=0 ").Tables[0];
269
-            var list2 = bll.GetList(where + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_WorkState !=9 and F_IsDelete=0 ").Tables[0];
270
-            var list3 = bll.GetList(where + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_WorkState =9 and F_IsDelete=0 ").Tables[0];
271
-            var list4 = bll.GetList(where + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_WorkState !=9 and F_IsDelete=0 ").Tables[0];
268
+
269
+            int daywc = Int32.Parse(DbHelperSQL.GetSingle("select COUNT(1) from T_Bus_WorkOrder where 1=1 and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_WorkState =9 and F_IsDelete=0 " + where).ToString());
270
+
271
+            int daywwc = Int32.Parse(DbHelperSQL.GetSingle("select COUNT(1) from T_Bus_WorkOrder where 1=1 and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_WorkState !=9 and F_IsDelete=0  " + where).ToString());
272
+
273
+            int monwc = Int32.Parse(DbHelperSQL.GetSingle("select COUNT(1) from T_Bus_WorkOrder where 1=1 and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_WorkState =9 and F_IsDelete=0" + where).ToString());
274
+            int monwwc = Int32.Parse(DbHelperSQL.GetSingle("select COUNT(1) from T_Bus_WorkOrder where 1=1 and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_WorkState !=9 and F_IsDelete=0 " + where).ToString());
275
+            //var list1 = bll.GetList(where + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_WorkState =9 and F_IsDelete=0 ").Tables[0];
276
+            //var list2 = bll.GetList(where + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_WorkState !=9 and F_IsDelete=0 ").Tables[0];
277
+            //var list3 = bll.GetList(where + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_WorkState =9 and F_IsDelete=0 ").Tables[0];
278
+            //var list4 = bll.GetList(where + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_WorkState !=9 and F_IsDelete=0 ").Tables[0];
272 279
 
273 280
             var obj = new
274 281
             {
275
-                daywc = list1.Rows.Count,
276
-                daywwc = list2.Rows.Count,
277
-                monwc = list3.Rows.Count,
278
-                monwwc = list4.Rows.Count
282
+                daywc,
283
+                daywwc ,
284
+                monwc ,
285
+                monwwc
279 286
             };
280 287
             return Success("成功", obj);
281 288
         }

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Sms/SmsNewController.cs

@@ -131,7 +131,7 @@ namespace CallCenterApi.Interface.Controllers.Sms
131 131
                                         // oper.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
132 132
                                         oper.F_State = model.F_WorkState;
133 133
                                         oper.F_Message = "市民短信评议基本满意,自动结案";
134
-                                        oper.F_CreateUser = User.F_UserCode;
134
+                                        oper.F_CreateUser = = "短信评议";
135 135
                                         oper.F_CreateTime = DateTime.Now;
136 136
                                         oper.F_IsDelete = 0;
137 137
                                         operBLL.Add(oper);
@@ -156,7 +156,7 @@ namespace CallCenterApi.Interface.Controllers.Sms
156 156
                                         // oper.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
157 157
                                         oper.F_State = model.F_WorkState;
158 158
                                         oper.F_Message = "市民短信评议满意,自动结案";
159
-                                        oper.F_CreateUser = User.F_UserCode;
159
+                                        oper.F_CreateUser ="短信评议";
160 160
                                         oper.F_CreateTime = DateTime.Now;
161 161
                                         oper.F_IsDelete = 0;
162 162
                                         operBLL.Add(oper);

Разница между файлами не показана из-за своего большого размера
+ 13 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs


+ 59 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/DataAnalysisController.cs

@@ -193,6 +193,65 @@ namespace CallCenterApi.Interface.Controllers.report
193 193
 
194 194
             return Success("加载成功", listrate.OrderByDescending(p => p.keycount));
195 195
         }
196
+
197
+
198
+
199
+        /// <summary>
200
+        /// 获取关键词报表
201
+        /// </summary>
202
+        /// <param name="date"></param>
203
+        /// <param name="isdc"></param>
204
+        /// <returns></returns>
205
+        public ActionResult GetKeyReport_2(string sdate, string edate, string source, int isdc = 0)
206
+        {
207
+            DateTime dttime = DateTime.Now;
208
+            if (string.IsNullOrEmpty(sdate))
209
+            {
210
+                sdate = dttime.ToString("yyyy-MM-dd") + " 00:00:00";
211
+            }
212
+            if (string.IsNullOrEmpty(edate))
213
+            {
214
+                edate = dttime.ToString("yyyy-MM-dd") + " 23:59:59";
215
+            }
216
+            string lsql = "";
217
+            if (!string.IsNullOrEmpty(source))
218
+            {
219
+                lsql += "and F_InfoSource='" + source + "'";
220
+            }
221
+          
222
+
223
+
224
+            var date = DateTime.Now;
225
+           
226
+            string sql = $" select F_Key ,count(1) keycount,dbo.GetDictionaryName(F_Key )  keyname from dbo.T_Bus_WorkOrder where F_IsDelete=0  and F_CreateTime between '" + sdate + "' and '" + edate + "' " + lsql + " group by F_Key  order by keycount desc";
227
+            DataTable dt = DbHelperSQL.Query(sql).Tables[0];
228
+
229
+            //var keyAllList = new BLL.T_Sys_DictionaryValue().GetModelList(" F_State=0 ");
230
+            //var keylist = keyAllList.Where(p => p.F_PrentId == pid).ToList();
231
+            //int total = 0;
232
+            //var list = keylist.Select(p =>
233
+            //{
234
+            //    var ids = getChildren(keyAllList, p.F_ValueId);
235
+            //    ids.Insert(0, p.F_ValueId);
236
+            //    int sum = dt.Select(" F_Key in (" + string.Join(",", ids) + ") ").Sum(x => x.Field<int>("keycount"));
237
+            //    total += sum;
238
+            //    return new
239
+            //    {
240
+            //        F_Key = p.F_ValueId,
241
+            //        keyname = p.F_Value,
242
+            //        keycount = sum
243
+            //    };
244
+            //}).ToList();
245
+
246
+            //var listrate = list.Select(p => new
247
+            //{
248
+            //    p.F_Key,
249
+            //    p.keyname,
250
+            //    p.keycount,
251
+            //});
252
+
253
+            return Success("加载成功", dt);
254
+        }
196 255
         /// <summary>
197 256
         /// 获取父级下的所有子级id
198 257
         /// </summary>

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

@@ -760,7 +760,7 @@ namespace CallCenterApi.Interface.Controllers.report
760 760
             int ldcount = 0;int jtcount = 0;
761 761
             List<Incoming> incomings = new List<Incoming>();
762 762
             Incoming incoming = new Incoming();
763
-            incoming.time = "00:00-8:00";
763
+            incoming.time = "00:00-08:00";
764 764
             incoming.IncomingCount = modelcalllist.Where(x => x.BeginTime.Value.Hour >= 0 && x.BeginTime.Value.Hour <= 8
765 765
             ).Count();
766 766
             ldcount += incoming.IncomingCount;

+ 9 - 7
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/APPSController.cs

@@ -1148,6 +1148,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
1148 1148
         {
1149 1149
             StreamReader reader = new StreamReader(System.Web.HttpContext.Current.Request.InputStream);
1150 1150
             var postString = reader.ReadToEnd();
1151
+         
1151 1152
             JObject result = null;
1152 1153
             result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(postString);
1153 1154
             var txnBodyCom = result["txnBodyCom"].ToString();
@@ -1227,16 +1228,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
1227 1228
                     // oper.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
1228 1229
                     oper.F_State = model.F_WorkState;
1229 1230
                     oper.F_Message = "市民网站评议满意,自动结案";
1230
-                    oper.F_CreateUser = User.F_UserCode;
1231
+                    oper.F_CreateUser = "jianhang";
1231 1232
                     oper.F_CreateTime = DateTime.Now;
1232 1233
                     oper.F_IsDelete = 0;
1233 1234
                     operBLL.Add(oper);
1234 1235
                 }
1235
-               
1236
-
1237 1236
             }
1238
-           
1239
-
1240 1237
             var rescon = DbHelperSQL.GetSingle("select count(*) from T_Bus_WorkOrder where F_WorkOrderId='" + strWrkOrdr_ID + "'");
1241 1238
             if (rescon.ToString() == "0")
1242 1239
             {
@@ -3015,6 +3012,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
3015 3012
         {
3016 3013
             StreamReader reader = new StreamReader(System.Web.HttpContext.Current.Request.InputStream);
3017 3014
             var postString = reader.ReadToEnd();
3015
+            LogFactory.GetLogger("55577").Warn(postString);
3018 3016
             JObject result = null;
3019 3017
             result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(postString);
3020 3018
             var txnBodyCom = result["txnBodyCom"].ToString();      //市民姓名 
@@ -3031,7 +3029,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
3031 3029
 
3032 3030
             //    bool n1 = SMSController.AddSmS(133, "", count1, "18937188307", "146926", "");
3033 3031
             string mag = "[\"" + codes.ToString() + "\"]";
3034
-            string v = SmsNewController.AddSmS(0, "你的验证码是" + codes + ".十分钟有效.", mobile, "681240638956277760", mag,
3032
+            string v = SmsNewController.AddSmS(0,  "您的验证码是" + codes + ",10分钟内有效。", mobile, "681240638956277760", mag,
3035 3033
           "");
3036 3034
             if (v=="")
3037 3035
             {
@@ -3129,11 +3127,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
3129 3127
         }
3130 3128
         public ActionResult zmhd10002()
3131 3129
         {
3130
+         
3132 3131
             string sql = "  F_IsDelete=0 ";
3133 3132
             StreamReader reader = new StreamReader(System.Web.HttpContext.Current.Request.InputStream);
3134 3133
             var postString = reader.ReadToEnd();
3134
+           
3135 3135
             JObject result = null;
3136 3136
             result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(postString);
3137
+        
3137 3138
             var txnCommCom = result["txnCommCom"].ToString();
3138 3139
             var txnBodyCom = result["txnBodyCom"].ToString();
3139 3140
             var txnBodyComresult = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnBodyCom);
@@ -3525,7 +3526,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
3525 3526
             var postString = reader.ReadToEnd();
3526 3527
             JObject result = null;
3527 3528
             result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(postString);
3528
-
3529
+          
3529 3530
 
3530 3531
             var txnCommCom = result["txnCommCom"].ToString();
3531 3532
 
@@ -4842,6 +4843,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
4842 4843
 
4843 4844
         public class login
4844 4845
         {
4846
+             
4845 4847
             public string loginName { set; get; }
4846 4848
             public string password { set; get; }
4847 4849
         }

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

@@ -4443,7 +4443,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
4443 4443
 
4444 4444
             }
4445 4445
             else
4446
-            {
4446
+            { 
4447 4447
                 return Error("操作失败");
4448 4448
             }
4449 4449
 

+ 45 - 20
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -8163,6 +8163,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
8163 8163
             int smalltype = RequestString.GetInt("smalltype", 0);
8164 8164
             int sourcearea = RequestString.GetInt("sourcearea", 0);
8165 8165
             int deptid = RequestString.GetInt("deptid", 0);
8166
+          
8166 8167
             int deptlevel = RequestString.GetInt("deptlevel", 0);
8167 8168
             int issatisfie = RequestString.GetInt("issatisfie", -1);//0不满意 1满意
8168 8169
             int ejdeptid = RequestString.GetInt("ejdeptid", 0);
@@ -8233,6 +8234,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
8233 8234
             {
8234 8235
                 sql += " and F_WorkOrderId in(select F_WorkOrderId from T_Bus_AssignedInfo  WITH(NOLOCK) where  F_MainDeptId ="+ dbdeptid + " )";
8235 8236
             }
8237
+
8236 8238
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
8237 8239
             {
8238 8240
                 if (dealstrendtime.Trim() != "" && dealstrendtime != "undefined")
@@ -8488,21 +8490,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
8488 8490
                        " or F_Result like  '%" + strkey + "%' ) ";
8489 8491
             }
8490 8492
             #region  坐席&调度员
8491
-            if (strusercode.Trim() != "" && strusercode != "undefined")
8492
-            {//坐席
8493
-                var usercode = strusercode.Trim().Split(',');
8494
-                var newusercode = "";
8495
-                foreach (var item in usercode)
8496
-                {
8497
-                    if (!string.IsNullOrWhiteSpace(item.Trim()))
8498
-                        newusercode += "'" + item + "',";
8499
-                }
8500
-                newusercode = newusercode.Trim(',');
8501
-                if (newusercode.Trim() != "" && newusercode != "undefined")
8502
-                {
8503
-                    sql += " and F_CreateUser in (" + newusercode + ") ";
8493
+            if (strtab !="0")
8494
+            {
8495
+                if (strusercode.Trim() != "" && strusercode != "undefined")
8496
+                {//坐席
8497
+                    var usercode = strusercode.Trim().Split(',');
8498
+                    var newusercode = "";
8499
+                    foreach (var item in usercode)
8500
+                    {
8501
+                        if (!string.IsNullOrWhiteSpace(item.Trim()))
8502
+                            newusercode += "'" + item + "',";
8503
+                    }
8504
+                    newusercode = newusercode.Trim(',');
8505
+                    if (newusercode.Trim() != "" && newusercode != "undefined")
8506
+                    {
8507
+                        sql += " and F_CreateUser in (" + newusercode + ") ";
8508
+                    }
8504 8509
                 }
8505 8510
             }
8511
+          
8506 8512
             if (strddusercode.Trim() != "" && strddusercode != "undefined")
8507 8513
             {//调度员
8508 8514
                 var ddusercode = strddusercode.Trim().Split(',');
@@ -17590,9 +17596,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
17590 17596
             var model = new BLL.T_Bus_WorkOrder().GetModel(WorkOrderId);
17591 17597
             if (model != null)
17592 17598
             {
17593
-                string content = "您反映的诉求已有回复,请前往http://192.168.8.9:1041/citizenNode/orderDetails.html?workorderid="+model .F_WorkOrderId +"查看办结结果并进行评价,或者拨打12345市长热线来电咨询,谢谢!";
17594
-                string mag = "[\"http://192.168.8.9:1041/citizenNode/orderDetails.html?workorderid=" + model.F_WorkOrderId + "\"]";
17595
-                string n = SmsNewController.AddSmS(0, content, phone, "680847330371186688", mag, WorkOrderId);
17599
+                string content = "";string temp = "680847330371186688";
17600
+                if (model.F_InfoSource ==1|| model.F_InfoSource == 3 || model.F_InfoSource == 6)
17601
+                    content = "您反映的诉求已有回复,请前往http://12345rx.zwfw.anyang.gov.cn:9999/citizenNode/orderDetails.html?workorderid=" + model .F_WorkOrderId +"查看办结结果并进行评价,或者拨打12345市长热线来电咨询,谢谢!";
17602
+                else
17603
+                {
17604
+                    temp = "681914832337539072";
17605
+                   content = "您反映的诉求已有回复,请前往http://12345rx.zwfw.anyang.gov.cn:9999/citizenNode/orderDetails.html?workorderid=" + model.F_WorkOrderId + "查看办结结果并进行评价,谢谢!";
17606
+                }
17607
+                  
17608
+                string mag = "[\"http://12345rx.zwfw.anyang.gov.cn:9999/citizenNode/orderDetails.html?workorderid=" + model.F_WorkOrderId + "\"]";
17609
+                string n = SmsNewController.AddSmS(0, content, phone, temp, mag, WorkOrderId);
17596 17610
                 if (n == "")
17597 17611
                 {
17598 17612
                     Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
@@ -20309,9 +20323,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
20309 20323
                                 newmodelT_Bus_AssignedInfo.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
20310 20324
                                 newmodelT_Bus_AssignedInfo.F_LimitTime = limittime;//办理时限
20311 20325
                                 if (maindept.F_IsDept == 2)
20312
-                                    modelT_Bus_AssignedInfo.F_MainDeptId = premodeldept.F_DeptId;//主办单位id
20326
+                                    newmodelT_Bus_AssignedInfo.F_MainDeptId = premodeldept.F_DeptId;//主办单位id
20313 20327
                                 else
20314
-                                    modelT_Bus_AssignedInfo.F_MainDeptId = maindept.F_DeptId;
20328
+                                    newmodelT_Bus_AssignedInfo.F_MainDeptId = maindept.F_DeptId;
20315 20329
 
20316 20330
 
20317 20331
                                // newmodelT_Bus_AssignedInfo.F_MainDeptId = maindeptid;//主办单位id
@@ -20913,9 +20927,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
20913 20927
                             {
20914 20928
                                 if (modelT_Bus_WorkOrder.F_CusPhone.Length >11)
20915 20929
                                     modelT_Bus_WorkOrder.F_CusPhone= modelT_Bus_WorkOrder.F_CusPhone.Substring(1, 11);
20916
-                                string content = "您反映的诉求已有回复,请前往http://12345rx.zwfw.anyang.gov.cn:9999/citizenNode/orderDetails.html?workorderid=" + modelT_Bus_WorkOrder.F_WorkOrderId + "查看办结结果并进行评价,或者拨打12345市长热线来电咨询,谢谢!";
20930
+
20931
+                                string content = ""; string temp = "680847330371186688";
20932
+                                if (modelT_Bus_WorkOrder.F_InfoSource == 1 || modelT_Bus_WorkOrder.F_InfoSource == 3 || modelT_Bus_WorkOrder.F_InfoSource == 6)
20933
+                                    content = "您反映的诉求已有回复,请前往http://12345rx.zwfw.anyang.gov.cn:9999/citizenNode/orderDetails.html?workorderid=" + modelT_Bus_WorkOrder.F_WorkOrderId + "查看办结结果并进行评价,或者拨打12345市长热线来电咨询,谢谢!";
20934
+                                else
20935
+                                {
20936
+                                    temp = "681914832337539072";
20937
+                                    content = "您反映的诉求已有回复,请前往http://12345rx.zwfw.anyang.gov.cn:9999/citizenNode/orderDetails.html?workorderid=" + modelT_Bus_WorkOrder.F_WorkOrderId + "查看办结结果并进行评价,谢谢!";
20938
+                                }
20917 20939
                                 string mag = "[\"http://12345rx.zwfw.anyang.gov.cn:9999/citizenNode/orderDetails.html?workorderid=" + modelT_Bus_WorkOrder.F_WorkOrderId + "\"]";
20918
-                                string n = SmsNewController.AddSmS(0, content, modelT_Bus_WorkOrder.F_CusPhone, "680847330371186688", mag, modelT_Bus_WorkOrder.F_WorkOrderId);
20940
+
20941
+                                string n = SmsNewController.AddSmS(0, content, modelT_Bus_WorkOrder.F_CusPhone, temp, mag, modelT_Bus_WorkOrder.F_WorkOrderId);
20942
+                                if (n != "")
20943
+                                    return Error(n);
20919 20944
                                 //string count = "您反映的诉求已有回复,请前往安阳政务服务官网(https://zwfw.anyang.gov.cn)登录后查看办结结果并对办理情况进行评价,或者拨打12345市长热线来电咨询,谢谢!";
20920 20945
                                 //string mag = "";
20921 20946
                                 //bool n = SMSController.AddSmS(0, mag, count, modelT_Bus_WorkOrder.F_CusPhone, "289715", "", modelT_Bus_WorkOrder.F_WorkOrderId);

+ 4 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -30,11 +30,11 @@ namespace CallCenterApi.Interface
30 30
            _worker.AddWork(ZhengWuDuiJie);
31 31
            _worker.Start();
32 32
            var Peoplewebsite = new Peoplewebsite();
33
-          _worker.AddWork(Peoplewebsite);
34
-           _worker.Start();
35
-           var PushWorkorder = new PushWorkorder();
36
-           _worker.AddWork(PushWorkorder);
33
+        _worker.AddWork(Peoplewebsite);
37 34
           _worker.Start();
35
+        //   var PushWorkorder = new PushWorkorder();
36
+       //    _worker.AddWork(PushWorkorder);
37
+       //   _worker.Start();
38 38
         }
39 39
         protected void Application_End()
40 40
         {