duhongyu лет назад: 3
Родитель
Сommit
6fea7bc42c

+ 9 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/CallOutOptController.cs

@@ -113,6 +113,15 @@ namespace CallCenterApi.Interface.Controllers
113 113
                     }
114 114
                     else if (phone.Trim().Length < 11)
115 115
                     {//号码小于11位,为本地
116
+                        if (phone.Substring(0, 1).Equals("0"))
117
+                           
118
+                        {
119
+                            if (phone.Substring(0, 4).Equals(zipcode))
120
+                            res = 3;
121
+                            else
122
+                             res = 4;
123
+                        }
124
+                         else 
116 125
                         res = 3;
117 126
                     }
118 127
                     else if (phone.Trim().Length > 11 && phone.Substring(0, 4).Equals(zipcode))

+ 5 - 5
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SysConfigController.cs

@@ -296,10 +296,10 @@ namespace CallCenterApi.Interface.Controllers
296 296
             Model.T_Sys_SeatPermissionConfig model = new Model.T_Sys_SeatPermissionConfig();
297 297
             BLL.T_Sys_SeatPermissionConfig bll = new BLL.T_Sys_SeatPermissionConfig();
298 298
             model = bll.GetModel();
299
-            int maxSeat = 100;
300
-            string securityKey = "4691-FE75-9091-1085-5103-92ED-E342-1EBD";
301
-            string passHash = model.F_PassHash; //对密码进行加密
302
-            string saltValue = "CvVmREt4XbO9qt/LRxow+0tZOUM2WkRYZIJJx6Ok1EkJWMTmuVE3NnMEgoW7x/vvfY3fBS8C3o4x+qjkpE9oUNgFADzSodJ9XuJYEOFM4UB/63iYDPG0g9yBUmWhX0J4N6laYUH+l3PWcRqpD/UxLpqzQYwc/RTisnxWiccMIgOakzc3+1AzJRiBnoysZxdn2yITEuOO375RbO+LYSetfYukwh03RQLGo5RNCLq53ALlwQtrUqeA7DdVKS5Bd0m4p53NQz0tU1uGbvbHHauxpoUMjjqD+afDcIW2wfx84YOXq+J1ordgsFTNamFcCd0pfFYRsMqIvkqrgE5gzm7MjQ==";
299
+            int maxSeat = 200;
300
+            string securityKey = "anyang12345";
301
+           // string passHash = model.F_PassHash; //对密码进行加密
302
+            string saltValue = "MzOuu5hR92vWxUdhHJ+EgNnS7KbAQDs+6TgwRR0kktTKlvB2fLRDn1f8ozNdBxsZDZ88wkk8zrc4T1AxCpRdFc25y4nbrwu6Q2dZTfBBcpvgny6S2YXrpb825N4QhQBP/MiPbRBlSNWc+/WIJy19+UTOCQLvskyDQGt0ughzhtZI7FZQASTsmrjiEk+fvU2d8U34ixPlHQLfOp2di9KP93EKnLVgi1MD0GdaSDUq/cSgDDjbQ9jHplaxfRlDWf+ySyzd6Ov98eol4qsxU79E0hRJLZRJ922Y94GqhgfEZFYbRMd6OYPGchgdr7VIE/fyaITrxBl6fj1KP399z/5efg==";
303 303
             string passHashNew = SaltAndHashHelper.GetHashSha256(maxSeat + securityKey, saltValue);
304 304
             return Success(passHashNew);
305 305
         }
@@ -330,8 +330,8 @@ namespace CallCenterApi.Interface.Controllers
330 330
                 return false;
331 331
             }
332 332
         }
333
-         
334 333
 
334
+      
335 335
 
336 336
 
337 337
         #endregion

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

@@ -106,7 +106,7 @@ namespace CallCenterApi.Interface.Controllers.Wiki
106 106
                 "F_Id",
107 107
                 "a.*,dbo.GetDictionaryName(F_Key) as KeyName,'F'+ RIGHT ('00000'+CONVERT (varchar(10),a.F_Id),6) as 序号",
108 108
                 sql,
109
-                "ORDER BY F_DianJiLiang DES0C,F_CreateTime DESC",
109
+                "ORDER BY F_DianJiLiang DESC,F_CreateTime DESC",
110 110
                 pagesize,
111 111
                 page,
112 112
                 true,

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/APPSController.cs

@@ -3164,7 +3164,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
3164 3164
                     {
3165 3165
 
3166 3166
                         string mag = "[\"" + objres + "\",\"" + objres1 + "\"]";
3167
-                        var userlist = new BLL.T_Sys_UserAccount().GetModelList(" F_DeleteFlag =0 and F_RoleId in (1,6)");
3167
+                        var userlist = new BLL.T_Sys_UserAccount().GetModelList(" F_DeleteFlag =0 and F_RoleId in (6)");
3168 3168
 
3169 3169
                         string v = SmsNewController.AddSmS(0, "今日累计来电量" + objres + "个,已接通" + objres1 + "个。请关注!", "13569031100", "704047588659716096", mag, objres.ToString());
3170 3170
                         if (v == "")
@@ -3224,7 +3224,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
3224 3224
                 {
3225 3225
 
3226 3226
                     string mag = "[\"" + objres + "\",\"" + objres1 + "\"]";
3227
-                    var userlist = new BLL.T_Sys_UserAccount().GetModelList(" F_DeleteFlag =0 and F_RoleId in (1, 6)");
3227
+                    var userlist = new BLL.T_Sys_UserAccount().GetModelList(" F_DeleteFlag =0 and F_RoleId in (6)");
3228 3228
 
3229 3229
                     string v = SmsNewController.AddSmS(0, "今日累计来电量" + objres + "个,已接通" + objres1 + "个。请关注!", "13569031100", "704047588659716096", mag, objres.ToString());
3230 3230
                     if (v == "")

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -2558,7 +2558,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
2558 2558
                     btns.Add(ButtonGroup.Signfor());
2559 2559
                     btns.Add(ButtonGroup.Sendback());
2560 2560
                     btns.Add(ButtonGroup.delayback());
2561
-                    
2562 2561
                 }
2563 2562
                 else if (Int32.Parse(strtab) == -1)
2564 2563
                 {
@@ -14559,7 +14558,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
14559 14558
                             keyValuePairs.Add("F_MainDeptId", null);
14560 14559
                             // modelT_Bus_WorkOrder.F_MainDeptId = null;
14561 14560
                             keyValuePairs.Add("F_OtherDeptIds", "");
14562
-                         //   modelT_Bus_WorkOrder.F_OtherDeptIds = "";
14561
+                            keyValuePairs.Add("F_LimitTime", null );
14562
+                            //   modelT_Bus_WorkOrder.F_OtherDeptIds = "";
14563 14563
                             workorderBLL.UpdateWorkOrder (modelT_Bus_WorkOrder.F_Id , keyValuePairs);
14564 14564
                             #endregion
14565 14565
 

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

@@ -23,16 +23,16 @@ namespace CallCenterApi.Interface
23 23
             //clq 增加异常日志记录 自定义 HandleErrorAttribute
24 24
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
25 25
             _worker = new QuartzWorker();
26
-        //  var satisfactionClose = new SatisfactionClose();
27
-          // _worker.AddWork(satisfactionClose);
28
-        //  _worker.Start();
26
+         var satisfactionClose = new SatisfactionClose();
27
+          _worker.AddWork(satisfactionClose);
28
+          _worker.Start();
29 29
            var ZhengWuDuiJie = new ZhengWuDuiJie();
30 30
            _worker.AddWork(ZhengWuDuiJie);
31 31
            _worker.Start();
32 32
            var Peoplewebsite = new Peoplewebsite();
33 33
         _worker.AddWork(Peoplewebsite);
34 34
           _worker.Start();
35
-        //   var PushWorkorder = new PushWorkorder();
35
+        //  var PushWorkorder = new PushWorkorder();
36 36
        //    _worker.AddWork(PushWorkorder);
37 37
        //   _worker.Start();
38 38
         }

+ 7 - 6
CallCenterCommon/CallCenter.QuartzService/ZhengWuDuiJie.cs

@@ -94,23 +94,24 @@ namespace CallCenter.QuartzService
94 94
 
95 95
 
96 96
             string jt = "SELECT COUNT(1) FROM T_Call_CallRecords  WITH(NOLOCK)  WHERE datediff(day , BeginTime    , getdate())= 0 AND CallState =1  ";
97
-            var jtl = DbHelperSQL.GetSingle(jt);
97
+            var jtl = DbHelperSQL.GetSingle(jt).ToString ();
98 98
 
99
-            string   TDY_TELRATE = "0";
99
+            string TDY_TELRATE = "0";
100 100
             try
101 101
             {
102
-                if (int .Parse (ldCount)>0)
102
+                if (int.Parse(paras.TDY_TELNUM) > 0)
103 103
                 {
104
-                    TDY_TELRATE = string.Format("{0:f2}",float  .Parse (jt)/ float.Parse(ldCount));
104
+                    TDY_TELRATE = string.Format("{0:f2}", float.Parse(jtl) / float.Parse(paras.TDY_TELNUM));
105
+                    paras.TDY_TELRATE = TDY_TELRATE;
105 106
                 }
106 107
             }
107 108
             catch
108 109
             {
110
+                paras.TDY_TELRATE = TDY_TELRATE;
109 111
             }
110 112
 
111
-            paras.TDY_TELRATE = TDY_TELRATE;
112 113
 
113
-          
114
+
114 115
             string jsonParam = "access_token=" + token + "&paras=" + paras.ToJson();
115 116
            var responseString = HttpMethods.HttpPost("http://59.227.104.19:8000/share/submit_dept_crnt_status", jsonParam);
116 117