Merge branch 'master' of http://192.168.1.222:3000/lihai/XiXianDC_ZhuBiao_API

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_Department.cs

@@ -66,6 +66,15 @@ namespace CallCenterApi.BLL
         }
 
         /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_Department GetModel(string F_DeptName)
+        {
+
+            return dal.GetModel(F_DeptName);
+        }
+
+        /// <summary>
         /// 获得数据列表
         /// </summary>
         public DataSet GetList(string strWhere)

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_UserAccount.cs

@@ -88,6 +88,14 @@ namespace CallCenterApi.BLL
         {
             return dal.GetModel(F_UserCode);
         }
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_UserAccount GetModelByName(string F_UserName)
+        {
+            return dal.GetModel(F_UserName);
+        }
         /// <summary>
         /// 根据Openid 获取用户
         /// </summary>

codegit/CallCenterApi/CallCenterApi.BLL/T_Wo_WorkOrder.cs

@@ -146,15 +146,7 @@ namespace CallCenterApi.BLL
 
         #endregion  BasicMethod
         #region  ExtensionMethod
-
-        /// <summary>
-        /// 处理工单
-        /// </summary>
-        public int DealWorkOrder(string strorderid,int isend,string strcont,int jsbm,string jsgh,string clgh
-            ,int isaudit, string infotype, int infotypeid, int unitid, string unit)
-        {
-            return dal.DealWorkOrder(strorderid, isend, strcont, jsbm, jsgh, clgh, isaudit, infotype,infotypeid,unitid,unit);
-        }
+            
         /// <summary>
         /// 处理工单
         /// </summary>

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_Department.cs

@@ -224,6 +224,32 @@ namespace CallCenterApi.DAL
                 return null;
             }
         }
+        
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_Department GetModel(string F_DeptName)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select TOP 1 F_DeptId,F_DeptCode,(SELECT B.F_DeptName FROM T_Sys_Department B WHERE B.F_DeptId=A.F_ParentId) AS F_ParentName,F_ParentId,F_ParentCode,F_DeptName,F_State,F_Layer,F_Type,F_Sort,F_Remark,F_Telephone,F_Mobile,F_OtherPhone,F_Email,F_Header from T_Sys_Department  A");
+            strSql.Append(" where F_DeptName=@F_DeptName");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_DeptName", SqlDbType.VarChar,50)
+            };
+            parameters[0].Value = F_DeptName;
+
+            Model.T_Sys_Department model = new Model.T_Sys_Department();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
 
 
         /// <summary>

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -367,6 +367,32 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
+        public Model.T_Sys_UserAccount GetModelByName(string F_UserName)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 * from T_Sys_UserAccount ");
+            strSql.Append(" where F_UserName=@F_UserName");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_UserName", SqlDbType.VarChar,50)
+            };
+            parameters[0].Value = F_UserName;
+
+            Model.T_Sys_UserAccount model = new Model.T_Sys_UserAccount();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
         public Model.T_Sys_UserAccount GetModel(int F_UserId)
         {
 

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

@@ -984,12 +984,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
 
                             #region 获取处理人工号 20180514 郑兵兵 无需走流程，所以注释
-                            //string clgh = string.Empty;
-                            //if (clbm != 0)
+                            //int depid = 0; //部门id
+                            ////string clgh = string.Empty;
+                            //if (!string.IsNullOrEmpty(clbm))   //if (clbm != 0)
                             //{
-                            //    if (clid != 0)
+                            //    var model_Dep = new BLL.T_Sys_Department().GetModel(clbm);
+                            //    depid = model_Dep != null ? model_Dep.F_DeptId : 0;
+                            //    if (!string.IsNullOrEmpty(clgh))  //if (clid != 0)
                             //    {
-                            //        Model.T_Sys_UserAccount clus = new BLL.T_Sys_UserAccount().GetModel(clid);
+                            //        //Model.T_Sys_UserAccount clus = new BLL.T_Sys_UserAccount().GetModel(clid);
+                            //        Model.T_Sys_UserAccount clus = new BLL.T_Sys_UserAccount().GetModelByName(clgh);
                             //        if (clus != null)
                             //        {
                             //            clgh = clus.F_UserCode;
@@ -998,7 +1002,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //    else
                             //    {
                             //        string users = string.Empty;
-                            //        var list = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId='" + clbm + "'");
+                            //        //var list = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId='" + clbm + "'");
+                            //        var list = new BLL.T_Sys_UserAccount().GetModelList(" dbo.GetDeptName(F_DeptId)='" + clbm + "'");
                             //        foreach (var l in list)
                             //        {
                             //            if (string.IsNullOrEmpty(users))
@@ -1070,11 +1075,69 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                             var rerere = new BLL.T_Wo_WorkOrder().Update(model);
                             #region 无需走流程
+                            var item = new Model.T_Wo_WorkOrderItem();
+                            #region 获取接收人
+                            int depid = 0; //部门id
+                            var model_Dep = new BLL.T_Sys_Department().GetModel(clbm);
+                            depid = model_Dep != null ? model_Dep.F_DeptId : 0;
+                            if (!string.IsNullOrEmpty(clgh))  //if (clid != 0)
+                            {
+                                //Model.T_Sys_UserAccount clus = new BLL.T_Sys_UserAccount().GetModel(clid);
+                                Model.T_Sys_UserAccount clus = new BLL.T_Sys_UserAccount().GetModelByName(clgh);
+                                if (clus != null)
+                                {
+                                    item.ToUser = clus.F_UserCode;
+                                }
+                            }
+                            else
+                            {
+                                string users = string.Empty;
+                                var list = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId='" + clbm + "'");
+                                foreach (var l in list)
+                                {
+                                    if (string.IsNullOrEmpty(users))
+                                    {
+                                        users = l.F_UserCode;
+                                    }
+                                    else
+                                    {
+                                        users = users + "," + l.F_UserCode;
+                                    }
+                                }
+                                item.ToUser = users;
+                            }
+                            #endregion
+                            item.WorkOrderID = orderid;
+                            item.Type = 1;      //处理
+                            item.ToDept = depid; //部门clbm
+                            //item.ToUser = clus != null ? clus.F_UserCode : "";  //接收人
+                            item.Detail = cont;
+                            item.IsDel = 0;
+                            //转派
+                            if (isend == 0)
+                            {
+                                item.State = 0;
+                                item.IsLast = 0;
+                            }
+                            else
+                            {
+                                item.State = 2;
+                                item.IsLast = 1;
+                                item.DealUser = ua.F_UserCode;
+                                item.DealTime = DateTime.Now;
+                            }
+                            item.IsStart = 0;
+                            item.IsTimeOut = 0;
+                            item.CreateUser = ua.F_UserCode;
+                            item.CreateTime = DateTime.Now;
+                            long itemid = new BLL.T_Wo_WorkOrderItem().Add(item);
+
+
                             //int n = new BLL.T_Wo_WorkOrder().DealWorkOrder1(orderid, isend
                             //    , model.Customer, model.CustomerTel, inqtimes, model.Inquser
                             //    , model.County, model.Address, model.Detail, model.Clcontent, model.Answer, model.Remark
-                            //    , clbm, clgh, ua.F_UserCode, model.InfoType, model.InfoTypeID.Value, model.UnitID.Value, model.Unit);
-                            //if (n > 0)
+                            //    , depid, clgh, ua.F_UserCode, model.InfoType, model.InfoTypeID??0, model.UnitID??0, model.Unit);
+                            ////if (n > 0)
                             #endregion
 
                             if (rerere)

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -52,8 +52,8 @@ namespace CallCenterApi.Model
         private DateTime? _appointtime;
         private string _clcontent;
         private string _infotype;
-        private int? _infotypeid;
-        private int? _isreward;
+        private int? _infotypeid = 0;
+        private int? _isreward = 0;
         private string _rewardamount;
         private string _rewardtime;
         private int? _unitid;

ivr/IVR_XinXiangMD.xml

@@ -23,7 +23,7 @@
 		<cell Name="CELL_COMPARE" Pos="6" Data1Type="2" Data2Type="1" Data3Type="1" Data1="BlackListVerify" Data2="0" Data3="" VarType="1" CompareType="2" TruePos="7" FalsePos="12" Note="判断黑名单" />
 		<cell Name="CELL_SQL" Pos="7" ConnStr="Provider=SQLOLEDB.1;Password=hykj800100;Persist Security Info=True;User ID=sa;Initial Catalog=CallCenter_XiXianDC;Data Source=192.168.1.2" 
 		SqlStr="update T_Call_CallRecords set CallState=1,DealType=1,IsDeal=1 where CallId='%[CallID]'" IsSaved="no" SuccessPos="26" FailPos="26" Note="黑名单通话记录" />
-		
+
 		<cell Name="CELL_AUDIODTMF" Pos="12" PlayType="2" ContentType="1" Content="D:\Midware\wav\欢迎词.wav" TTSNumMode="1" TTSSpeed="50" TTSVolume="50" 
 		TTSEngine="0" StopWhenDtmf="2" MaxKeyCount="1" KeyPressInterval="0" FinishKey="#" KeyVar="" SuccessPos="8" FailPos="24" HangupPos="25" Note="放欢迎词" />
 		<!--