一键转接和三方通话修改

codegit/CallCenterApi/CallCenterApi.DAL/T_Con_Conversation.cs

@@ -164,13 +164,13 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Type = int.Parse(row["F_Type"].ToString());
                 }
-                if (row["F_Department"] != null)
+                if (row["F_Department"] != null && row["F_Department"].ToString() != "")
                 {
-                    model.F_Department = row["F_Department"].ToString();
+                    model.F_Department = int.Parse(row["F_Department"].ToString());
                 }
-                if (row["F_Section"] != null)
+                if (row["F_Section"] != null && row["F_Section"].ToString() != "")
                 {
-                    model.F_Section = row["F_Section"].ToString();
+                    model.F_Section = int.Parse(row["F_Section"].ToString());
                 }
                 if (row["F_Telephone"] != null)
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/ConversationController.cs

@@ -21,6 +21,7 @@ namespace CallCenterApi.Interface.Controllers
     public class ConversationController : BaseController
     {
         BLL.T_Con_Conversation bll = new BLL.T_Con_Conversation();
+        BLL.T_Sys_Department bll_Dep = new BLL.T_Sys_Department();
         /// <summary>
         /// 获取内外线列表
         /// </summary>
@@ -36,11 +37,11 @@ namespace CallCenterApi.Interface.Controllers
                 string keyword = RequestString.GetQueryString("keyword");
                 //电话
                 string strtel = RequestString.GetQueryString("tel");
-                ////部门
-               string department = RequestString.GetQueryString("department");
-                ////科室
-                string section = RequestString.GetQueryString("section");
-                ////医师
+                //部门id
+                int department = RequestString.GetInt("department", 0);
+                //科室id
+                int section = RequestString.GetInt("section", 0);
+                //医师
                 string physician = RequestString.GetQueryString("physician");
                 string stringtype = RequestString.GetQueryString("type");
                 int type = 0;
@@ -51,23 +52,23 @@ namespace CallCenterApi.Interface.Controllers
 
                 if (keyword.Trim() != "" && keyword != "undefined")
                 {
-                    sql += $"  and (F_Telephone like '%" + keyword.Trim() + "%' or F_Department like '%" + keyword.Trim() + "%'or F_Section like '%" + keyword.Trim() + "%'  or F_Physician like '%" + keyword.Trim() + "%' or F_Title like '%" + keyword.Trim() + "%') ";
+                    sql += $" and (F_Telephone like '%" + keyword.Trim() + "%' or F_Physician like '%" + keyword.Trim() + "%' or F_Title like '%" + keyword.Trim() + "%') ";
                 }
                 if (strtel.Trim() != "" && strtel != "undefined")
                 {
-                    sql += "and  F_Telephone=" + strtel;
+                    sql += " and F_Telephone=" + strtel;
                 }
-                if (department.Trim() != "" && department != "undefined")
+                if (department > 0)
                 {
-                    sql += "and  F_Department=" + department;
+                    sql += " and F_Department=" + department;
                 }
-                if (section.Trim() != "" && section != "undefined")
+                if (section > 0)
                 {
-                    sql += "and  F_Section=" + section;
+                    sql += " and F_Section=" + section;
                 }
                 if (physician.Trim() != "" && physician != "undefined")
                 {
-                    sql += "and  F_Physician=" + physician;
+                    sql += " and F_Physician=" + physician;
                 }
                 if (strpageindex.Trim() != "")
                 {
@@ -80,25 +81,25 @@ namespace CallCenterApi.Interface.Controllers
                 if (stringtype .Trim() != "")
                 {
                     type  = Convert.ToInt32(stringtype);
-                    sql += "and  F_Type=" + type;
+                    sql += " and F_Type=" + type;
                 }
                 int recordCount = 0;
                 dt = BLL.PagerBLL.GetListPager(
                         "T_Con_Conversation",
                         "T_Con_Conversation.ID",
-                        "*",
+                        "*,(SELECT F_DeptName FROM dbo.T_Sys_Department WHERE F_DeptId = dbo.T_Con_Conversation.F_Department) AS Department_Name,(SELECT F_DeptName FROM dbo.T_Sys_Department WHERE F_DeptId = dbo.T_Con_Conversation.F_Section) AS Section_Name ",
                         sql,
                        "ORDER BY T_Con_Conversation.ID desc",
                         pagesize,
                         pageindex,
                         true,
                         out recordCount);
-                List<Model.T_Con_Conversation> modlelist = new BLL.T_Con_Conversation().DataTableToList(dt);
+                //List<Model.T_Con_Conversation> modlelist = new BLL.T_Con_Conversation().DataTableToList(dt);
                 var obj = new
                 {
                     state = "success",
                     message = "成功",
-                    rows = modlelist,
+                    rows = dt,
                     total = recordCount
                 };
                 res = Content(obj.ToJson());
@@ -142,8 +143,8 @@ namespace CallCenterApi.Interface.Controllers
         {
             public int ID { get; set; }
             public int  F_Type { get; set; }// 1内线2外线
-            public string F_Department { get; set; }// 部门
-            public string F_Section { get; set; }//科室
+            public int F_Department { get; set; }// 部门
+            public int F_Section { get; set; }//科室
             public string F_Telephone { get; set; }//电话
             public string F_Physician { get; set; }//医师
             public string F_Title { get; set; }//职称
@@ -168,6 +169,13 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult Add(Conversation input)
         {
+            #region 获取部门id by 科室id
+            var model_Dep = new Model.T_Sys_Department();
+            int dep_Sectionid = input.F_Section;
+            if (dep_Sectionid > 0)
+                model_Dep = bll_Dep.GetModel(dep_Sectionid);
+            #endregion
+
             #region 添加验证判断
             if (string.IsNullOrEmpty(input.F_Telephone))
                 return Error("电话不能为空！");
@@ -178,8 +186,8 @@ namespace CallCenterApi.Interface.Controllers
             #endregion
             var model = new Model.T_Con_Conversation();
             model.F_Type = input.F_Type;    //1内线2外线
-            model.F_Department = input.F_Department;    //部门
-            model.F_Section = input.F_Section;    // 科室
+            model.F_Department = model_Dep != null ? model_Dep.F_ParentId : input.F_Department;    //部门id
+            model.F_Section = input.F_Section;    // 科室id
             model.F_Telephone = input.F_Telephone;  // 电话
             model.F_Physician = input.F_Physician;      //医师
             model.F_Title = input.F_Title;//职称
@@ -198,6 +206,13 @@ namespace CallCenterApi.Interface.Controllers
         {
             int userId = CurrentUser.UserData.F_UserId;
 
+            #region 获取部门id by 科室id
+            var model_Dep = new Model.T_Sys_Department();
+            int dep_Sectionid = input.F_Section;
+            if(dep_Sectionid > 0)
+                model_Dep = bll_Dep.GetModel(dep_Sectionid);
+            #endregion
+
             #region 添加验证判断
             if (input.ID <= 0)
                 return Error("参数错误！");
@@ -206,10 +221,10 @@ namespace CallCenterApi.Interface.Controllers
             if (input.F_Type <= 0)
                 return Error("请选择电话类别");
             #endregion
-            var model = bll.GetModel(input.ID );
+            var model = bll.GetModel(input.ID);
             model.F_Type = input.F_Type;    //1内线2外线
-            model.F_Department = input.F_Department;    //部门
-            model.F_Section = input.F_Section;    // 科室
+            model.F_Department = model_Dep != null ? model_Dep.F_ParentId : input.F_Department;    //部门id
+            model.F_Section = input.F_Section;    // 科室id
             model.F_Telephone = input.F_Telephone;  // 电话
             model.F_Physician = input.F_Physician;      //医师
             model.F_Title = input.F_Title;//职称
@@ -320,6 +335,9 @@ namespace CallCenterApi.Interface.Controllers
                         dModel.F_IsDelete  = 0;
                         dModel.F_FileId = fid;
                         dModel.F_Type  = type ;
+
+                        //获取之前所有客户档案信息
+                        var list_Dep = bll_Dep.DataTableToList(bll_Dep.GetList(" 1=1 and F_DeleteFlag = 0 ").Tables[0]).ToList();
                         foreach (DataRow dr in dt.Rows)
                         {
                           
@@ -329,8 +347,10 @@ namespace CallCenterApi.Interface.Controllers
                             {
                                 if (!getunphone(0, dr["电话"].ToString()))
                                 {
-                                    dModel.F_Department = dr["部门"].ToString();
-                                    dModel.F_Section = dr["科室"].ToString();
+                                    var model_Dept = list_Dep.SingleOrDefault(x => x.F_DeptName.Equals(dr["部门"].ToString()));
+                                    var model_Sec = list_Dep.SingleOrDefault(x => x.F_DeptName.Equals(dr["科室"].ToString()));
+                                    dModel.F_Department = model_Dept != null ? model_Dept.F_DeptId : 0;     //dr["部门"].ToString();
+                                    dModel.F_Section = model_Sec != null ? model_Sec.F_DeptId : 0;    //dr["科室"].ToString();
                                     dModel.F_Telephone = dr["电话"].ToString();
 
                                     if (type == 2)

codegit/CallCenterApi/CallCenterApi.Model/T_Con_Conversation.cs

@@ -13,8 +13,8 @@ namespace CallCenterApi.Model
         #region Model
         private long? _id;
         private int? _f_type;
-        private string _f_department;
-        private string _f_section;
+        private int _f_department = 0;
+        private int _f_section = 0;
         private string _f_telephone;
         private string _f_physician;
         private string _f_title;
@@ -37,17 +37,17 @@ namespace CallCenterApi.Model
             get { return _f_type; }
         }
         /// <summary>
-        /// 部门
+        /// 部门id
         /// </summary>
-        public string F_Department
+        public int F_Department
         {
             set { _f_department = value; }
             get { return _f_department; }
         }
         /// <summary>
-        /// 科室
+        /// 科室id
         /// </summary>
-        public string F_Section
+        public int F_Section
         {
             set { _f_section = value; }
             get { return _f_section; }