Browse Source

除综合查询工单权限(只能看到自己的工单),通话记录添加详情接口

lihai 7 years ago
parent
commit
326be601dc
18 changed files with 41 additions and 19 deletions
  1. 1 0
      .gitignore
  2. BIN
      codegit/.vs/AutobioCallCenter/v15/.suo
  3. BIN
      codegit/.vs/AutobioCallCenter/v15/Server/sqlite3/storage.ide
  4. BIN
      codegit/.vs/AutobioCallCenter/v15/Server/sqlite3/storage.ide-shm
  5. BIN
      codegit/.vs/AutobioCallCenter/v15/Server/sqlite3/storage.ide-wal
  6. 0 1
      codegit/CallCenterApi/CallCenterAPI.WechatSDK/obj/Debug/CallCenterAPI.WechatSDK.csproj.CoreCompileInputs.cache
  7. 0 1
      codegit/CallCenterApi/CallCenterApi.BLL/obj/Debug/CallCenterApi.BLL.csproj.CoreCompileInputs.cache
  8. 0 1
      codegit/CallCenterApi/CallCenterApi.Cache/obj/Debug/CallCenterApi.Cache.csproj.CoreCompileInputs.cache
  9. 0 1
      codegit/CallCenterApi/CallCenterApi.Common/obj/Debug/CallCenterApi.Common.csproj.CoreCompileInputs.cache
  10. 0 1
      codegit/CallCenterApi/CallCenterApi.DAL/obj/Debug/CallCenterApi.DAL.csproj.CoreCompileInputs.cache
  11. 0 1
      codegit/CallCenterApi/CallCenterApi.DB/obj/Debug/CallCenterApi.DB.csproj.CoreCompileInputs.cache
  12. 20 0
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs
  13. 20 9
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs
  14. 0 1
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Debug/CallCenterApi.Interface.csproj.CoreCompileInputs.cache
  15. 0 1
      codegit/CallCenterApi/CallCenterApi.Model/obj/Debug/CallCenterApi.Model.csproj.CoreCompileInputs.cache
  16. BIN
      codegit/CallCenterApi/CallCenterApi.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  17. 0 1
      codegit/CallCenterCommon/CallCenter.QuartzService/obj/Debug/CallCenter.QuartzService.csproj.CoreCompileInputs.cache
  18. 0 1
      codegit/CallCenterCommon/CallCenter.Utility/obj/Debug/CallCenter.Utility.csproj.CoreCompileInputs.cache

+ 1 - 0
.gitignore

@@ -6,3 +6,4 @@ codegit/CallCenterApi/CallCenterAPI.WechatSDK/obj/
6 6
 codegit/CallCenterCommon/CallCenter.QuartzService/obj/
7 7
 codegit/CallCenterCommon/CallCenter.Utility/obj/
8 8
 codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Properties/
9
+codegit/.vs/AutobioCallCenter/v15/Server/sqlite3/storage.ide

BIN
codegit/.vs/AutobioCallCenter/v15/.suo


BIN
codegit/.vs/AutobioCallCenter/v15/Server/sqlite3/storage.ide


BIN
codegit/.vs/AutobioCallCenter/v15/Server/sqlite3/storage.ide-shm


BIN
codegit/.vs/AutobioCallCenter/v15/Server/sqlite3/storage.ide-wal


+ 0 - 1
codegit/CallCenterApi/CallCenterAPI.WechatSDK/obj/Debug/CallCenterAPI.WechatSDK.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
1
-dd7a9a75c3c5e3942b64556c10bd86f6ad05c49d

+ 0 - 1
codegit/CallCenterApi/CallCenterApi.BLL/obj/Debug/CallCenterApi.BLL.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
1
-362b93c927d8860ba83d4c805548c9129bcca393

+ 0 - 1
codegit/CallCenterApi/CallCenterApi.Cache/obj/Debug/CallCenterApi.Cache.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
1
-8a61c98c5f7fd1207c667d3fa3c52674e189c615

+ 0 - 1
codegit/CallCenterApi/CallCenterApi.Common/obj/Debug/CallCenterApi.Common.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
1
-4448c9ab4419802966eb4c087bf57cdec9642527

+ 0 - 1
codegit/CallCenterApi/CallCenterApi.DAL/obj/Debug/CallCenterApi.DAL.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
1
-4839d3beb4bdb536f517662bfe1913ca002c354a

+ 0 - 1
codegit/CallCenterApi/CallCenterApi.DB/obj/Debug/CallCenterApi.DB.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
1
-2eb3a9605142bfeda971e2159d42d53f4e9496b5

+ 20 - 0
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -13,6 +13,7 @@ namespace CallCenterApi.Interface.Controllers.tel
13 13
 {
14 14
     public class CallrecordsController : BaseController
15 15
     {
16
+        BLL.T_Call_CallRecords bll = new BLL.T_Call_CallRecords();
16 17
         //获取通话记录列表
17 18
         public ActionResult GetList(string phone, string usercode)
18 19
         {
@@ -218,6 +219,25 @@ namespace CallCenterApi.Interface.Controllers.tel
218 219
             return Content(obj.ToJson());
219 220
         }
220 221
 
222
+        /// <summary>
223
+        /// 获取实体
224
+        /// </summary>
225
+        /// <param name="id"></param>
226
+        /// <returns></returns>
227
+        public ActionResult GetModel(int callid)
228
+        {
229
+            var model = bll.GetModel(callid);
230
+            var listCustomer = new BLL.T_Cus_CustomerBase().GetModelList(" F_DeleteFlag=0 ");
231
+            var modelCustomer = listCustomer.FirstOrDefault(x => x.F_Telephone == model.CallNumber);
232
+            return Success("获取成功", new
233
+            {
234
+                id = model.CallId,          //呼叫编号id
235
+                mobile = model.CallNumber,  //电话
236
+                CusName = modelCustomer != null ? modelCustomer.F_CustomerName : "",        //客户姓名
237
+                CusDepName = modelCustomer != null ? modelCustomer.F_CustomerIndustry : "", //来电单位
238
+            });
239
+        }
240
+
221 241
         //通话记录导出
222 242
         public ActionResult GetListExpt(string phone, string usercode)
223 243
         {

+ 20 - 9
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -341,6 +341,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
341 341
                                 if (gdname == "已处理")
342 342
                                     gdstate = 1;
343 343
                             }
344
+                            //1、待处理,已处理添加权限,2、综合查询不加
345
+                            sql += " and CreateUser = '" + ua.F_UserCode + "' ";
344 346
                             sql += " and State = " + gdstate + " ";
345 347
                             //坐席工号
346 348
                             if (uid.Trim() != "" && uid != "0")
@@ -527,6 +529,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
527 529
                         //            gdstate = 1;
528 530
                         //    }
529 531
                         //}
532
+                        //1、待处理,已处理添加权限,2、综合查询不加
533
+                        sql += " and CreateUser = '" + ua.F_UserCode + "' ";
530 534
                         //坐席工号
531 535
                         if (uid.Trim() != "" && uid != "0")
532 536
                         {
@@ -968,15 +972,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
968 972
                                     else
969 973
                                         ordermodel.State = 1;
970 974
                                 }
971
-
972
-                                ordermodel.Customer = customer;
973
-                                ordermodel.Address = lddep;
974
-                                ordermodel.Source = fkdep;
975
-                                ordermodel.Detail = WebHelper.UrlDecode(detail);
976
-                                ordermodel.Files = files;
977
-                                ordermodel.County = country;
978
-                                ordermodel.Province = province;
979
-                                ordermodel.City = city;
975
+                                if(!string.IsNullOrEmpty(customer))
976
+                                    ordermodel.Customer = customer;
977
+                                if (!string.IsNullOrEmpty(lddep))
978
+                                    ordermodel.Address = lddep;
979
+                                if (!string.IsNullOrEmpty(fkdep))
980
+                                    ordermodel.Source = fkdep;
981
+                                if (!string.IsNullOrEmpty(detail))
982
+                                    ordermodel.Detail = WebHelper.UrlDecode(detail);
983
+                                if (!string.IsNullOrEmpty(files))
984
+                                    ordermodel.Files = files;
985
+                                if (!string.IsNullOrEmpty(country))
986
+                                    ordermodel.County = country;
987
+                                if (!string.IsNullOrEmpty(province))
988
+                                    ordermodel.Province = province;
989
+                                if (!string.IsNullOrEmpty(city))
990
+                                    ordermodel.City = city;
980 991
 
981 992
                                 if (new BLL.T_Wo_WorkOrder().Update(ordermodel))
982 993
                                     res = Success("修改成功!");

+ 0 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Debug/CallCenterApi.Interface.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
1
-c4ed87b99857c710fac39a993300dbbe3d9a79ef

+ 0 - 1
codegit/CallCenterApi/CallCenterApi.Model/obj/Debug/CallCenterApi.Model.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
1
-ac2a4a8973a396260f6d9cc7869ce2efe3ad6eee

BIN
codegit/CallCenterApi/CallCenterApi.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 0 - 1
codegit/CallCenterCommon/CallCenter.QuartzService/obj/Debug/CallCenter.QuartzService.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
1
-dd56de695bdcd12b3ddb5506cde499023068f6f5

+ 0 - 1
codegit/CallCenterCommon/CallCenter.Utility/obj/Debug/CallCenter.Utility.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
1
-45b6e705bd3b18cf478623a0ff203437dc5746ad