心连心短信，用户登录，首页工单信息，客户档案

codegit/CallCenterApi/CallCenterApi.BLL/UserAccount.cs

@@ -265,14 +265,15 @@ namespace CallCenterApi.BLL
                     {
                         model.F_WXNo = dt.Rows[n]["F_WXNo"].ToString();
                     }
-                    if (dt.Rows[n]["F_SeartGroupID"] != null && dt.Rows[n]["F_SeartGroupID"].ToString() != "")
+                    //if (dt.Rows[n]["F_SeartGroupID"] != null && dt.Rows[n]["F_SeartGroupID"].ToString() != "")
+                    //{
+                    //    model.F_SeartGroupID = int.Parse(dt.Rows[n]["F_SeartGroupID"].ToString());
+                    //}
+                    if (dt.Rows[n]["F_SeartGroupID"] != null)
                     {
-                        model.F_SeartGroupID = int.Parse(dt.Rows[n]["F_SeartGroupID"].ToString());
-                    }
-                    if (dt.Rows[n]["F_SeartGroup"] != null)
-                    {
-                        model.F_SeartGroup = dt.Rows[n]["F_SeartGroup"].ToString();
+                        model.F_SeartGroupID = dt.Rows[n]["F_SeartGroupID"].ToString();
                     }
+                 
                     if (dt.Rows[n]["RegionId"] != null && dt.Rows[n]["RegionId"].ToString() != "")
                     {
                         Model.T_Cus_RegionCategory modelRegion = new BLL.T_Cus_RegionCategory().GetModel(Convert.ToInt32(dt.Rows[n]["RegionId"].ToString()));

codegit/CallCenterApi/CallCenterApi.Cache/Models/CurrentUserInfo.cs

@@ -75,7 +75,7 @@ namespace CallCenterApi.Cache.Models
         /// <summary>
         /// 坐席组ID
         /// </summary>
-        public virtual int? F_SeartGroupID { get; set; }
+        public virtual string  F_SeartGroupID { get; set; }
 
         /// <summary>
         /// 坐席组

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -84,7 +84,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_WorkNumber", SqlDbType.VarChar,-1),
                     new SqlParameter("@F_DeptCode", SqlDbType.VarChar,50),
                     new SqlParameter("@F_WXNo", SqlDbType.NVarChar,50),
-                    new SqlParameter("@F_SeartGroupID", SqlDbType.Int,4),
+                    new SqlParameter("@F_SeartGroupID", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_SeartGroup", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_WxOpenId", SqlDbType.NVarChar,300),
                     new SqlParameter("@RegionId", SqlDbType.Int,4)};
@@ -203,7 +203,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_WorkNumber", SqlDbType.VarChar,-1),
                     new SqlParameter("@F_DeptCode", SqlDbType.VarChar,50),
                     new SqlParameter("@F_WXNo", SqlDbType.NVarChar,50),
-                    new SqlParameter("@F_SeartGroupID", SqlDbType.Int,4),
+                    new SqlParameter("@F_SeartGroupID",SqlDbType.NVarChar,100),
                     new SqlParameter("@F_SeartGroup", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_WxOpenId", SqlDbType.NVarChar,300),
                     new SqlParameter("@RegionId", SqlDbType.Int,4),
@@ -624,9 +624,13 @@ namespace CallCenterApi.DAL
                 {
                     model.F_WXNo = row["F_WXNo"].ToString();
                 }
-                if (row["F_SeartGroupID"] != null && row["F_SeartGroupID"].ToString() != "")
+                //if (row["F_SeartGroupID"] != null && row["F_SeartGroupID"].ToString() != "")
+                //{
+                //    model.F_SeartGroupID = int.Parse(row["F_SeartGroupID"].ToString());
+                //}
+                if (row["F_SeartGroupID"] != null)
                 {
-                    model.F_SeartGroupID = int.Parse(row["F_SeartGroupID"].ToString());
+                    model.F_SeartGroupID = row["F_SeartGroupID"].ToString();
                 }
                 if (row["F_SeartGroup"] != null)
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -228,56 +228,56 @@ namespace CallCenterApi.Interface.Controllers
                     Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
                     if (ua != null)
                     {
-                        //var date = DateTime.Now;//DateTime.Parse("2015-04-14"); //
-                        //string strDate = date.ToString("yyyy-MM-dd");
-                        //string strMonth = date.ToString("yyyy-MM");
-
-                        ////BLL.T_Wo_WorkOrderBase bll = new BLL.T_Wo_WorkOrderBase();
-                        ////var list1 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + strDate + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
-                        ////var list2 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + strDate + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
-                        ////var list3 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
-                        ////var list4 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
-                        ////部门信息
-                        //var modelDep = new BLL.T_Sys_Department().GetModel(deptid);
-                        //int depType = 0;
-                        //if (modelDep != null)
-                        //    depType = modelDep.F_Type ?? 0;  //部门操作权限：1接待部，2办理人员，3区域客服，4监管
-
-                        //string uwhere = " 1=1 ";
-                        //if (ua.F_RoleId != 17 && depType != 1 && depType != 3)
-                        //{
-                        //    uwhere += " and CreateUser='" + ua.F_UserCode + "' ";
-                        //}
+                        var date = DateTime.Now;//DateTime.Parse("2015-04-14"); //
+                        string strDate = date.ToString("yyyy-MM-dd");
+                        string strMonth = date.ToString("yyyy-MM");
+
+                        //BLL.T_Wo_WorkOrderBase bll = new BLL.T_Wo_WorkOrderBase();
+                        //var list1 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + strDate + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
+                        //var list2 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + strDate + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
+                        //var list3 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
+                        //var list4 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
+                        //部门信息
+                        var modelDep = new BLL.T_Sys_Department().GetModel(deptid);
+                        int depType = 0;
+                        if (modelDep != null)
+                            depType = modelDep.F_Type ?? 0;  //部门操作权限：1接待部，2办理人员，3区域客服，4监管
+
+                        string uwhere = " 1=1 ";
+                        if (ua.F_RoleId != 17 && depType != 1 && depType != 3)
+                        {
+                            uwhere += " and F_CreateBy='" + ua.F_UserCode + "' ";
+                        }
 
-                        //BLL.T_Wo_WorkOrder bll = new BLL.T_Wo_WorkOrder();
-                        //var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
-                        //var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State <" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
-                        //var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
-                        //var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State <" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
-                        //#region
-                        ////var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =2 and IsDel=0 ").Tables[0];
-                        ////var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State in (0,1) and IsDel=0 ").Tables[0];
-                        ////var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =2 and IsDel=0 ").Tables[0];
-                        ////var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State in (0,1) and IsDel=0 ").Tables[0];
-
-                        //////日已完成
-                        ////var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =1 and IsDel=0 ").Tables[0];
-                        //////日未完成
-                        ////var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State=0 and IsDel=0 ").Tables[0];
-                        //////月已完成
-                        ////var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =1 and IsDel=0 ").Tables[0];
-                        //////月未完成
-                        ////var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State=0 and IsDel=0 ").Tables[0];
-                        //#endregion
-                        //var obj = new
-                        //{
-                        //    daywc = list1.Rows.Count,
-                        //    daywwc = list2.Rows.Count,
-                        //    monwc = list3.Rows.Count,
-                        //    monwwc = list4.Rows.Count
-                        //};
-                        //res = Success("成功", obj);
-                        res = Success("成功");
+                        BLL.T_Wo_WorkOrder bll = new BLL.T_Wo_WorkOrder();
+                        var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateOn, 23)='" + strDate + "' and F_State in(" + (int)EnumWorkOrderState.finish +","+(int)EnumWorkOrderState.evaluate + ") and F_IsDelete=0 ").Tables[0];
+                        var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateOn, 23)='" + strDate + "' and F_State in (0,1,2,3,4,5,6,7,12,14,16) and F_IsDelete=0 ").Tables[0];
+                        var list3 = bll.GetList(uwhere + " and CONVERT(char(7),F_CreateOn,20)='" + strMonth + "' and F_State in(" + (int)EnumWorkOrderState.finish + "," + (int)EnumWorkOrderState.evaluate+ ") and F_IsDelete=0 ").Tables[0];
+                        var list4 = bll.GetList(uwhere + " and CONVERT(char(7),F_CreateOn,20)='" + strMonth + "' and F_State in (0,1,2,3,4,5,6,7,12,14,16) and F_IsDelete=0 ").Tables[0];
+                        #region
+                        //var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =2 and IsDel=0 ").Tables[0];
+                        //var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State in (0,1) and IsDel=0 ").Tables[0];
+                        //var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =2 and IsDel=0 ").Tables[0];
+                        //var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State in (0,1) and IsDel=0 ").Tables[0];
+
+                        ////日已完成
+                        //var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =1 and IsDel=0 ").Tables[0];
+                        ////日未完成
+                        //var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State=0 and IsDel=0 ").Tables[0];
+                        ////月已完成
+                        //var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =1 and IsDel=0 ").Tables[0];
+                        ////月未完成
+                        //var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State=0 and IsDel=0 ").Tables[0];
+                        #endregion
+                        var obj = new
+                        {
+                            daywc = list1.Rows.Count,
+                            daywwc = list2.Rows.Count,
+                            monwc = list3.Rows.Count,
+                            monwwc = list4.Rows.Count
+                        };
+                        res = Success("成功", obj);
+                     //   res = Success("成功");
                     }
                 }
             }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -17,26 +17,27 @@ namespace CallCenterApi.Interface.Controllers
         // 短信应用SDK AppKey
         string appkey = "2b2094bcaf2c841fdb50bcaebabf6f54";
         // 需要发送短信的手机号码
-        string[] phoneNumbers = { "17839539537" };
-        // 短信模板ID，需要在短信应用中申请
         int templateId = 392016; // NOTE: 这里的模板ID`7839`只是一个示例，真实的模板ID需要在短信控制台中申请
         // 签名
         string smsSign = "河南心连心客服"; // NOTE: 这里的签名只是示例，请使用真实的已申请的签名, 签名参数使用的是`签名内容`，而不是`签名ID`
         #endregion
-        public ActionResult SMSSend()
+        public ActionResult SMSSend(string name,string phone,string cusphone)
         {
 
-            SmsSingleSenderResult result = SMSSingleshot(phoneNumbers[0], "为更好的为你提供服务，请你对我们的服务进行评价，满意请按1，一般请按2，不满意请按3.");
+            SmsSingleSenderResult result = SMSSingleshot(cusphone, "您好，感谢你的致电反馈，稍后会安排业务经理和你联系，请你保持电话畅通。业务经理姓名："+ name+"，电话："+ phone+"。");
+            
             if (result != null)
             {
+               
 
-                return Success("短信测试", result);
+                return Success("发送短信", result);
             }
             else
             {
-                return null;
+                return Error ("发送失败，请检查客户电话");
             }
         }
+      
         /// <summary>
         /// 单发短信
         /// </summary>
@@ -47,7 +48,7 @@ namespace CallCenterApi.Interface.Controllers
             try
             {
                 SmsSingleSender ssender = new SmsSingleSender(appid, appkey);
-                var result = ssender.send(0, "86", phoneNumbers[0],
+                var result = ssender.send(0, "86", phone,
                  cont, "", "");
                 Console.WriteLine(result);
                 return result;
@@ -164,7 +165,7 @@ namespace CallCenterApi.Interface.Controllers
         {
             try
             {
-                
+               
                 SmsStatusPuller spuller = new SmsStatusPuller(appid, appkey);
                 // 拉取短信回执
                 var callbackResult = spuller.pullCallback(maxNum);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -264,10 +264,12 @@ namespace CallCenterApi.Interface.Controllers
                     }
                     else
                     {
-                      userAccountModel.F_UserCode = Getcode().ToString ();
+                        userAccountModel.F_UserCode = Getcode().ToString();
                         userAccountModel.F_WorkNumber = ucode;
                     }
+                   
                 }
+             
                 if (input.Username != null)
                     userAccountModel.F_UserName = input.Username.Trim();
                 if (input.Password != null)
@@ -307,7 +309,7 @@ namespace CallCenterApi.Interface.Controllers
                 //if (input.SeartGroupID != 0)
                 if (input.GroupId != 0)
                 {
-                    userAccountModel.F_SeartGroupID = input.GroupId;
+                    userAccountModel.F_SeartGroupID = input.GroupId.ToString ();
                     Model.T_Sys_SeatGroup sm = new BLL.T_Sys_SeatGroup().GetModel(input.GroupId);
                     if (sm != null)
                     {
@@ -320,7 +322,7 @@ namespace CallCenterApi.Interface.Controllers
                     //话务人员限制权限判断
                     if (sys.IsValidSeatPermission(""))
                     {
-                        var model = sysUserAccountBll.GetModel(int.Parse(input.Usercode));
+                        var model = sysUserAccountBll.GetModel(int.Parse(userAccountModel.F_UserCode));
                         if (model != null)
                             return Error("当前员工工号存在，请更换！");
                         if (sysUserAccountBll.Add(userAccountModel) > 0)
@@ -405,7 +407,7 @@ namespace CallCenterApi.Interface.Controllers
                 //if (input.SeartGroupID != 0)
                 if (input.GroupId != 0)
                 {
-                    userAccountModel.F_SeartGroupID = input.GroupId;
+                    userAccountModel.F_SeartGroupID = input.GroupId.ToString ();
                     Model.T_Sys_SeatGroup sm = new BLL.T_Sys_SeatGroup().GetModel(input.GroupId);
                     if (sm != null)
                     {

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

@@ -376,21 +376,22 @@ namespace CallCenterApi.Interface.Controllers.customer
                         Input1.F_CompanyName = model[i].F_CompanyName;
                     Input1.F_AreaID = model[i].F_AreaID;//大区ID
                     Input1.F_BranchID = model[i].F_BranchID;//分公司ID
+
                     if (!string.IsNullOrEmpty(model[i].F_AreaID))
                     {
-                        Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(model[i].F_AreaID));
-                        if (pdModel != null)
-                        {
-                            Input1.F_AreaName = pdModel.F_DeptName.ToString();
-                        }
+                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(int.Parse(model[i].F_AreaID));
+                            if (pdModel != null)
+                            {
+                                Input1.F_AreaName = pdModel.F_DeptName.ToString();
+                            }
                     }
                     if (!string.IsNullOrEmpty(model[i].F_BranchID))
                     {
-                        Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(model[i].F_BranchID));
-                        if (pdModel1 != null)
-                        {
-                            Input1.F_BranchName = pdModel1.F_DeptName.ToString();
-                        }
+                           Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(int.Parse(model[i].F_BranchID));
+                            if (pdModel1 != null)
+                            {
+                                Input1.F_BranchName = pdModel1.F_DeptName.ToString();
+                            }
                     }
                     if (!string.IsNullOrEmpty(model[i].F_Gender))
                     {
@@ -450,8 +451,31 @@ namespace CallCenterApi.Interface.Controllers.customer
             if (!string.IsNullOrWhiteSpace(input.F_CompanyName))
                 model.F_CompanyName = input.F_CompanyName;
             #region 基本字段
-            model.F_AreaID = input.F_AreaID;//大区ID
-            model.F_BranchID = input.F_BranchID;//分公司ID
+            try
+            {
+                model.F_AreaID = int .Parse (input.F_AreaID).ToString ();//大区ID
+                model.F_BranchID = int .Parse (input.F_BranchID).ToString ();//分公司ID
+            }
+            catch
+            {
+                if (!string .IsNullOrEmpty (input.F_AreaID))
+                {
+                    Model.T_Sys_Department pdModel = departmentBLL.GetModel(input.F_AreaID);
+                    if (pdModel != null)
+                    {
+                        model.F_AreaID = pdModel.F_DeptId .ToString();
+                    }
+                }
+                if (!string .IsNullOrEmpty (input.F_BranchID))
+                {
+                    Model.T_Sys_Department pdModel = departmentBLL.GetModel(input.F_BranchID);
+                    if (pdModel != null)
+                    {
+                        model.F_BranchID = pdModel.F_DeptId.ToString();
+                    }
+                }
+            }
+           
             model.F_Gender = input.F_Gender;//分公司ID
             model.F_Salesman = input.F_Salesman;//业务员
             model.F_SalesPhone = input.F_SalesPhone;//业务员电话

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

@@ -21,7 +21,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// 获取省市县乡镇
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetAllList(int F_Layer, string F_RegionName = "")
+        public ActionResult GetAllList(int F_Layer, string F_RegionName = "",string  keywords="")
         {
             int F_RegionId = 0;
             if (F_RegionName!= "")
@@ -48,6 +48,27 @@ namespace CallCenterApi.Interface.Controllers.customer
             }
         }
         /// <summary>
+        /// 获取省市县乡镇
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetKeywordsList(int F_Layer, string keywords = "")
+        {
+            int F_RegionId = 0;
+            if (keywords != "")
+            {
+             List <   Model.T_RegionCategory> userModel = regionBLL.GetModelList("and F_CusPhone like '%" + keywords.Trim());
+                if (userModel != null)
+                {
+                    return Success("加载成功", userModel);
+                }
+                else
+                {
+                    return Success("获取失败，内容为空");
+                }
+            }
+            return Success("获取失败，内容为空");
+        }
+        /// <summary>
         /// 导入excel
         /// </summary>
         /// <returns></returns>

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

@@ -10,6 +10,7 @@ using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Mvc;
 
+
 namespace CallCenterApi.Interface.Controllers.report
 {
     public class WOReportController : BaseController
@@ -929,7 +930,7 @@ namespace CallCenterApi.Interface.Controllers.report
             public int Unsatisfactory;//不满意
             public int Total;
         }
-  
+       
         /// <summary>
         /// 市场反馈一览表
         /// </summary>
@@ -1050,6 +1051,145 @@ namespace CallCenterApi.Interface.Controllers.report
 
                 return Content(obj.ToJson()); ;
         }
+
+        /// <summary>
+        /// 渠道数量对比表
+        /// </summary>
+        /// <param name="stime"></param>
+        /// <param name="endtime"></param>
+        /// <returns></returns>
+        public ActionResult GetChanelList(string stime, string endtime)
+        {
+            string sql = $" and F_IsDelete=0";
+            DataTable dt = new DataTable();
+            #region 筛选条件
+            if (stime != null && stime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+            }
+            if (endtime != null && endtime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
+            }
+            #endregion
+            List<string> channelname = new List<string>();
+            channelname.Add("总经销");
+            channelname.Add("二级商");
+            channelname.Add("种田大户");
+            channelname.Add("公司员工");
+            channelname.Add("农户");
+            channelname.Add("化工客户");
+            channelname.Add("其他");
+            int Distribution = 0, Quotient=0, Bigfarmer = 0, Companystaf = 0, Peasant = 0, Customers = 0, Other = 0;
+            for (int i=0;i < channelname.Count;i++)
+            {
+                string msg = "'" +channelname[i] + "'";
+                var modellist = woBLL.GetModelList(" F_CustomerID in (" + GetCustomer(msg) + ")" + sql + "and F_Type in (2,3)");
+                var modellis = woBLL.GetModelList(" F_CusPhone in (" + GetCustomerrel(msg) + ")" + sql + "and F_Type in (1,4)");
+                switch (i )
+                {
+                    case 0:
+                        Distribution = modellist.Count + modellis.Count;//总经销
+                        break;
+                    case 1:
+                        Quotient = modellist.Count + modellis.Count;//二级商
+                        break;
+                    case 2:
+                        Bigfarmer = modellist.Count + modellis.Count;//种田大户
+                        break;
+                    case 3:
+                        Companystaf = modellist.Count + modellis.Count;//公司员工
+                        break;
+                    case 4:
+                        Peasant = modellist.Count + modellis.Count;//农户
+                        break;
+                    case 5:
+                        Customers = modellist.Count + modellis.Count;//化工客户
+                        break;
+                    case 6:
+                        Other = modellist.Count + modellis.Count;//其他
+                        break;
+                }
+                     
+            }
+
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                rows=new
+                {
+                    Distribution,
+                    Quotient,
+                    Bigfarmer,
+                    Companystaf,
+                    Peasant,
+                    Customers,
+                    Other,
+                }
+                ,
+                total =6
+            };
+
+            return Content(obj.ToJson()); ;
+
+
+        }
+        BLL.T_Sys_DictionaryValue dicvalueBll = new BLL.T_Sys_DictionaryValue();
+        public class Brand
+        {
+            public string name;
+            public int number;
+        }
+        /// <summary>
+        /// 产品品牌对照表
+        /// </summary>
+        /// <param name="stime"></param>
+        /// <param name="endtime"></param>
+        /// <returns></returns>
+        public ActionResult GetbrandList(string stime, string endtime)
+        {
+            string sql = $" and F_IsDelete=0";
+            DataTable dt = new DataTable();
+            #region 筛选条件
+            if (stime != null && stime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+            }
+            if (endtime != null && endtime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
+            }
+            #endregion
+            var dicv = dicvalueBll.GetList(" F_DictionaryFlag='" + "ZXCPMC" + "' and F_State=1 ").Tables[0];
+            List<Brand> list = new List<Brand>();
+            List<Model.T_Sys_DictionaryValue> dicval = new List<Model.T_Sys_DictionaryValue>();
+            if (dicv !=null )
+            {
+                dicval = dicvalueBll.DataTableToList(dicv);
+            }
+            if (dicval !=null&& dicval.Count >0)
+            {
+                foreach (var it in dicval)
+                {
+                    var modellist = woBLL.GetModelList(" F_TS_Category in ('" + it.F_Name  + "')" + sql );
+                    Brand brand = new Brand();
+                    brand.name = it.F_Name;
+                    brand.number  = modellist.Count;
+                    list.Add(brand);
+
+                }
+            }
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                rows = list
+                 ,
+                total = list.Count ,
+           };
+            return Content(obj.ToJson()); ;
+        }
         public class QuestionType
         {
             public string F_QuestionType;
@@ -1246,9 +1386,12 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 else
                 {
-                    changel = "'农户','化工客户'";
+                    changel = "'农户','化工客户','其他'";
                 }
-                var modellist= woBLL.GetModelList(" F_CustomerID in (" + GetCustomer(changel) + ")" + sql);
+                string msg = "";
+               
+                var modellist= woBLL.GetModelList(" F_CustomerID in (" + GetCustomer(changel) + ")" + sql+ "and F_Type in (2,3)");
+                var modellis = woBLL.GetModelList(" F_CusPhone in (" + GetCustomerrel(changel) + ")" + sql + "and F_Type in (1,4)");
                 int phone = 0, Chat = 0, diate=0, Trans=0, Satis=0, Unsatis= 0,Verysatisfied=0, Commonly=0;
                 foreach (var it in modellist)
                 {
@@ -1269,6 +1412,25 @@ namespace CallCenterApi.Interface.Controllers.report
                     if ( it.F_VisitResult == "不满意")
                         Unsatis++;
                 }
+                foreach (var it in modellis)
+                {
+                    if (it.F_Source == "1")
+                        phone++;
+                    if (it.F_Source == "2" || it.F_Source == "3")
+                        Chat++;
+                    if (it.F_DealType == "当即办理")
+                        diate++;
+                    if (it.F_DealType == "电话转接")
+                        Trans++;
+                    if (it.F_VisitResult == "非常满意")
+                        Verysatisfied++;
+                    if (it.F_VisitResult == "满意")
+                        Satis++;
+                    if (it.F_VisitResult == "一般")
+                        Commonly++;
+                    if (it.F_VisitResult == "不满意")
+                        Unsatis++;
+                }
                 model.Telephone = phone;
                 model.WeChat = Chat;
                 model.Immediate = diate;
@@ -1363,6 +1525,12 @@ namespace CallCenterApi.Interface.Controllers.report
             str = "select F_CustomerCode from T_Cus_CustomerBaseNew where F_IsDelete=0" + " and F_Channel in(" + msg+")";
             return str;
         }
+        public string GetCustomerrel(string msg)
+        {
+            string str = "";
+            str = "select F_LegalPhone from T_Cus_CustomerBaseNew where F_IsDelete=0" + " and F_Channel in(" + msg + ")";
+            return str;
+        }
         private string ChannelType(string msg)
         {
             string mag = "";

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

@@ -824,7 +824,7 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                int? groid = CurrentUser.UserData.F_SeartGroupID;
+                int? groid =int .Parse ( CurrentUser.UserData.F_SeartGroupID);
                 //string groname = CurrentUser.UserData.F_SeartGroup;
                 string groname = "", grocode = "";
                 string depname = "";

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

@@ -4098,7 +4098,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             else
             {
                 model.F_WorkOrderCode = model.F_WorkOrderCode;//工单编号
-                model.F_Source = model.F_Source.ToString();//工单来源
+                model.F_Source = input .F_Source.ToString();//工单来源
             }
                 #region 基本字段
                 if (type == 2)
@@ -5294,7 +5294,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     if (!string.IsNullOrEmpty(model.F_CusPhone.Trim () ))
                     {
-                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(model.F_CusPhone.Trim (), smscont);
+                        SmsSingleSenderResult result = new SMSController().SMSSingleshot(model.F_CusPhone.Trim(), smscont);
                         if (result !=null )
                         {
                             sid = result.sid.Trim ();
@@ -5689,9 +5689,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     tousername = clus.F_UserName + "(" + touser + ")";
                     if (sms != 0)
                     {
-                        if (!string .IsNullOrEmpty (clus.F_Mobile))
+                        if (!string .IsNullOrEmpty (clus.F_Mobile.Trim ()))
                         {
-                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(clus.F_Mobile.Trim (), smscont);
+                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(clus.F_Mobile.Trim(), smscont);
                         }
                         
                     }
@@ -5719,7 +5719,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (!string.IsNullOrEmpty(l.F_Mobile.Trim ()))
                         {
-                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(l.F_Mobile.Trim (), smscont);
+                            SmsSingleSenderResult result = new SMSController().SMSSingleshot(l.F_Mobile.Trim(), smscont);
                         }
 
                     }

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_UserAccount.cs

@@ -45,7 +45,7 @@ namespace CallCenterApi.Model
         private string _f_worknumber;
         private string _f_deptcode;
         private string _f_wxno;
-        private int?   _f_seartgroupid;
+        private string   _f_seartgroupid;
         private string _f_seartgroup;
         private int _regionid;
         private string _f_wxopenid;
@@ -293,7 +293,7 @@ namespace CallCenterApi.Model
         /// <summary>
 		/// 坐席组ID
 		/// </summary>
-		public int?   F_SeartGroupID
+		public string    F_SeartGroupID
         {
             set { _f_seartgroupid = value; }
             get { return _f_seartgroupid; }

codegit/CallCenterApi/CallCenterApi.Model/UserAccount.cs

@@ -47,7 +47,7 @@ namespace CallCenterApi.Model
         private string _f_deptname;
         private string _f_worknumber;
         private string _f_wxno;
-        private int? _f_seartgroupid;
+        private string  _f_seartgroupid;
         private string _f_seartgroup;
         private string _f_regionname;
         /// <summary>
@@ -310,7 +310,7 @@ namespace CallCenterApi.Model
         /// <summary>
 		/// 坐席组ID
 		/// </summary>
-		public int? F_SeartGroupID
+		public string  F_SeartGroupID
         {
             set { _f_seartgroupid = value; }
             get { return _f_seartgroupid; }