投诉类型

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -180,7 +180,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         public ActionResult GetPhoneLocation()
         {
 
-            if (Request.IsAuthenticated)
+           if (Request.IsAuthenticated)
             {
                 string location = "未知";
 
@@ -198,8 +198,8 @@ namespace CallCenterApi.Interface.Controllers.tel
                     else
                     {
 
-                        var PhoneNumber = MobiledataController.GetDetails(tel.Substring(1, 7));
-                        if (PhoneNumber != null)
+                        var PhoneNumber = MobiledataController.GetDetails(tel.Substring(1, 11));
+                        if (PhoneNumber != null&& PhoneNumber.Count >0)
                         {
                             Model.T_Sys_MobileData dModel = new Model.T_Sys_MobileData();
                             dModel.F_MobileNum = tel.Substring(1, 7);
@@ -248,8 +248,8 @@ namespace CallCenterApi.Interface.Controllers.tel
                         }
                         else
                         {
-                            var PhoneNumber = MobiledataController .GetDetails (tel.Substring(0, 7));
-                            if (PhoneNumber != null)
+                            var PhoneNumber = MobiledataController .GetDetails (tel.Substring(0, 10));
+                            if (PhoneNumber != null && PhoneNumber.Count > 0)
                             {
                                 Model.T_Sys_MobileData dModel = new Model.T_Sys_MobileData();
                                 dModel.F_MobileNum = tel.Substring(0, 7);
@@ -288,7 +288,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                     }
                 }
                 return Success("归属地加载成功", location);
-            }
+           }
                 return NoToken("未知错误，请重新登录");
          }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/MobiledataController.cs

@@ -153,40 +153,60 @@ namespace CallCenterApi.Interface.Controllers.tel
         //    return true; //总是接受  
         //}
 
+        public ActionResult GetPhone(string moblie)
+        {
+            return Success("",GetDetails(moblie));
+        }
+
+
         public  static  Dictionary<string, string> GetDetails(string moblie)
         {
-            string url = "https://www.chahaoba.com/" + moblie;
-            HtmlDocument document = GetDocument(url);
-            var priceXPath = @"//*[@id='mw-content-text']";
-            var Node = document.DocumentNode.SelectSingleNode(priceXPath);
-            List<string> InnerText = new List<string>();
-            foreach (HtmlNode table in Node.SelectNodes("//table"))
+            try
             {
-                foreach (HtmlNode row in table.SelectNodes(".//tr"))
+                string url = "https://www.chahaoba.com/" + moblie;
+                HtmlDocument document = GetDocument(url);
+                var priceXPath = @"//*[@id='mw-content-text']";
+                var Node = document.DocumentNode.SelectSingleNode(priceXPath);
+                List<string> InnerText = new List<string>();
+
+                foreach (HtmlNode table in Node.SelectNodes("//li"))
                 {
-                    foreach (HtmlNode cell in row.SelectNodes("th|td"))
-                    {
-                        InnerText.Add(cell.InnerText );
-                    }
+                    InnerText.Add(table.InnerText);
                 }
-            }
-            Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
-            if (InnerText != null )
-            {
-               for (int i=0;i< InnerText.Count;i ++)
+                Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+                if (InnerText != null)
                 {
-                    if(InnerText[i ]== "归属省份地区")
+                    for (int i = 0; i < InnerText.Count; i++)
                     {
-                        keyValuePairs.Add("市区", InnerText[i + 1].Split('、')[0]);
-                        keyValuePairs.Add("省份", InnerText[i + 1].Split('、')[1]);
-                    }
-                    else if (InnerText[i] == "电信运营商")
-                    {
-                        keyValuePairs.Add("电信运营商", InnerText[i + 1]);
+                        if (InnerText[i].Contains("归属省份地区："))
+                        {
+                            var address = InnerText[i].Replace("归属省份地区：", "").Split('、');
+                            if (address != null && address.Count() > 1)
+                            {
+                                keyValuePairs.Add("市区", InnerText[i].Replace("归属省份地区：", "").Split('、')[0]);
+                                keyValuePairs.Add("省份", InnerText[i].Replace("归属省份地区：", "").Split('、')[1]);
+                            }
+                            else if (address != null && address.Count() > 0)
+                            {
+                                keyValuePairs.Add("市区", InnerText[i].Replace("归属省份地区：", "").Split('、')[0]);
+                                keyValuePairs.Add("省份", InnerText[i].Replace("归属省份地区：", "").Split('、')[0]);
+                            }
+                        }
+                        else if (InnerText[i].Contains("电信运营商："))
+                        {
+                            keyValuePairs.Add("电信运营商", InnerText[i].Replace("电信运营商：", ""));
+                        }
                     }
                 }
+                return keyValuePairs;
+
+            }
+            catch
+            {
+                return null;
             }
-            return keyValuePairs;
+           
+           
 
         }
         //添加/编辑号码归属地

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkorderAppController.cs

@@ -154,7 +154,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_UserAccount ua = userBLL.GetModel(userId);
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 int DTJ = 0, DFP = 0, DCL = 0, CLZ = 0, YWJ = 0, THDTJ = 0, THDFP = 0, YJGD = 0, EJGD = 0, SJGD = 0, CJSL=0,ZX=0;
-                string where = $" and (F_Type=" + 2 + "or (F_Duplicate in(2,0)and F_Type=3))";
+                string where = $" and (F_Type=" + 2 + "or (F_Duplicate!=1 and F_Duplicate!=4  and F_Type=3) or F_Type>4 )";
                if (ro.F_RoleCode == "DS")//电商角色
                 {
                     where += "and F_Content like  '%电商%'";
@@ -168,33 +168,29 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                             sql += $"  F_IsDelete=0";
                             sql += "AND F_Duplicate !=5"+ where;
-                            if (ro.F_RoleCode == "XTGLY" || ro.F_RoleCode == "JCRY")
-                            {
-                                sql += "AND F_State in(0)";
-                            }
-                            else if ( ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX" || ro.F_RoleCode == "ZR" || ro.F_RoleCode == "CLZY")
+                            if (ro.F_RoleCode == "XTGLY" || ro.F_RoleCode == "JCRY"|| ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX" || ro.F_RoleCode == "ZR" || ro.F_RoleCode == "CLZY")
                             {
-                                sql += "AND F_State in(0)";
+                                sql += "AND F_State =0";
                             }
                             else 
                             {
                                 DTJ = 0;
                                 break;
                             }
-                            DTJ = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待提交
+                            DTJ = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待提交
                             break;
                         case 1://待分派
                             sql = "";
                             sql += $"  F_IsDelete=0";
                             sql += "AND F_Duplicate !=5"+ where;
-                            sql += "AND F_State in (1)";
+                            sql += "AND F_State =1";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX" || ro.F_RoleCode == "ZG")
                             {
                                 DFP = 0;
                                 break;
                             }
-                            DFP = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待分派
+                            DFP = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待分派
                             break;
                         case 2://待处理
                             sql = "";
@@ -211,7 +207,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 DCL = 0;
                                 break;
                             }
-                            DCL = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
+                            DCL = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待处理
                             break;
                         case 3://处理中
                             sql = "";
@@ -228,7 +224,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 CLZ  = 0;
                                 break;
                             }
-                            CLZ = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
+                            CLZ = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待处理
                             break;
                         case 4://退回待分派
                             sql = "";
@@ -241,7 +237,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 THDFP  = 0;
                                 break;
                             }
-                            THDFP = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
+                            THDFP = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待处理
                             break;
                         case 5://退回待提交
                             sql = "";
@@ -254,7 +250,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 THDTJ  = 0;
                                 break;
                             }
-                            THDTJ = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
+                            THDTJ = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待处理
                             break;
                         case 6://已完结
                             sql = "";
@@ -274,7 +270,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 YWJ  = 0;
                                 break;
                             }
-                            YWJ = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
+                            YWJ = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待处理
                             break;
                         case 7://
                             sql = "";
@@ -290,7 +286,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 sql += "AND F_Notifications='" + ua.F_UserCode + "'";
                             if (ro.F_RoleCode == "QTJS")
                                 sql += "AND F_CreateUser=" + ua.F_UserCode;
-                            YJGD = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
+                            YJGD = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待处理
                             break;
                         case 8://
                             sql = "";
@@ -305,7 +301,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 sql += "AND F_Notifications='" + ua.F_UserCode + "'";
                             if (ro.F_RoleCode == "QTJS")
                                 sql += "AND F_CreateUser=" + ua.F_UserCode;
-                            EJGD = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
+                            EJGD = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待处理
                             break;
                         case 9://
                             sql = "";
@@ -319,7 +315,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 sql += "AND F_Notifications='" + ua.F_UserCode + "'";
                             if (ro.F_RoleCode == "QTJS")
                                 sql += "AND F_CreateUser=" + ua.F_UserCode;
-                            SJGD = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
+                            SJGD = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待处理
                             break;
                         case 10://
                             sql = "";
@@ -344,13 +340,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 CJSL = 0;
                                 break;
                             }
-                            CJSL = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//
+                            CJSL = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//
                             break;
                         case 11://咨询
                             sql = "";
                             sql += $"  F_IsDelete=0";
                             sql += "AND F_Duplicate !=5"  ;
-                            sql += " and (F_Type=" + 1 + "or ( F_Duplicate in(1)and F_Type!=2 ))";
+                            sql += " and (F_Type=" + 1 + "or ( F_Duplicate in(1)and F_Type!=2  and F_Type<5))";
                             sql += RetuSql(ro, 0, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                                 sql += "AND F_Notifications='" + ua.F_UserCode + "'";
@@ -359,7 +355,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 ZX = 0;
                                 break;
                             }
-                            ZX = new BLL.T_Bus_WorkOrder().GetModelList(sql).Count;//待处理
+                            ZX = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder where {sql} ").ToString());//待处理
                             break;
 
                     }
@@ -429,7 +425,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (state != 11)
                         {
-                            sql += $" and (F_Type=" + 2 + "or (F_Duplicate in(2,0)and F_Type=3))";
+                            sql += $" and (F_Type=" + 2 + "or (F_Duplicate!=1 and F_Duplicate!=4  and F_Typ=3 ) or F_Type>4)";
                         }
                     }
                       
@@ -646,7 +642,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 return Error("无操作权限");
                             break;
                         case 11:
-                            sql += $" and (F_Type=" + 1 + "or ( F_Duplicate in(1)and F_Type!=2 ))";
+                            sql += $" and (F_Type=" + 1 + "or ( F_Duplicate in(1)and F_Type!=2 ) and F_Type<5)";
                             sql += RetuSql(ro, see, ua);
                             if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
                                 sql += "AND F_DealUser=" + ua.F_UserCode;
@@ -843,7 +839,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string[] ccc = {
                    "工单编号","大区","办事处","投诉时间","序号","姓名","地址","联系电话","产品代码",
                   "产品名称","规格","生产日期","产品编码","生产厂家","问题代码","质量问题","通知人"
-                  ,"接听人" ,"落实情况","处理进度","工单类别","分派时间","接单时间","处理时间","备注"
+                  ,"接听人" ,"落实情况","处理进度","工单类别","产品类型","分派时间","接单时间","处理时间","备注"
             };
             return ccc;
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderInput.cs

@@ -402,5 +402,10 @@ namespace CallCenterApi.Interface.Models.Input
         /// 产品类型
         /// </summary>
         public string F_ProductTypes { set; get; }
+        /// <summary>
+        /// 投诉类型
+        /// </summary>
+        public string F_ComplaintType { set; get; }
+        
     }
 }

codegit/CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -604,11 +604,13 @@ namespace CallCenterApi.Model
        /// 产品类型
        /// </summary>
        public string F_ProductTypes { set; get; }
+        /// <summary>
+        /// 投诉类型
+        /// </summary>
+        public string F_ComplaintType { set; get; }
 
+    #endregion Model
 
-
-        #endregion Model
-
-    }
+}
 }