省市县带出业务员信息，微信客户反馈修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -188,7 +188,109 @@ namespace CallCenterApi.Interface.Controllers.customer
                 return Error("参数传输失败");
             }
         }
+        public class Sales
+        {
+            public string name;
+        }
+        public class Salesman
+        {
+            public string name;
+            public string phone;
+            public int  areaid;
+            public string area;
+            public int branchid;
+            public string branch;
+            public List<Salesmanproduct> product;
+        }
+        public class Salesmanproduct
+        {
+            public string product;
+        }
+        public ActionResult GetSalesman(string Salesman)
+        {
+            string sql = " F_IsDelete = 0 ";
 
+            if (!string.IsNullOrEmpty(Salesman))
+            {
+                sql += $" and  F_Salesman  = '" + Salesman.Trim() + "'";
+            }
+            var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(sql);
+            
+            Salesman salesmen = new Salesman();
+            salesmen.product  = new List<Salesmanproduct>();
+            foreach (var it in userModel)
+            {
+                 salesmen.name = it.F_Salesman;
+                if (string.IsNullOrEmpty (salesmen.phone))
+                {
+                    if (!string.IsNullOrEmpty(it.F_SalesPhone))
+                    {
+                        salesmen.phone = it.F_SalesPhone;
+                    }
+                }
+                if (string.IsNullOrEmpty(salesmen.area))
+                {
+                    if (!string.IsNullOrEmpty(it.F_AreaID))
+                    {
+                        var area = deptbll.GetModel(it.F_AreaID);
+                        if (area !=null )
+                        {
+                            salesmen.areaid = area.F_DeptId ;
+                            salesmen.area = area.F_DeptName;
+                        }
+                       
+                    }
+                }
+                if (string.IsNullOrEmpty(salesmen.branch))
+                {
+                    if (!string.IsNullOrEmpty(it.F_BranchID))
+                    {
+                        var branch = deptbll.GetModel(it.F_BranchID);
+                        if (branch != null)
+                        {
+                            salesmen.branchid = branch.F_DeptId;
+                            salesmen.branch = branch.F_DeptName;
+                        }
+                    }
+                }
+                if (salesmen.product.Exists(x => x.product == it.F_Product) == false && !string.IsNullOrEmpty(it.F_Product))
+                {
+                    Salesmanproduct model = new Salesmanproduct();
+                    model.product = it.F_Product;
+                    salesmen.product.Add(model);
+                }
+            }
+            return Success("获取成功", salesmen);
+        }
+        public ActionResult GetSales(string Province, string City, string Country)
+        {
+            string sql = " F_IsDelete = 0 ";
+
+            if (!string .IsNullOrEmpty (Province))
+            {
+                sql += $" and  F_AddressProvince  = '" + Province.Trim() + "'";
+            }
+            if (!string.IsNullOrEmpty(City))
+            {
+                sql += $" and  F_AddressCity  = '" + City.Trim() + "'";
+            }
+            if (!string.IsNullOrEmpty(Country))
+            {
+                sql += $" and  F_AddressCountry  = '" + Country.Trim() + "'"; ;
+            }
+                var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList( sql);
+                List<Sales> salesmen = new List<Sales>();
+                foreach (var  it  in userModel)
+                {
+                    if (salesmen.Exists(x => x.name == it.F_Salesman) == false&&!string .IsNullOrEmpty (it.F_Salesman))
+                    {
+                      Sales model = new Sales();
+                        model.name = it.F_Salesman;
+                        salesmen.Add(model);
+                    }
+                }
+                return Success("获取成功", salesmen);
+        }
         /// <summary>
         /// 通过来电号码获取来电弹屏左侧客户信息
         /// </summary>
@@ -197,7 +299,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         {
             if (!string.IsNullOrWhiteSpace(tel))
             {
-                var sql = $" and (F_SalesPhone like '%" + tel.Trim() + "%' or F_LegalPhone like '%" + tel.Trim() + "%')";
+                var sql = $" and  F_LegalPhone  = '" + tel.Trim() + "'";
                 var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
                 if (userModel.Count() > 0)
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

@@ -139,7 +139,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 drNew["九江"] = woBLL.GetModelList(sql + "and F_SalesBase='九江'" + nsg).Count.ToString(); ;
                 drNew["新疆"] = woBLL.GetModelList(sql + "and F_SalesBase='新疆' " + nsg).Count.ToString();
                 drNew["东北"] = woBLL.GetModelList(sql + "and F_SalesBase='东北'" + nsg).Count.ToString();
-                drNew["小计"] = woBLL.GetModelList(sql + nsg).Count.ToString();
+                drNew["合计"] = woBLL.GetModelList(sql + nsg).Count.ToString();
                 int a = woBLL.GetModelList(sql + "and F_DealType='当即办理'" + nsg).Count;
                 int b = woBLL.GetModelList(sql + nsg).Count;
                 if (b > 0)
@@ -1018,6 +1018,7 @@ namespace CallCenterApi.Interface.Controllers.report
             public int bevisit;
             public int visit;
             public int Overdue;
+            public int visitcont;
             public int satisfied;
             public int dissatisfied;
         }
@@ -1111,8 +1112,10 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
+            List<Returnvisit> returnvisits = new List<Returnvisit>();
+            Returnvisit model = new Returnvisit();
             var workordewr = woBLL.GetModelList(sql + "and F_State in(10,11) and F_IsVisit =1");
-          string name="客户回访"; int bevisit = 0, visit = 0, Overdue = 0, satisfied = 0, dissatisfied = 0;int visitcont = 0;
+            model. name ="客户回访"; int bevisit = 0, visit = 0, Overdue = 0, satisfied = 0, dissatisfied = 0;int visitcont = 0;
             var workorder = woBLL.GetModelList(sql + "and F_State in(10,11)");
             visitcont = workorder.Count;
             foreach (var it in workordewr)
@@ -1128,17 +1131,10 @@ namespace CallCenterApi.Interface.Controllers.report
                 if (it.F_VisitResult == "不满意")
                     dissatisfied++;
             }
-            var obj = new
-            {
-                name,
-                bevisit,
-                visit,
-                visitcont,
-                Overdue,
-                satisfied,
-                dissatisfied
-            };
-            return Success("获取成功", obj
+            model.bevisit = bevisit; model.visit = visit; model.visitcont = visitcont; model.Overdue = Overdue;
+            model.satisfied = satisfied; model.dissatisfied = dissatisfied;
+            returnvisits.Add(model);
+            return Success("获取成功", returnvisits
            );
 
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -537,9 +537,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 //  Model.T_Sys_UserAccount ua = userAccountBLL.GetModel(userId);
                 var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
-                if (ua == null)
+                if (source !=3)
                 {
-                    return Error("该账号已在别的设备登录，请及时修改密码重新登录。");
+                    if (ua == null)
+                    {
+                        return Error("该账号已在别的设备登录，请及时修改密码重新登录。");
+                    }
                 }
                 //  Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 string sql = $" and F_IsDelete=0";
@@ -1348,11 +1351,6 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             if (!string.IsNullOrEmpty(OpenId))
             {
-                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
-                if (ua == null)
-                {
-                    return Error("该账号已在别的设备登录，请及时修改密码重新登录。");
-                }
                 if (id <= 0)
                 {
                     return Error("请输入正确的id");
@@ -1364,8 +1362,18 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     list.Add(model);
                 var itemlasts = itembll.GetModelList("  F_WoID=" + +id + " ");
                 ; var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
-                FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
-
+                if (!string .IsNullOrEmpty (model.F_Files))
+                {
+                    FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
+                }
+                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
+                if (model .F_Source !="3")
+                {
+                    if (ua == null)
+                    {
+                        return Error("该账号已在别的设备登录，请及时修改密码重新登录。");
+                    }
+                }
                 if (list.Count > 0)
                 {
                     List<WorkOrderNewInput> Input = modeltooip(list,ua );