优化卡顿慢

CallCenterApi/CallCenterApi.BLL/T_Sys_AreaChildren.cs

@@ -59,13 +59,47 @@ namespace CallCenterApi.BLL
             return dal.GetModel(F_AreaId);
         }
 
-        
+
 
         /// <summary>
         /// 获得数据列表
         /// </summary>
         public DataSet GetList(string strWhere)
         {
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var ds = new DataSet();
+                if (string.IsNullOrEmpty(strWhere))
+                {
+                    ds.Tables.Add(dt.Copy());
+                }
+                else
+                {
+                    var drs = dt.Select(strWhere);
+                    if (drs.Length > 0)
+                    {
+                        ds.Tables.Add(drs.CopyToDataTable());
+                    }
+                    else
+                    {
+                        ds.Tables.Add(new DataTable());
+                    }
+                }
+
+                return ds;
+            }
+            else
+            {
+                return dal.GetList(strWhere);
+            }
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetListNoCache(string strWhere)
+        {
             return dal.GetList(strWhere);
         }
         /// <summary>

CallCenterApi/CallCenterApi.BLL/T_Sys_Department.cs

@@ -73,6 +73,45 @@ namespace CallCenterApi.BLL
             OutRedis();
             return dal.UpdateSMS( state);
         }
+
+        /// <summary>
+        /// 根据部门id获取部门名称
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public string GetDeptNames(string ids)
+        {
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var drs = dt.Select("F_DeptId in (" + ids + ")");
+                if (drs != null && drs.Length > 0)
+                {
+                    string deptname = string.Empty;
+                    foreach (var dr in drs)
+                    {
+                        deptname += "," + dr["F_DeptName"];
+                    }
+                    return deptname.Substring(1);
+                }
+                else
+                {
+                    return "";
+                }
+            }
+            else
+            {
+                var dt1 = dal.GetList("F_DeptId in (" + ids + ")").Tables[0];
+                string deptname = string.Empty;
+                foreach (DataRow dr in dt1.Rows)
+                {
+                    if (string.IsNullOrEmpty(deptname)) deptname = dr["F_DeptName"].ToString();
+                    else deptname += "," + dr["F_DeptName"].ToString();
+                }
+                return deptname;
+            }
+        }
+
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
@@ -102,17 +141,41 @@ namespace CallCenterApi.BLL
         /// </summary>
         public DataSet GetList(string strWhere, string filedOrder = "")
         {
-            //var dt = GetRedis();
-            return dal.GetList(strWhere);
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var ds = new DataSet();
+                if (string.IsNullOrEmpty(strWhere))
+                {
+                    ds.Tables.Add(dt.Copy());
+                }
+                else
+                {
+                    var drs = dt.Select(strWhere, filedOrder);
+                    if (drs.Length > 0)
+                    {
+                        ds.Tables.Add(drs.CopyToDataTable());
+                    }
+                    else
+                    {
+                        ds.Tables.Add(new DataTable());
+                    }
+                }
 
+                return ds;
+            }
+            else
+            {
+                return dal.GetList(strWhere, filedOrder);
+            }
         }
 
         /// <summary>
         /// 获得数据列表
         /// </summary>
-        public DataSet GetListNoCache(string strWhere)
+        public DataSet GetListNoCache(string strWhere, string filedOrder = "")
         {
-            return dal.GetList(strWhere);
+            return dal.GetList(strWhere, filedOrder);
         }
 
         /// <summary>

CallCenterApi/CallCenterApi.BLL/T_Sys_RoleInfo.cs

@@ -1,4 +1,5 @@
-using System;
+using CallCenter.Utility;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -29,6 +30,7 @@ namespace CallCenterApi.BLL
         /// </summary>
         public int Add(Model.T_Sys_RoleInfo model)
         {
+            OutRedis();
             return dal.Add(model);
         }
 
@@ -37,6 +39,7 @@ namespace CallCenterApi.BLL
         /// </summary>
         public bool Update(Model.T_Sys_RoleInfo model)
         {
+            OutRedis();
             return dal.Update(model);
         }
 
@@ -45,7 +48,7 @@ namespace CallCenterApi.BLL
         /// </summary>
         public bool Delete(int F_RoleId)
         {
-
+            OutRedis();
             return dal.Delete(F_RoleId);
         }
         /// <summary>
@@ -53,6 +56,7 @@ namespace CallCenterApi.BLL
         /// </summary>
         public bool DeleteList(string F_RoleIdlist)
         {
+            OutRedis();
             return dal.DeleteList(F_RoleIdlist);
         }
 
@@ -62,7 +66,23 @@ namespace CallCenterApi.BLL
         public Model.T_Sys_RoleInfo GetModel(int F_RoleId)
         {
 
-            return dal.GetModel(F_RoleId);
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var dr = dt.Select("F_RoleId=" + F_RoleId);
+                if (dr != null && dr.Count() > 0)
+                {
+                    return dal.DataRowToModel(dr[0]);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                return dal.GetModel(F_RoleId);
+            }
         }
 
         /// <summary>
@@ -70,7 +90,23 @@ namespace CallCenterApi.BLL
         /// </summary>
         public Model.T_Sys_RoleInfo GetModel(string F_RoleCode)
         {
-            return dal.GetModel(F_RoleCode);
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var dr = dt.Select("F_RoleCode='" + F_RoleCode + "'");
+                if (dr != null && dr.Count() > 0)
+                {
+                    return dal.DataRowToModel(dr[0]);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                return dal.GetModel(F_RoleCode);
+            }
         }
 
         /// <summary>
@@ -99,8 +135,24 @@ namespace CallCenterApi.BLL
         /// </summary>
         public List<Model.T_Sys_RoleInfo> GetModelList(string strWhere)
         {
-            DataSet ds = dal.GetList(strWhere);
-            return DataTableToList(ds.Tables[0]);
+            //DataSet ds = dal.GetList(strWhere);
+            //return DataTableToList(ds.Tables[0]);
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var dtnew = new DataTable();
+                var drs = dt.Select(strWhere);
+                if (drs.Length > 0)
+                {
+                    dtnew = drs.CopyToDataTable();
+                }
+                return DataTableToList(dtnew);
+            }
+            else
+            {
+                DataSet ds = dal.GetList(strWhere);
+                return DataTableToList(ds.Tables[0]);
+            }
         }
         /// <summary>
         /// 获得数据列表
@@ -129,7 +181,10 @@ namespace CallCenterApi.BLL
         /// </summary>
         public DataSet GetAllList()
         {
-            return GetList("");
+            //return GetList("");
+            var ds = new DataSet();
+            ds.Tables.Add(GetRedis());
+            return ds;
         }
 
         /// <summary>
@@ -150,6 +205,33 @@ namespace CallCenterApi.BLL
         #endregion  BasicMethod
         #region  ExtensionMethod
 
+        private DataTable GetRedis()
+        {
+            var strList = RedisHelper.StringGet("T_Sys_RoleInfo");
+            if (strList != null)
+            {
+                return strList.ToString().ToObject<DataTable>();
+            }
+            else
+            {
+                return InRedis();
+            }
+        }
+
+        private DataTable InRedis()
+        {
+            var dt = dal.GetList("").Tables[0];
+
+            RedisHelper.StringSet("T_Sys_RoleInfo", dt.ToJson(), new TimeSpan(24, 0, 0));
+
+            return dt;
+        }
+
+        private void OutRedis()
+        {
+            RedisHelper.KeyDelete("T_Sys_RoleInfo");
+        }
+
         #endregion  ExtensionMethod
     }
 }

CallCenterApi/CallCenterApi.BLL/T_Sys_SeatGroup.cs

@@ -2,6 +2,9 @@
 using System.Data;
 using System.Collections.Generic;
 using CallCenterApi.Model;
+using CallCenter.Utility;
+using System.Linq;
+
 namespace CallCenterApi.BLL
 {
     /// <summary>
@@ -19,6 +22,7 @@ namespace CallCenterApi.BLL
         /// </summary>
         public int Add(CallCenterApi.Model.T_Sys_SeatGroup model)
         {
+            OutRedis();
             return dal.Add(model);
         }
 
@@ -27,6 +31,7 @@ namespace CallCenterApi.BLL
         /// </summary>
         public bool Update(CallCenterApi.Model.T_Sys_SeatGroup model)
         {
+            OutRedis();
             return dal.Update(model);
         }
 
@@ -35,7 +40,7 @@ namespace CallCenterApi.BLL
         /// </summary>
         public bool Delete(int F_ID)
         {
-
+            OutRedis();
             return dal.Delete(F_ID);
         }
         /// <summary>
@@ -43,6 +48,7 @@ namespace CallCenterApi.BLL
         /// </summary>
         public bool DeleteList(string F_IDlist)
         {
+            OutRedis();
             return dal.DeleteList(F_IDlist);
         }
 
@@ -51,8 +57,23 @@ namespace CallCenterApi.BLL
         /// </summary>
         public CallCenterApi.Model.T_Sys_SeatGroup GetModel(int F_ID)
         {
-
-            return dal.GetModel(F_ID);
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var dr = dt.Select("F_ID=" + F_ID);
+                if (dr != null && dr.Count() > 0)
+                {
+                    return dal.DataRowToModel(dr[0]);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                return dal.GetModel(F_ID);
+            }
         }
 
         /// <summary>
@@ -60,7 +81,26 @@ namespace CallCenterApi.BLL
         /// </summary>
         public DataSet GetList(string strWhere)
         {
-            return dal.GetList(strWhere);
+            //return dal.GetList(strWhere);
+
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var dtnew = new DataTable();
+                var drs = dt.Select(strWhere);
+                if (drs.Length > 0)
+                {
+                    dtnew = drs.CopyToDataTable();
+                }
+                var ds = new DataSet();
+                ds.Tables.Add(dtnew);
+                return ds;
+            }
+            else
+            {
+                DataSet ds = dal.GetList(strWhere);
+                return ds;
+            }
         }
         /// <summary>
         /// 获得前几行数据
@@ -132,6 +172,33 @@ namespace CallCenterApi.BLL
         #endregion  BasicMethod
         #region  ExtensionMethod
 
+        private DataTable GetRedis()
+        {
+            var strList = RedisHelper.StringGet("T_Sys_SeatGroup");
+            if (strList != null)
+            {
+                return strList.ToString().ToObject<DataTable>();
+            }
+            else
+            {
+                return InRedis();
+            }
+        }
+
+        private DataTable InRedis()
+        {
+            var dt = dal.GetList("").Tables[0];
+
+            RedisHelper.StringSet("T_Sys_SeatGroup", dt.ToJson(), new TimeSpan(24, 0, 0));
+
+            return dt;
+        }
+
+        private void OutRedis()
+        {
+            RedisHelper.KeyDelete("T_Sys_SeatGroup");
+        }
+
         #endregion  ExtensionMethod
     }
 }

CallCenterApi/CallCenterApi.BLL/T_Sys_UserAccount.cs

@@ -77,6 +77,38 @@ namespace CallCenterApi.BLL
             OutRedis();
             return dal.DeleteList(F_UserIdlist, state);
         }
+
+        /// <summary>
+        /// 根据用户code获取用户名称
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public string GetUserName(string code)
+        {
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var drs = dt.Select("F_UserCode = '" + code + "'");
+                if (drs != null && drs.Length > 0)
+                {
+                    return drs[0]["F_UserName"].ToString();
+                }
+                else
+                {
+                    return "";
+                }
+            }
+            else
+            {
+                var dt1 = dal.GetList("F_UserCode = '" + code + "'").Tables[0];
+                if (dt1.Rows.Count > 0)
+                {
+                    return dt1.Rows[0]["F_UserName"].ToString();
+                }
+                return "";
+            }
+        }
+
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
@@ -89,7 +121,30 @@ namespace CallCenterApi.BLL
                 var dr = dt.Select("F_UserId=" + F_UserId);
                 if (dr != null && dr.Count() > 0)
                 {
-                    return dal.DataRowToModel(dr[0]);
+                    var model = dal.DataRowToModel2(dr[0]);
+                    if (model.F_DeptId > 0)
+                    {
+                        model.depname = new T_Sys_Department().GetModel(model.F_DeptId)?.F_DeptName ?? "";
+                    }
+                    if (model.F_RoleId > 0)
+                    {
+                        var role = new T_Sys_RoleInfo().GetModel(model.F_RoleId);
+                        if (role != null)
+                        {
+                            model.rolname = role.F_RoleName;
+                            model.F_RoleCode = role.F_RoleCode;
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(model.F_SeartGroupCode))
+                    {
+                        var group = new T_Sys_SeatGroup().GetList("F_ZXZCode='" + model.F_SeartGroupCode + "' ").Tables[0];
+                        if (group != null && group.Rows.Count > 0)
+                        {
+                            model.zxzname = group.Rows[0]["F_ZXZName"] != null ? group.Rows[0]["F_ZXZName"].ToString() : "";
+                        }
+                    }
+
+                    return model;
                 }
                 else
                 {
@@ -114,7 +169,30 @@ namespace CallCenterApi.BLL
                 var dr = dt.Select("F_UserCode='" + F_UserCode + "'");
                 if (dr != null && dr.Count() > 0)
                 {
-                    return dal.DataRowToModel(dr[0]);
+                    var model = dal.DataRowToModel2(dr[0]);
+                    if (model.F_DeptId > 0)
+                    {
+                        model.depname = new T_Sys_Department().GetModel(model.F_DeptId)?.F_DeptName ?? "";
+                    }
+                    if (model.F_RoleId > 0)
+                    {
+                        var role = new T_Sys_RoleInfo().GetModel(model.F_RoleId);
+                        if (role != null)
+                        {
+                            model.rolname = role.F_RoleName;
+                            model.F_RoleCode = role.F_RoleCode;
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(model.F_SeartGroupCode))
+                    {
+                        var group = new T_Sys_SeatGroup().GetList("F_ZXZCode='" + model.F_SeartGroupCode + "' ").Tables[0];
+                        if (group != null && group.Rows.Count > 0)
+                        {
+                            model.zxzname = group.Rows[0]["F_ZXZName"] != null ? group.Rows[0]["F_ZXZName"].ToString() : "";
+                        }
+                    }
+
+                    return model;
                 }
                 else
                 {
@@ -168,13 +246,47 @@ namespace CallCenterApi.BLL
         //    return (Model.T_Sys_UserAccount)objModel;
         //}
 
+        ///// <summary>
+        ///// 获得数据列表
+        ///// </summary>
+        //public DataSet GetList(string strWhere, string filedOrder = "")
+        //{
+        //    return dal.GetList(strWhere, filedOrder);
+        //    //  return dal.GetList(strWhere, filedOrder);
+        //}
+
         /// <summary>
         /// 获得数据列表
         /// </summary>
         public DataSet GetList(string strWhere, string filedOrder = "")
         {
-            return dal.GetList(strWhere, filedOrder);
-            //  return dal.GetList(strWhere, filedOrder);
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var ds = new DataSet();
+                if (string.IsNullOrEmpty(strWhere))
+                {
+                    ds.Tables.Add(dt.Copy());
+                }
+                else
+                {
+                    var drs = dt.Select(strWhere, filedOrder);
+                    if (drs.Length > 0)
+                    {
+                        ds.Tables.Add(drs.CopyToDataTable());
+                    }
+                    else
+                    {
+                        ds.Tables.Add(new DataTable());
+                    }
+                }
+
+                return ds;
+            }
+            else
+            {
+                return dal.GetList(strWhere, filedOrder);
+            }
         }
 
         /// <summary>
@@ -246,12 +358,37 @@ namespace CallCenterApi.BLL
             int rowsCount = dt.Rows.Count;
             if (rowsCount > 0)
             {
+                var deptbll = new T_Sys_Department();
+                var rolebll = new T_Sys_RoleInfo();
+                var seatbll = new T_Sys_SeatGroup();
+
                 Model.T_Sys_UserAccount model;
                 for (int n = 0; n < rowsCount; n++)
                 {
-                    model = dal.DataRowToModel(dt.Rows[n]);
+                    model = dal.DataRowToModel2(dt.Rows[n]);
                     if (model != null)
                     {
+                        if (model.F_DeptId > 0)
+                        {
+                            model.depname = deptbll.GetModel(model.F_DeptId)?.F_DeptName ?? "";
+                        }
+                        if (model.F_RoleId > 0)
+                        {
+                            var role = rolebll.GetModel(model.F_RoleId);
+                            if (role != null)
+                            {
+                                model.rolname = role.F_RoleName;
+                                model.F_RoleCode = role.F_RoleCode;
+                            }
+                        }
+                        if (!string.IsNullOrEmpty(model.F_SeartGroupCode))
+                        {
+                            var group = seatbll.GetList("F_ZXZCode='" + model.F_SeartGroupCode + "' ").Tables[0];
+                            if (group != null && group.Rows.Count > 0)
+                            {
+                                model.zxzname = group.Rows[0]["F_ZXZName"] != null ? group.Rows[0]["F_ZXZName"].ToString() : "";
+                            }
+                        }
                         modelList.Add(model);
                     }
                 }

CallCenterApi/CallCenterApi.BLL/T_Sys_WorkOFFDays.cs

@@ -1,4 +1,5 @@
-using System;
+using CallCenter.Utility;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -22,6 +23,7 @@ namespace CallCenterApi.BLL
         /// </summary>
         public int Add(CallCenterApi.Model.T_Sys_WorkOFFDays model)
         {
+            OutRedis();
             return dal.Add(model);
         }
 
@@ -30,10 +32,12 @@ namespace CallCenterApi.BLL
         /// </summary>
         public bool Update(CallCenterApi.Model.T_Sys_WorkOFFDays model)
         {
+            OutRedis();
             return dal.Update(model);
         }
         public bool UpdateState(CallCenterApi.Model.T_Sys_WorkOFFDays model)
         {
+            OutRedis();
             return dal.UpdateState(model);
         }
 
@@ -42,11 +46,12 @@ namespace CallCenterApi.BLL
         /// </summary>
         public bool Delete(int F_OffID)
         {
-
+            OutRedis();
             return dal.Delete(F_OffID);
         }
         public bool DeleteByDate(string date, string usercode, DateTime nowdate)
         {
+            OutRedis();
             return dal.DeleteByDate(date, usercode,nowdate);
         }
         /// <summary>
@@ -54,6 +59,7 @@ namespace CallCenterApi.BLL
         /// </summary>
         public bool DeleteList(string F_OffIDlist)
         {
+            OutRedis();
             return dal.DeleteList(F_OffIDlist);
         }
 
@@ -62,13 +68,70 @@ namespace CallCenterApi.BLL
         /// </summary>
         public CallCenterApi.Model.T_Sys_WorkOFFDays GetModel(int F_OffID)
         {
-
-            return dal.GetModel(F_OffID);
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var dr = dt.Select("F_OffID=" + F_OffID);
+                if (dr != null && dr.Count() > 0)
+                {
+                    return dal.DataRowToModel(dr[0]);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                return dal.GetModel(F_OffID);
+            }
         }
         public CallCenterApi.Model.T_Sys_WorkOFFDays GetModel(string date)
         {
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var dr = dt.Select("F_OffDate='" + date + "'");
+                if (dr != null && dr.Count() > 0)
+                {
+                    return dal.DataRowToModel(dr[0]);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                return dal.GetModel(date);
+            }
+        }
 
-            return dal.GetModel(date);
+        /// <summary>
+        /// 获取工作日天数
+        /// </summary>
+        /// <param name="startdate"></param>
+        /// <param name="enddate"></param>
+        /// <returns></returns>
+        public int GetDays(string strWhere)
+        {
+            var dt = GetRedis();
+            if (dt != null)
+            {
+                var dr = dt.Select(strWhere);
+                if (dr != null && dr.Count() > 0)
+                {
+                    return dr.Count();
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+            else
+            {
+                return dal.GetRecordCount(strWhere);
+            }
         }
 
         /// <summary>
@@ -168,5 +231,34 @@ namespace CallCenterApi.BLL
         }
 
         #endregion  Method
+
+        private DataTable GetRedis()
+        {
+            var strList = RedisHelper.StringGet("T_Sys_WorkOFFDays");
+            if (strList != null)
+            {
+                return strList.ToString().ToObject<DataTable>();
+            }
+            else
+            {
+                return InRedis();
+            }
+        }
+
+        private DataTable InRedis()
+        {
+            var startdate = "2022-01-01";
+            var enddate = DateTime.Now.AddYears(+1).ToString("yyyy") + "-12-31";
+            var dt = dal.GetList("F_OffDate>'"+ startdate + "' and F_OffDate<'"+ enddate + "'").Tables[0];
+
+            RedisHelper.StringSet("T_Sys_WorkOFFDays", dt.ToJson(), new TimeSpan(24, 0, 0));
+
+            return dt;
+        }
+
+        private void OutRedis()
+        {
+            RedisHelper.KeyDelete("T_Sys_WorkOFFDays");
+        }
     }
 }

CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -530,11 +530,14 @@ namespace CallCenterApi.DAL
                     {
                         model.F_RoleId = int.Parse(row["F_RoleId"].ToString());
 
-                        var role = new DAL.T_Sys_RoleInfo().GetModel(model.F_RoleId);
-                        if (role != null)
+                        if (model.F_RoleId > 0)
                         {
-                            model.rolname = role.F_RoleName;
-                            model.F_RoleCode = role.F_RoleCode;
+                            var role = new DAL.T_Sys_RoleInfo().GetModel(model.F_RoleId);
+                            if (role != null)
+                            {
+                                model.rolname = role.F_RoleName;
+                                model.F_RoleCode = role.F_RoleCode;
+                            }
                         }
                     }
 
@@ -754,6 +757,220 @@ namespace CallCenterApi.DAL
         }
 
         /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Sys_UserAccount DataRowToModel2(DataRow row)
+        {
+            Model.T_Sys_UserAccount model = new Model.T_Sys_UserAccount();
+            try
+            {
+                if (row != null)
+                {
+                    if (row["F_UserId"] != null && row["F_UserId"].ToString() != "")
+                    {
+                        model.F_UserId = int.Parse(row["F_UserId"].ToString());
+                    }
+                    if (row["F_UserCode"] != null)
+                    {
+                        model.F_UserCode = row["F_UserCode"].ToString();
+                    }
+                    if (row["F_Password"] != null)
+                    {
+                        model.F_Password = row["F_Password"].ToString();
+                    }
+                    if (row["F_ExtensionNumber"] != null)
+                    {
+                        model.F_ExtensionNumber = row["F_ExtensionNumber"].ToString();
+                    }
+                    if (row["F_UserName"] != null)
+                    {
+                        model.F_UserName = row["F_UserName"].ToString();
+                    }
+                    if (row["F_DeptId"] != null && row["F_DeptId"].ToString() != "")
+                    {
+                        model.F_DeptId = int.Parse(row["F_DeptId"].ToString());
+                    }
+                    if (row["F_RoleCode"] != null)
+                    {
+                        model.F_RoleCode = row["F_RoleCode"].ToString();
+                    }
+                    if (row["F_RoleId"] != null && row["F_RoleId"].ToString() != "")
+                    {
+                        model.F_RoleId = int.Parse(row["F_RoleId"].ToString());
+                    }
+
+                    if (row["F_GroupId"] != null && row["F_GroupId"].ToString() != "")
+                    {
+                        model.F_GroupId = int.Parse(row["F_GroupId"].ToString());
+                    }
+                    if (row["F_SeartGroupID"] != null && row["F_SeartGroupID"].ToString() != "")
+                    {
+                        model.F_SeartGroupID = int.Parse(row["F_SeartGroupID"].ToString());
+                    }
+
+                    if (row["F_SeatFlag"] != null && row["F_SeatFlag"].ToString() != "")
+                    {
+                        if ((row["F_SeatFlag"].ToString() == "1") || (row["F_SeatFlag"].ToString().ToLower() == "true"))
+                        {
+                            model.F_SeatFlag = true;
+                        }
+                        else
+                        {
+                            model.F_SeatFlag = false;
+                        }
+                    }
+                    if (row["F_SeatRight"] != null)
+                    {
+                        model.F_SeatRight = row["F_SeatRight"].ToString();
+                    }
+                    if (row["F_SeatLevel"] != null)
+                    {
+                        model.F_SeatLevel = row["F_SeatLevel"].ToString();
+                    }
+                    if (row["F_SexFlag"] != null)
+                    {
+                        model.F_SexFlag = row["F_SexFlag"].ToString();
+                    }
+                    if (row["F_RemindFlag"] != null && row["F_RemindFlag"].ToString() != "")
+                    {
+                        if ((row["F_RemindFlag"].ToString() == "1") || (row["F_RemindFlag"].ToString().ToLower() == "true"))
+                        {
+                            model.F_RemindFlag = true;
+                        }
+                        else
+                        {
+                            model.F_RemindFlag = false;
+                        }
+                    }
+                    if (row["F_Remark"] != null)
+                    {
+                        model.F_Remark = row["F_Remark"].ToString();
+                    }
+                    if (row["F_Telephone"] != null)
+                    {
+                        model.F_Telephone = row["F_Telephone"].ToString();
+                    }
+                    if (row["F_Mobile"] != null)
+                    {
+                        model.F_Mobile = row["F_Mobile"].ToString();
+                    }
+                    if (row["F_HomePhone"] != null)
+                    {
+                        model.F_HomePhone = row["F_HomePhone"].ToString();
+                    }
+                    if (row["F_Birthday"] != null && row["F_Birthday"].ToString() != "")
+                    {
+                        model.F_Birthday = DateTime.Parse(row["F_Birthday"].ToString());
+                    }
+                    if (row["F_CreateOn"] != null && row["F_CreateOn"].ToString() != "")
+                    {
+                        model.F_CreateOn = DateTime.Parse(row["F_CreateOn"].ToString());
+                    }
+                    if (row["F_CancelOn"] != null && row["F_CancelOn"].ToString() != "")
+                    {
+                        model.F_CancelOn = DateTime.Parse(row["F_CancelOn"].ToString());
+                    }
+                    if (row["F_DeleteFlag"] != null && row["F_DeleteFlag"].ToString() != "")
+                    {
+                        model.F_DeleteFlag = int.Parse(row["F_DeleteFlag"].ToString());
+                    }
+                    if (row["F_APPOnFlag"] != null && row["F_APPOnFlag"].ToString() != "")
+                    {
+                        if ((row["F_APPOnFlag"].ToString() == "1") || (row["F_APPOnFlag"].ToString().ToLower() == "true"))
+                        {
+                            model.F_APPOnFlag = true;
+                        }
+                        else
+                        {
+                            model.F_APPOnFlag = false;
+                        }
+                    }
+                    if (row["F_LastActiveTime"] != null && row["F_LastActiveTime"].ToString() != "")
+                    {
+                        model.F_LastActiveTime = DateTime.Parse(row["F_LastActiveTime"].ToString());
+                    }
+                    if (row["F_ModifytTime"] != null && row["F_ModifytTime"].ToString() != "")
+                    {
+                        model.F_ModifytTime = DateTime.Parse(row["F_ModifytTime"].ToString());
+                    }
+
+                    if (row["F_See"] != null)
+                    {
+                        model.F_See = row["F_See"].ToString();
+                    }
+                    if (row["F_HJType"] != null && row["F_HJType"].ToString() != "")
+                    {
+                        model.F_HJType = int.Parse(row["F_HJType"].ToString());
+                    }
+                    if (row["F_PId"] != null && row["F_PId"].ToString() != "")
+                    {
+                        model.F_PId = int.Parse(row["F_PId"].ToString());
+                    }
+                    if (row["F_TmId"] != null && row["F_TmId"].ToString() != "")
+                    {
+                        model.F_TmId = int.Parse(row["F_TmId"].ToString());
+                    }
+                    if (row["F_IsSms"] != null && row["F_IsSms"].ToString() != "")
+                    {
+                        model.F_IsSms = int.Parse(row["F_IsSms"].ToString());
+                    }
+
+                    if (row["F_WorkNumber"] != null)
+                    {
+                        model.F_WorkNumber = row["F_WorkNumber"].ToString();
+                    }
+                    if (row["F_DeptCode"] != null)
+                    {
+                        model.F_DeptCode = row["F_DeptCode"].ToString();
+                    }
+                    if (row["F_WXNo"] != null)
+                    {
+                        model.F_WXNo = row["F_WXNo"].ToString();
+                    }
+                    if (row["F_SeartGroupCode"] != null)
+                    {
+                        model.F_SeartGroupCode = row["F_SeartGroupCode"].ToString();
+                    }
+                    model.F_WxOpenId = row["F_WxOpenId"] == DBNull.Value ? "" : row["F_WxOpenId"].ToString();
+                    if (row["F_ClassCode"] != null)
+                    {
+                        model.F_ClassCode = row["F_ClassCode"].ToString();
+                    }
+                    if (row["F_GroupCode"] != null)
+                    {
+                        model.F_GroupCode = row["F_GroupCode"].ToString();
+                    }
+                    if (row["F_Post"] != null)
+                    {
+                        model.F_Post = row["F_Post"].ToString();
+                    }
+                    if (row["F_Name"] != null)
+                    {
+                        model.F_Name = row["F_Name"].ToString();
+                    }
+                    if (row["F_Company"] != null)
+                    {
+                        model.F_Company = row["F_Company"].ToString();
+                    }
+                    if (row["F_Department"] != null)
+                    {
+                        model.F_Department = row["F_Department"].ToString();
+                    }
+
+                }
+            }
+            catch (Exception e)
+            {
+
+
+            }
+
+
+
+            return model;
+        }
+
+        /// <summary>
         /// 获得数据列表
         /// </summary>
         public DataSet GetList(string strWhere, string filedOrder = "")

CallCenterApi/CallCenterApi.DAL/T_Sys_Users.cs

@@ -188,7 +188,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_Id,F_OpenId,F_CreateTime,F_Type,F_Password,F_Name,F_Telphone,F_Sex,F_Province,F_City,F_County,F_Address,F_ImgUrl from T_Sys_Users ");
+            strSql.Append("select  top 1 F_Id,F_OpenId,F_CreateTime,F_Type,F_Password,F_Name,F_Telphone,F_Sex,F_Province,F_City,F_County,F_Address,F_ImgUrl from T_Sys_Users with(nolock)");
             strSql.Append(" where F_OpenId=@F_OpenId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_OpenId", SqlDbType.VarChar,100)
@@ -214,7 +214,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_Id,F_OpenId,F_CreateTime,F_Type,F_Password,F_Name,F_Telphone,F_Sex,F_Province,F_City,F_County,F_Address,F_ImgUrl from T_Sys_Users ");
+            strSql.Append("select  top 1 F_Id,F_OpenId,F_CreateTime,F_Type,F_Password,F_Name,F_Telphone,F_Sex,F_Province,F_City,F_County,F_Address,F_ImgUrl from T_Sys_Users with(nolock)");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Id", SqlDbType.BigInt)
@@ -305,7 +305,7 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("select F_Id,F_OpenId,F_CreateTime,F_Type,F_Password,F_Name,F_Telphone,F_Sex,F_Province,F_City,F_County,F_Address,F_ImgUrl ");
-            strSql.Append(" FROM T_Sys_Users ");
+            strSql.Append(" FROM T_Sys_Users with(nolock)");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);
@@ -325,7 +325,7 @@ namespace CallCenterApi.DAL
                 strSql.Append(" top " + Top.ToString());
             }
             strSql.Append(" F_Id,F_OpenId,F_CreateTime,F_Type,F_Password,F_Name,F_Telphone,F_Sex,F_Province,F_City,F_County,F_Address,F_ImgUrl ");
-            strSql.Append(" FROM T_Sys_Users ");
+            strSql.Append(" FROM T_Sys_Users with(nolock)");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);
@@ -340,7 +340,7 @@ namespace CallCenterApi.DAL
         public int GetRecordCount(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select count(1) FROM T_Sys_Users ");
+            strSql.Append("select count(1) FROM T_Sys_Users with(nolock)");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);
@@ -371,7 +371,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append("order by T.F_Id desc");
             }
-            strSql.Append(")AS Row, T.*  from T_Sys_Users T ");
+            strSql.Append(")AS Row, T.*  from T_Sys_Users T with(nolock)");
             if (!string.IsNullOrEmpty(strWhere.Trim()))
             {
                 strSql.Append(" WHERE " + strWhere);

CallCenterApi/CallCenterApi.DAL/T_Sys_WorkOFFDays.cs

@@ -307,7 +307,7 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("select * ");
-            strSql.Append(" FROM T_Sys_WorkOFFDays ");
+            strSql.Append(" FROM T_Sys_WorkOFFDays with(nolock)");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);
@@ -342,7 +342,7 @@ namespace CallCenterApi.DAL
         public int GetRecordCount(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select count(1) FROM T_Sys_WorkOFFDays ");
+            strSql.Append("select count(1) FROM T_Sys_WorkOFFDays with(nolock)");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);

CallCenterApi/CallCenterApi.DB/CallCenterApi.DB.csproj

@@ -49,6 +49,12 @@
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\CallCenterCommon\CallCenter.Utility\CallCenter.Utility.csproj">
+      <Project>{4DA219CC-911E-4C81-BB0B-DF5183FD50FF}</Project>
+      <Name>CallCenter.Utility</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

CallCenterApi/CallCenterApi.DB/DbHelperSQL.cs

@@ -1,4 +1,5 @@
-using System;
+using CallCenter.Utility;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
@@ -15,6 +16,7 @@ namespace CallCenterApi.DB
     {
         //数据库连接字符串(web.config来配置)，可以动态更改connectionString支持多数据库.		
         public static string connectionString = ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        public static Log log = LogFactory.GetLogger("DbHelperSQL");
         public DbHelperSQL() { }
 
         #region 公用方法
@@ -172,6 +174,8 @@ namespace CallCenterApi.DB
                     }
                     catch (System.Data.SqlClient.SqlException e)
                     {
+                        log.Error(SQLString , e);
+
                         connection.Close();
                         throw e;
                     }
@@ -506,6 +510,7 @@ namespace CallCenterApi.DB
                     }
                     catch (System.Data.SqlClient.SqlException e)
                     {
+                        log.Error(SQLString , e);
                         connection.Close();
                         throw e;
                     }
@@ -591,6 +596,7 @@ namespace CallCenterApi.DB
                 }
                 catch (System.Data.SqlClient.SqlException ex)
                 {
+                    log.Error(SQLString , ex);
                     throw new Exception(ex.Message);
                 }
                 return ds;
@@ -683,7 +689,7 @@ namespace CallCenterApi.DB
                     }
                     catch (System.Data.SqlClient.SqlException e)
                     {
-                        
+                        log.Error(SQLString + "|" + cmdParms.ToDictionary(p => p.ParameterName, p => p.Value?.ToString() ?? "").ToJson(), e);
                         //throw e;
                     }
                     return 0;
@@ -950,8 +956,9 @@ namespace CallCenterApi.DB
                     }
                     catch (System.Data.SqlClient.SqlException e)
                     {
-                        return e.Message;
-                        //   throw e;
+                        log.Error(SQLString + "|" + cmdParms.ToDictionary(p => p.ParameterName, p => p.Value?.ToString() ?? "").ToJson(), e);
+
+                        throw e;
                     }
                 }
             }
@@ -1039,6 +1046,7 @@ namespace CallCenterApi.DB
                     }
                     catch (System.Data.SqlClient.SqlException ex)
                     {
+                        log.Error(SQLString + "|" + cmdParms.ToDictionary(p => p.ParameterName, p => p.Value?.ToString() ?? "").ToJson(), ex);
                         throw new Exception(ex.Message);
                     }
                     return ds;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AppealController.cs

@@ -196,7 +196,8 @@ namespace CallCenterApi.Interface.Controllers
                 string NoticeDeptName = "";
                 if (dt.Rows[0]["F_DeptIds"] != null && dt.Rows[0]["F_DeptIds"].ToString() != "")
                 {
-                    NoticeDeptName = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + dt.Rows[0]["F_DeptIds"].ToString() + "')").ToString();
+                    //NoticeDeptName = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + dt.Rows[0]["F_DeptIds"].ToString() + "')").ToString();
+                    NoticeDeptName = new BLL.T_Sys_Department().GetDeptNames(dt.Rows[0]["F_DeptIds"].ToString());
                 }
                 var configfj = configBll.GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
                 if (configfj != null)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -55,7 +55,7 @@ namespace CallCenterApi.Interface.Controllers
                 if (iscbdw == 0)
                 {
                     
-                    dt = departmentBLL.GetList("F_State=0  and (  F_PartentId='" + User.F_DeptId + "' or  EXISTS (select 1 from dbo.SplitToNvarchar(F_Remark, ',') a join" +
+                    dt = departmentBLL.GetListNoCache("F_State=0  and (  F_PartentId='" + User.F_DeptId + "' or  EXISTS (select 1 from dbo.SplitToNvarchar(F_Remark, ',') a join" +
                         "  dbo.SplitToNvarchar((select F_Remark from T_Sys_Department  where F_DeptId = '" + User.F_DeptId + "'), ',') b on a.col = b.col) ) " +
                         "and F_IsDept =2" + sql, " F_Sort").Tables[0];
                 }
@@ -93,7 +93,7 @@ namespace CallCenterApi.Interface.Controllers
         }
         public ActionResult GetDeptUser(int deptid)
         {
-            var dt = "select count(1) from T_Sys_UserAccount where F_DeptId='" + deptid + "'";
+            var dt = "select count(1) from T_Sys_UserAccount with(nolock) where F_DeptId='" + deptid + "'";
             int usercount = int.Parse(DbHelperSQL.GetSingle(dt).ToString());
             if (usercount>0)
             {
@@ -369,7 +369,7 @@ namespace CallCenterApi.Interface.Controllers
                     model.id = currentID;
                     model.IconCls = "";//图标
                     model.text = categorylist[i].F_DeptName;
-                    tab2 = new BLL.T_Sys_Department().GetList("F_PartentId=" + currentID + " and F_State=0 and ISNULL(F_IsDealDept, '0') ='1' order by f_sort").Tables[0];
+                    tab2 = new BLL.T_Sys_Department().GetList("F_PartentId=" + currentID + " and F_State=0 and ISNULL(F_IsDealDept, '0') ='1' ", "f_sort").Tables[0];
                     if (tab2 != null && tab2.Rows.Count > 0)
                     {
                         model.children = BindTree(tab2, currentID);

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

@@ -477,21 +477,29 @@ namespace CallCenterApi.Interface.Controllers
                 }
                 else
                 {
-                    F_RoleId = DbHelperSQL.GetSingle("select F_RoleId from T_Sys_RoleInfo with(nolock) where F_RoleCode='" + rolecode.Trim() + "'")?.ToString() ?? "0";
+                    //F_RoleId = DbHelperSQL.GetSingle("select F_RoleId from T_Sys_RoleInfo with(nolock) where F_RoleCode='" + rolecode.Trim() + "'")?.ToString() ?? "0";
+                    //var dt = departmentBLL.GetList("F_RoleCode='" + rolecode.Trim() + "'").Tables[0];
+                    //if (dt.Rows.Count > 0)
+                    //{
+                    //    F_RoleId = dt.Rows[0]["F_RoleId"].ToString();
+                    //}
+                    F_RoleId = new BLL.T_Sys_RoleInfo().GetModel(rolecode.Trim())?.F_RoleId.ToString() ?? "0";
                 }
 
                 sql += " and F_RoleId = " + F_RoleId;
             }
 
             //List<Model.T_Sys_UserAccount> userList = sysUserAccountBll.GetModelList(sql, " f_userid desc ");
-            var userList = sysUserAccountBll.GetList(sql, "CONVERT(int ,F_UserCode ) asc ").Tables[0];
+            //var userList = sysUserAccountBll.GetList(sql, "CONVERT(int ,F_UserCode ) asc ").Tables[0];
+            var userList = sysUserAccountBll.GetModelList(sql).OrderBy(p => int.Parse(p.F_UserCode));
             return Success("列表加载成功", userList);
         }
 
         //根据部门获取用户
         public ActionResult GetDeptUserList(int deptid = 0)
         {
-            var DeptUserList = sysUserAccountBll.GetList("F_DeptId='" + deptid + "' ", " CONVERT(int ,F_UserCode ) asc");
+            //var DeptUserList = sysUserAccountBll.GetList("F_DeptId='" + deptid + "' ", " CONVERT(int ,F_UserCode ) asc");
+            var DeptUserList = sysUserAccountBll.GetModelList("F_DeptId='" + deptid + "' ").OrderBy(p => int.Parse(p.F_UserCode));
             return Success("列表加载成功", DeptUserList);
 
         }

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

@@ -1,5 +1,6 @@
 using CallCenter.Utility;
 using CallCenterApi.Common;
+using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
 using System;
 using System.Collections.Generic;
@@ -512,8 +513,10 @@ namespace CallCenterApi.Interface.Controllers.tel
             Model.T_Call_CallRecords vmodel = new BLL.T_Call_CallRecords().GetModelByCallId(callid);
             if (vmodel != null)
             {
-                vmodel.F_CallInType = tid;
-                if (new BLL.T_Call_CallRecords().Update(vmodel))
+                //vmodel.F_CallInType = tid;
+                //if (new BLL.T_Call_CallRecords().Update(vmodel))
+                bool bl = DbHelperSQL.ExecuteSql("update T_Call_CallRecords set F_CallInType=" + tid + " where CallRecordsId=" + vmodel.CallRecordsId) > 0;
+                if (bl)
                 {
                     return Success("操作成功");
                 }
@@ -540,8 +543,10 @@ namespace CallCenterApi.Interface.Controllers.tel
             Model.T_Call_CallRecords vmodel = new BLL.T_Call_CallRecords().GetModelByCallId(callid);
             if (vmodel != null)
             {
-                vmodel.F_CallOutType = tid;
-                if (new BLL.T_Call_CallRecords().Update(vmodel))
+                //vmodel.F_CallOutType = tid;
+                //if (new BLL.T_Call_CallRecords().Update(vmodel))
+                bool bl = DbHelperSQL.ExecuteSql("update T_Call_CallRecords set F_CallOutType=" + tid + " where CallRecordsId=" + vmodel.CallRecordsId) > 0;
+                if (bl)
                 {
                     return Success("操作成功");
                 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -269,7 +269,8 @@ namespace CallCenterApi.Interface.Controllers.tel
                     dt = BLL.PagerBLL.GetListPager(
                         "T_Call_CallRecords WITH(NOLOCK)",
                         "CallRecordsId",
-                        "*,dbo.GetUserName(UserCode) as UserName, WorkOrderId,dbo.GetDictionaryName(F_CallInType) as TypeName",
+                        //"*,dbo.GetUserName(UserCode) as UserName, WorkOrderId,dbo.GetDictionaryName(F_CallInType) as TypeName",
+                        "*",
                         sql,
                         "ORDER BY BeginTime desc ",
                         pagesize,
@@ -279,6 +280,7 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                     var config = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
                     dt.Columns.Add("WaitTime", typeof(string));
+                    dt.Columns.Add("TypeName", typeof(string));
                     foreach (DataRow dr in dt.Rows)
                     {
                         string path = dr["FilePath"] != null ? dr["FilePath"].ToString() : "";
@@ -311,7 +313,16 @@ namespace CallCenterApi.Interface.Controllers.tel
                             double tss = double.Parse(Math.Round(ts.TotalSeconds, 0).ToString());
                             dr["WaitTime"] = DateTimeConvert.parseTimeSeconds(tss, 1);
                         }
-                       
+
+                        if (dr["F_CallInType"] != null && dr["F_CallInType"].ToString() != "")
+                        {
+                            int tid = Int32.Parse(dr["F_CallInType"].ToString());
+                            var tn = new BLL.T_Sys_DictionaryValue().GetModel(tid);
+                            if (tn != null)
+                            {
+                                dr["TypeName"] = tn.F_Value;
+                            }
+                        }
 
                     }
                 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

@@ -32,6 +32,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
     public class AffairsController : BaseController
     {
+        private BLL.T_Sys_Department deptBLL = new BLL.T_Sys_Department();
 
         #region 上传省政务平台
         #region 服务工单受理
@@ -512,14 +513,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 jsonList.AREA_CODE = AREA_CODE;
                 jsonList.TASK_ID = model.F_Id.ToString();
                 jsonList.TASK_PARENTID = "TOP";
-                if (DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_CreateDeptId + "')") != null)
-                    jsonList.TASK_OUNAME = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_CreateDeptId + "')").ToString();
-                else
-                    jsonList.TASK_OUNAME = "";
-                if (DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_CreateUser + "')") != null)
-                    jsonList.TASK_USERNAME = DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_CreateUser + "')").ToString();
-                else
-                    jsonList.TASK_USERNAME = model.F_CreateUser;
+                //if (DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_CreateDeptId + "')") != null)
+                //    jsonList.TASK_OUNAME = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_CreateDeptId + "')").ToString();
+                //else
+                //    jsonList.TASK_OUNAME = "";
+                jsonList.TASK_OUNAME = deptBLL.GetDeptNames(model.F_CreateDeptId.ToString());
+                //if (DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_CreateUser + "')") != null)
+                //    jsonList.TASK_USERNAME = DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_CreateUser + "')").ToString();
+                //else
+                //    jsonList.TASK_USERNAME = model.F_CreateUser;
+                string username = userBLL.GetUserName(model.F_CreateUser);
+                jsonList.TASK_USERNAME = string.IsNullOrEmpty(username)? model.F_CreateUser: username;
+
                 if (string.IsNullOrEmpty(model.F_Result))
                     jsonList.TASK_CONTENT = "无";
                 else
@@ -623,12 +628,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 jsonList.AREA_CODE = AREA_CODE;
                 jsonList.TASK_ID = model.F_Id.ToString();
                 jsonList.TASK_PARENTID = info1.F_Id.ToString();
-                if (DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_CreateDeptId + "')") != null)
-                    jsonList.TASK_OUNAME = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_CreateDeptId + "')").ToString();
-                if (DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_CreateUser + "')") != null)
-                    jsonList.TASK_USERNAME = DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_CreateUser + "')").ToString();
-                else
-                    jsonList.TASK_USERNAME = model.F_CreateUser;
+                //if (DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_CreateDeptId + "')") != null)
+                //    jsonList.TASK_OUNAME = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_CreateDeptId + "')").ToString();
+                jsonList.TASK_OUNAME = deptBLL.GetDeptNames(model.F_CreateDeptId.ToString());
+                //if (DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_CreateUser + "')") != null)
+                //    jsonList.TASK_USERNAME = DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_CreateUser + "')").ToString();
+                //else
+                //    jsonList.TASK_USERNAME = model.F_CreateUser;
+                string username = userBLL.GetUserName(model.F_CreateUser);
+                jsonList.TASK_USERNAME = string.IsNullOrEmpty(username) ? model.F_CreateUser : username;
+
                 jsonList.TASK_CONTENT = model.F_Result;
                 jsonList.TASK_ASSIGNTIME = info.F_CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 jsonList.TASK_SIGNTIME = info.F_SureTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
@@ -919,11 +928,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (model.F_MainDeptId > 0)
                     {
                         jsonList.END_TIME = model.F_DealTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
-                        if (DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_MainDeptId + "')") != null)
-                            jsonList.DEPT_NAME = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_MainDeptId + "')").ToString();
-                        if (DbHelperSQL.GetSingle(" select F_DeptNameSpell  from T_Sys_Department where F_DeptId= '" + model.F_MainDeptId + "'") != null)
-                            jsonList.DEPT_CODE = DbHelperSQL.GetSingle(" select F_DeptNameSpell  from T_Sys_Department where F_DeptId= '" + model.F_MainDeptId + "'").ToString();
-
+                        //if (DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_MainDeptId + "')") != null)
+                        //    jsonList.DEPT_NAME = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_MainDeptId + "')").ToString();
+                        jsonList.DEPT_NAME = deptBLL.GetDeptNames(model.F_MainDeptId.ToString());
+                        //if (DbHelperSQL.GetSingle(" select F_DeptNameSpell  from T_Sys_Department where F_DeptId= '" + model.F_MainDeptId + "'") != null)
+                        //    jsonList.DEPT_CODE = DbHelperSQL.GetSingle(" select F_DeptNameSpell  from T_Sys_Department where F_DeptId= '" + model.F_MainDeptId + "'").ToString();
+                        jsonList.DEPT_CODE = deptBLL.GetModelList("F_DeptId= '" + model.F_MainDeptId + "'").FirstOrDefault()?.F_DeptNameSpell ?? "";
 
 
                     }
@@ -2032,8 +2042,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         oper.F_Message = userinfo + " 结案了工单，结果：" + (issatisfie == 1 ? "满意" : "不满意");
                         if (isnotice == 1)
                         {
-                            string sql = "select dbo.GetDeptNames('" + deptids + "')";
-                            oper.F_Message = oper.F_Message + "，并通告了交办单位：" + DbHelperSQL.GetSingle(sql);
+                            //string deptname = DbHelperSQL.GetSingle("select dbo.GetDeptNames('" + deptids + "')").ToString();
+                            string deptname = deptBLL.GetDeptNames(deptids);
+                            oper.F_Message = oper.F_Message + "，并通告了交办单位：" + deptname;
                         }
                         if (isstandard == 1)
                         {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/NoticeCriticismController.cs

@@ -171,7 +171,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string NoticeDeptName = "";
                 if (dModel.F_DeptIds!= null && dModel.F_DeptIds.ToString() != "")
                 {
-                     NoticeDeptName = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + dModel.F_DeptIds.ToString() + "')").ToString ();
+                    //NoticeDeptName = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + dModel.F_DeptIds.ToString() + "')").ToString ();
+                    NoticeDeptName = new BLL.T_Sys_Department().GetDeptNames(dModel.F_DeptIds);
                 }
                 var obj = new
                 {

CallCenterCommon/CallCenter.Utility/RedisHelper.cs

@@ -64,7 +64,8 @@ namespace CallCenter.Utility
             }
             else
             {
-                var rt = database.StringGet(key);
+                // var rt = database.StringGet(key);
+                var rt = database.StringGetAsync(key).Result;
 
                 if (rt.IsNull)
                 {