话务指标,媒体进线量排名，话务修改

代码/System.Model/Call/T_Call_CallRecords.cs

@@ -16,7 +16,7 @@ namespace System.Model
 		private string _turnid;
 		private string _callnumber;
 		private string _relaynumber;		
-		private string _cusid;
+		private int?  _cusid;
 		private string _cuscode;
 		private int? _calltype = 0;
 		private int? _callstate;
@@ -114,7 +114,7 @@ namespace System.Model
 		/// <summary>
 		/// 客户id
 		/// </summary>
-		public string CusId
+		public int?  CusId
 		{
 			set { _cusid = value; }
 			get { return _cusid; }

代码/TVShoppingCallCenter_ZLJ/Controllers/CallCenter/CallFunctionController.cs

@@ -28,16 +28,17 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
         private readonly ICall_CallRecordsRepository busCallRecordsRepository;
         private readonly ICDRRepository busCdrRepository;
         private readonly ISys_SystemConfigRepository busSystemConfigRepository;
-
-        public CallFunctionController(ISys_SystemConfigRepository _busSystemConfigRepository,ICDRRepository _busCdrRepository,ICall_CallRecordsRepository _busCallRecordsRepository,IConfiguration _configuration, ISys_MobileDataRepository _busMobileDataRepository)
+        private readonly ICus_VipInfoRepository _cus_vip_infoRepository;//客户
+        public CallFunctionController(ISys_SystemConfigRepository _busSystemConfigRepository,ICDRRepository _busCdrRepository,ICall_CallRecordsRepository _busCallRecordsRepository,IConfiguration _configuration, ISys_MobileDataRepository _busMobileDataRepository, ICus_VipInfoRepository cus_vip_infoRepository)
         {
             busSystemConfigRepository = _busSystemConfigRepository;
             busCdrRepository = _busCdrRepository;
             busCallRecordsRepository = _busCallRecordsRepository;
             config = _configuration;
             busMobileDataRepository = _busMobileDataRepository;
+            _cus_vip_infoRepository = cus_vip_infoRepository;
 
-        }
+    }
 
         /// <summary>
         /// 电话归属地查询
@@ -148,13 +149,38 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                     modelRecord.ActionID = modelcdr.action_id;
                     modelRecord.TalkStartTime = modelcdr.answer_time;
                     modelRecord.Callee = modelcdr.callee;
-                    modelRecord.UserCode = modelcdr.callee_agent;
+                    if (modelcdr.call_type==0)
+                    {
+                      string tel = modelcdr.caller.TrimStart('0');
+                        modelRecord.UserCode = modelcdr.callee_agent;
+                        var cus = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1 && x.F_Phone
+                       == modelcdr.caller || x.F_Phone
+                       == tel);
+                        if (cus!=null )
+                        {
+                            modelRecord.CusCode = cus.FirstOrDefault ().F_Name ;
+                            modelRecord.CusId = cus.FirstOrDefault().F_ID ;
+                        }
+                    }
+                    else
+                    {
+                        modelRecord.UserCode = modelcdr.caller_agent;
+                        string tel = modelcdr.callee.TrimStart('0');
+                        modelRecord.UserCode = modelcdr.callee_agent;
+                        var cus = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1 && x.F_Phone
+                       == modelcdr.caller || x.F_Phone
+                       == tel);
+                        if (cus != null)
+                        {
+                            modelRecord.CusCode = cus.FirstOrDefault().F_Name;
+                            modelRecord.CusId = cus.FirstOrDefault().F_ID;
+                        }
+                    }
                     modelRecord.Caller = modelcdr.caller;
-                    modelRecord.CusCode = modelcdr.caller_agent;
-                    modelRecord.CusId = modelcdr.caller_agent;
                     modelRecord.CallType = modelcdr.call_type;
                     modelRecord.BeginTime = modelcdr.create_time;
                     modelRecord.EndTime = modelcdr.end_time;
+                    modelRecord.CallState = modelcdr.is_answer;
                     //  modelcdr.hangup_cause;挂机原因不赋值  HangUpReason
                     //  modelcdr.leave_path 留言 赋值给了FilePath
                     modelRecord.IvrEndTime = modelcdr.hangup_time;

代码/TVShoppingCallCenter_ZLJ/Controllers/CallCenter/CallRecordsController.cs

@@ -64,11 +64,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
             {
                 ConditionalModels.Add(new ConditionalModel { FieldName = "Location", ConditionalType = ConditionalType.Like, FieldValue = input.Location });
             }
-            if (input.CallType!=null )
+            if (input.CallType > -1)
             {
                 ConditionalModels.Add(new ConditionalModel { FieldName = "CallType", ConditionalType = ConditionalType.Equal , FieldValue = input.CallType.ToString () });
             }
-            if (input.CallState != null)
+            if (input.CallState >-1)
             {
                 ConditionalModels.Add(new ConditionalModel { FieldName = "CallState", ConditionalType = ConditionalType.Equal, FieldValue = input.CallState.ToString() });
             }