Merge branch 'release/yibin' of http://110.188.24.182:10023/Fengwo/hotline into release/yibin

src/Hotline.Api/Controllers/IPPbxController.cs

@@ -449,7 +449,10 @@ namespace Hotline.Api.Controllers
             {
                 model.TelNo = model.CDPN;//如果是内部通话  响应分机为被叫号码
             }
-
+            if (string.IsNullOrEmpty(dto.phoneTypes))
+            {
+                model.PhoneTypes = (EPhoneTypes)Convert.ToInt32(dto.phoneTypes);
+            }
 
             //获取关联 工单或是回访
             //var order = await _orderRepository.GetAsync(x => x.CallId == model.CallAccept, HttpContext.RequestAborted);//由CallAccept改为OtherAccept

src/Hotline.Share/Dtos/TrCallCenter/TrTelDao.cs

@@ -369,6 +369,8 @@ namespace Hotline.Share.Dtos.TrCallCenter
         /// IVR按键对应动作，需解码
         /// </summary>
         public string? dtmf_type { get; set; }
+
+        public string? phoneTypes { get; set; }
     }
 
 

src/Hotline.Share/Enums/CallCenter/EPhoneTypes.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Share.Enums.CallCenter
+{
+    public enum EPhoneTypes
+    {
+        [Description("普通")]
+        Ordinary = 0,
+
+        [Description("呼入VIP")]
+        CallInVip = 1,
+
+        [Description("呼入黑名单")]
+        CallInBlackList = 2,
+
+        [Description("呼出黑名单")]
+        CallOutBlackList = 3,
+
+        [Description("呼入呼出黑名单")]
+        CallIntAndOutBlackList =4,
+    }
+}

src/Hotline/CallCenter/Calls/TrCallRecord.cs

@@ -168,6 +168,10 @@ namespace Hotline.CallCenter.Calls
         [Navigate(NavigateType.OneToOne, nameof(ExternalId))]
         public Order? Order { get; set; }
 
+        /// <summary>
+        /// 呼入号码类型
+        /// </summary>
+        public EPhoneTypes? PhoneTypes { get; set; }
 
         #endregion
     }