禅道bug修改

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

@@ -223,7 +223,7 @@ namespace CallCenterApi.Interface.Controllers
                 return Error("请选择电话类别");
             #endregion
             var model = bll.GetModel(input.ID);
-            if (getunphone(0, input.F_Telephone) && input.F_Telephone != model.F_Telephone)
+            if (getunphone(input.ID, input.F_Telephone))    // && input.F_Telephone != model.F_Telephone
                 return Error("电话重复请勿重复添加");
             model.F_Type = input.F_Type;    //1内线2外线
             model.F_Department = model_Dep != null ? model_Dep.F_ParentId : input.F_Department;    //部门id
@@ -340,7 +340,7 @@ namespace CallCenterApi.Interface.Controllers
                         dModel.F_Type  = type ;
 
                         //获取之前所有客户档案信息
-                        var list_Dep = bll_Dep.DataTableToList(bll_Dep.GetList(" 1=1 and F_DeleteFlag = 0 ").Tables[0]).ToList();
+                        var list_Dep = bll_Dep.DataTableToList(bll_Dep.GetList(" 1=1 and F_State = 1 ").Tables[0]).ToList();
                         foreach (DataRow dr in dt.Rows)
                         {
                           
@@ -360,11 +360,11 @@ namespace CallCenterApi.Interface.Controllers
                                     {
                                         dModel.F_Physician = dr["医师"].ToString();
                                         dModel.F_Title = dr["职称"].ToString();
-                                        var res = bll.Add(dModel);
-                                        if (res <= 0)
-                                        {
-                                            msg = msg + "第" + headrow + "行，导入失败<br>";
-                                        }
+                                    }
+                                    var res = bll.Add(dModel);
+                                    if (res <= 0)
+                                    {
+                                        msg = msg + "第" + headrow + "行，导入失败<br>";
                                     }
                                 }
                                 else

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RoleFController.cs

@@ -25,53 +25,53 @@ namespace CallCenterApi.Interface.Controllers
             DataTable dt = new DataTable();
             if (Request.IsAuthenticated)
             {
-              
-                    if (functionIds == null)
-                        return Error("参数错误");
-                    Model.T_Sys_RoleFunction RoleModel = new Model.T_Sys_RoleFunction();
-                    //查询选中页面中的权限
-                    var idStr = string.Join(",", functionIds);
-                    if (roleId == 0)
+
+                if (functionIds == null)
+                    return Error("请选择权限");   //参数错误
+                Model.T_Sys_RoleFunction RoleModel = new Model.T_Sys_RoleFunction();
+                //查询选中页面中的权限
+                var idStr = string.Join(",", functionIds);
+                if (roleId == 0)
+                {
+                    //管理员
+                    var model = roleInfoBll.GetModel(17);
+                    if (model == null)
+                        return Error("管理员用户不存在");
+                    roleId = model.F_RoleId;
+                    new BLL.T_Sys_RoleFunction().Delete1(roleId);
+                    var childFuncIdList = moduleFunctionsBLL.DataTableToList(moduleFunctionsBLL.GetList(" F_ParentId in (" + idStr + ") ").Tables[0]).Select(x => x.F_FunctionId).ToList();
+                    childFuncIdList.AddRange(functionIds.ToList().Select(x => Convert.ToInt32(x)).ToList());
+                    var query = childFuncIdList.Distinct();
+                    foreach (var funcId in query)
                     {
-                        //管理员
-                        var model = roleInfoBll.GetModel(17);
-                        if (model == null)
-                            return Error("管理员用户不存在");
-                        roleId = model.F_RoleId;
-                        new BLL.T_Sys_RoleFunction().Delete1(roleId);
-                        var childFuncIdList = moduleFunctionsBLL.DataTableToList(moduleFunctionsBLL.GetList(" F_ParentId in (" + idStr + ") ").Tables[0]).Select(x => x.F_FunctionId).ToList();
-                        childFuncIdList.AddRange(functionIds.ToList().Select(x => Convert.ToInt32(x)).ToList());
-                        var query = childFuncIdList.Distinct();
-                        foreach (var funcId in query)
-                        {
-                            RoleModel.F_RoleId = roleId;
-                            RoleModel.F_FunctionId = funcId;
-                            if (!roleFunctionBll.Add(RoleModel))
-                                res = Error("权限设置失败");
-                            else
-                                res = Success("权限设置成功");
-                        }
+                        RoleModel.F_RoleId = roleId;
+                        RoleModel.F_FunctionId = funcId;
+                        if (!roleFunctionBll.Add(RoleModel))
+                            res = Error("权限设置失败");
+                        else
+                            res = Success("权限设置成功");
                     }
-                    else
+                }
+                else
+                {
+                    new BLL.T_Sys_RoleFunction().Delete1(roleId);
+                    var childFuncIdList = moduleFunctionsBLL.DataTableToList(moduleFunctionsBLL.GetList(" F_ParentId in (" + idStr + ") ").Tables[0]).Select(x => x.F_FunctionId).ToList();
+                    childFuncIdList.AddRange(functionIds.ToList().Select(x => Convert.ToInt32(x)).ToList());
+                    var query = childFuncIdList.Distinct();
+                    foreach (var funcId in query)
                     {
-                        new BLL.T_Sys_RoleFunction().Delete1(roleId);
-                        var childFuncIdList = moduleFunctionsBLL.DataTableToList(moduleFunctionsBLL.GetList(" F_ParentId in (" + idStr + ") ").Tables[0]).Select(x => x.F_FunctionId).ToList();
-                        childFuncIdList.AddRange(functionIds.ToList().Select(x => Convert.ToInt32(x)).ToList());
-                        var query = childFuncIdList.Distinct();
-                        foreach (var funcId in query)
-                        {
-                            RoleModel.F_RoleId = roleId;
-                            RoleModel.F_FunctionId = funcId;
-                            if (!roleFunctionBll.Add(RoleModel))
-                                res = Error("权限设置失败");
-                            else
-                                res = Success("权限设置成功");
-                        }
+                        RoleModel.F_RoleId = roleId;
+                        RoleModel.F_FunctionId = funcId;
+                        if (!roleFunctionBll.Add(RoleModel))
+                            res = Error("权限设置失败");
+                        else
+                            res = Success("权限设置成功");
                     }
-           
-                    dt.Clear();
-                    dt.Dispose();
-                
+                }
+
+                dt.Clear();
+                dt.Dispose();
+
             }
             return res;
         }
@@ -86,7 +86,7 @@ namespace CallCenterApi.Interface.Controllers
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
+
                 var moduleInfoList = moduleInfoBLL.DataTableToList(moduleInfoBLL.GetList(" F_StateFlag=1 order by F_Sort").Tables[0]);
                 if (roleId == 0) { roleId = 17; }
                 var list = roleFunctionBLL.GetModelList(" F_RoleId=" + roleId).Select(x => x.F_FunctionId).ToList();

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

@@ -22,6 +22,8 @@ namespace CallCenterApi.Interface.Controllers
 {
     public class SMSController : BaseController
     {
+        BLL.T_Sys_DictionaryValue bllDic = new BLL.T_Sys_DictionaryValue();
+
         #region 接收短信
         string url = "http://47.92.26.244/sms.aspx?";
         string account = "yhyy"; string password = "yhyy190903";
@@ -40,7 +42,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <param name="type"></param>
         /// <returns></returns>
 
-        public ActionResult SendSMS(string mobile, string time, string timeslot, string department, string doctor, string floor, string sendTime, string name, string content, int MBID, int sendWay = 0)
+        public ActionResult SendSMS(string mobile, string time, string timeslot, string department, string doctor, string floor, string sendTime, string name, string content, int MBID = 0, int sendWay = 0)
         {
             WebClient web = new WebClient();
             web.Encoding = Encoding.UTF8;
@@ -325,26 +327,27 @@ namespace CallCenterApi.Interface.Controllers
                 if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
                     sql += $"  and ( Detail like '%" + keywords.Trim() + "%'or Name like '%" + keywords.Trim() + "%' or MName like '%" + keywords.Trim() + "%' ) ";
                 if (!string.IsNullOrWhiteSpace(name))//
-                    sql += $" and Name like '%" + name.Trim() + "%'";
+                    sql += $" and Name = '" + name.Trim() + "'";
+                //sql += $" and Name like '%" + name.Trim() + "%'";
                 // var modellist = new BLL.T_SMS_Template().GetModelList(sql);
-               
+
                 int recordCount = 0;
                 dt = BLL.PagerBLL.GetListPager(
                         "T_SMS_Template",
                         "T_SMS_Template.ID",
-                        "*",
+                        "(SELECT F_Name FROM dbo.T_Sys_DictionaryValue WHERE  F_State=1 and F_DictionaryFlag='DXLX' AND CONVERT(VARCHAR,F_DictionaryValueId) = Name) AS NameType,*",
                         sql,
                        "ORDER BY T_SMS_Template.ID desc",
                         pagesize,
                         page,
                         true,
                         out recordCount);
-                List<Model.T_SMS_Template> modlelist = new BLL.T_SMS_Template().DataTableToList(dt);
+                //List<Model.T_SMS_Template> modlelist = new BLL.T_SMS_Template().DataTableToList(dt);
                 var obj = new
                 {
                     state = "success",
                     message = "成功",
-                    rows = modlelist,
+                    rows = dt,
                     total = recordCount
 
                 };
@@ -367,7 +370,7 @@ namespace CallCenterApi.Interface.Controllers
                 Model.T_SMS_Template dModel = new Model.T_SMS_Template();
                 if (string.IsNullOrEmpty(name.Trim()))
                     return Error("短信类型不能为空！");
-                var model = new BLL.T_SMS_Template().GetModelList($"Name like '%" + name.Trim() + "%'").FirstOrDefault();
+                var model = new BLL.T_SMS_Template().GetModelList($"Name = '" + name.Trim() + "'").FirstOrDefault();
                 if (model == null)
                     return Error("查询不到此模板！");
                 return Success("获取成功", model);
@@ -460,6 +463,7 @@ namespace CallCenterApi.Interface.Controllers
                             dModel.MName = MName.Trim();
                             dModel.CreateDate = DateTime.Now;
                             dModel.IsEnable = 0;
+                            var listDIc = bllDic.DataTableToList(bllDic.GetList(" F_State=1 and F_DictionaryFlag='DXLX' ").Tables[0]);
                             foreach (DataRow dr in dt.Rows)
                             {
                                 #region 数据入库
@@ -469,7 +473,8 @@ namespace CallCenterApi.Interface.Controllers
                                 {
                                     if (!getunique( dr["短信类型"].ToString()))
                                     {
-                                        dModel.Name = dr["短信类型"].ToString();
+                                        var modelDic = listDIc.SingleOrDefault(x => x.F_Name.Equals(dr["短信类型"].ToString()));
+                                        dModel.Name = modelDic != null ? modelDic.F_DictionaryValueId.ToString() : "";    // 短信类型
                                         dModel.Detail = dr["短信内容"].ToString();
                                         var res = new BLL.T_SMS_Template().Add(dModel);
                                         if (res < 0)
@@ -523,6 +528,7 @@ namespace CallCenterApi.Interface.Controllers
                 MName = ua.F_UserName;
             }
             Model.T_SMS_List dModel = new Model.T_SMS_List();
+            //dModel.Type = TypeId;
             dModel.SendWay = SendWay;
             dModel.DSSendTime = DSSendTime;
             dModel.SendTime = SendTime;
@@ -556,7 +562,7 @@ namespace CallCenterApi.Interface.Controllers
             string sql = $"   F_IsDelete=0";
             if (!string.IsNullOrEmpty(name))
             {
-                var model = new BLL.T_SMS_Template().GetModelList($"Name like '%" + name.Trim() + "%'").FirstOrDefault();
+                var model = new BLL.T_SMS_Template().GetModelList($"Name = '" + name.Trim() + "'").FirstOrDefault();
                 if (model!=null )
                 {
                     sql += " and MBID=" + model.ID ;
@@ -578,6 +584,7 @@ namespace CallCenterApi.Interface.Controllers
             dt.Columns.Add("发送时间");
             dt.Columns.Add("短信类型");
             dt.Columns.Add("发送人");
+            var listDIc = bllDic.DataTableToList(bllDic.GetList(" F_State=1 and F_DictionaryFlag='DXLX' ").Tables[0]);
             var itemlist = new BLL.T_SMS_List().GetModelList(sql);
             foreach (var it in itemlist)
             {
@@ -599,7 +606,8 @@ namespace CallCenterApi.Interface.Controllers
                     var model = new BLL.T_SMS_Template().GetModel(int.Parse(it.MBID.ToString()));
                     if (model != null)
                     {
-                        drNew["短信类型"]=  model.Name  ;
+                        var modelDic = listDIc.SingleOrDefault(x => x.F_DictionaryValueId.ToString() == model.Name);
+                        drNew["短信类型"] = modelDic != null ? modelDic.F_Name : "";    // 短信类型 model.Name;
                     }
                 }
                 drNew["发送人"] =it .MID +"("+it.MName +")";
@@ -666,6 +674,13 @@ namespace CallCenterApi.Interface.Controllers
         /// <summary>
         /// 获取短信记录列表
         /// </summary>
+        /// <param name="name">模板类型</param>
+        /// <param name="phone">接收号码</param>
+        /// <param name="creatname">创建人工号</param>
+        /// <param name="SendWay">发送方式（-1默认所有；0立即发送； 1定时发送）</param>
+        /// <param name="IsSend">发送状态（-1默认所有；0已发送； 1发送失败）</param>
+        /// <param name="page"></param>
+        /// <param name="pagesize"></param>
         /// <returns></returns>
         public ActionResult GetSMSList(string name, string phone, string creatname ,int SendWay=-1, int IsSend=-1, int page = 1, int pagesize = 10)
         {
@@ -673,15 +688,15 @@ namespace CallCenterApi.Interface.Controllers
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
-                
+                bool isNameType = true;
                 string sql = $"and  F_IsDelete=0";
                 if (!string.IsNullOrEmpty(name))
                 {
-                    var model = new BLL.T_SMS_Template().GetModelList($"Name like '%" + name.Trim() + "%'").FirstOrDefault();
+                    var model = new BLL.T_SMS_Template().GetModelList($" Name = '" + name.Trim() + "'").FirstOrDefault();
                     if (model != null)
-                    {
                         sql += " and MBID=" + model.ID;
-                    }
+                    else
+                        isNameType = false;
                 }
                 if (!string.IsNullOrEmpty(phone))
                     sql += " and Telephone like'%" + phone+"%'";
@@ -694,17 +709,19 @@ namespace CallCenterApi.Interface.Controllers
                 int recordCount = 0;
                 if (!string.IsNullOrWhiteSpace(sql))
                 {
-
-                    dt = BLL.PagerBLL.GetListPager(
-                        "T_SMS_List",
-                        "T_SMS_List.ID",
-                        "*",
-                        sql,
-                        "ORDER BY T_SMS_List.ID desc",
-                        pagesize,
-                        page,
-                        true,
-                        out recordCount);
+                    if (isNameType)
+                    {
+                        dt = BLL.PagerBLL.GetListPager(
+                            "T_SMS_List",
+                            "T_SMS_List.ID",
+                            "*",
+                            sql,
+                            "ORDER BY T_SMS_List.ID desc",
+                            pagesize,
+                            page,
+                            true,
+                            out recordCount);
+                    }
                 }
                 var  modlelist = new BLL.T_SMS_List().DataTableToList(dt);
                 //var modellist = new BLL.T_SMS_List().GetModelList(sql);
@@ -725,6 +742,7 @@ namespace CallCenterApi.Interface.Controllers
        public List<SMSList> ModeltoSMSList(List <Model .T_SMS_List> list)
         {
             List<SMSList> modellist = new List<SMSList>();
+            var listDIc = bllDic.DataTableToList(bllDic.GetList(" F_State=1 and F_DictionaryFlag='DXLX' ").Tables[0]);
             foreach (var it in list)
             {
                 SMSList model = new SMSList();
@@ -742,10 +760,14 @@ namespace CallCenterApi.Interface.Controllers
                 model.Telephone = it.Telephone;
                 model.Detail = it.Detail;
                 if (it.MBID>0)
-                {
+                {                  
                     var MID = new BLL.T_SMS_Template().GetModel(int.Parse(it.MBID.ToString()));
                     if (MID != null)
-                        model.MBDetail = MID.Name;
+                    {
+                        var modelDic = listDIc.SingleOrDefault(x => x.F_DictionaryValueId.ToString() == MID.Name);
+                        model.NameType = modelDic != null ? modelDic.F_Name : "";    // 短信类型 model.Name;
+                        //model.NameType = MID.Name;
+                    }
                 }
                 model.MID = it.MID;
                 model.MName = it.MName;
@@ -848,7 +870,7 @@ namespace CallCenterApi.Interface.Controllers
             public string IsSend;
             public string Telephone;
             public string Detail;
-            public string MBDetail;
+            public string NameType;
             public string MID;
             public string MName;
             public string CreateDate;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SeatGroupController.cs

@@ -32,7 +32,7 @@ namespace CallCenterApi.Interface.Controllers
             string sql = "";
             if (strcontent!=null&&strcontent != "")
             {
-                sql = " and( F_ZXZCode like '" + strcontent + "' or F_ZXZName  like '" + strcontent + "'  or F_WHBDKey like '" + strcontent + "%'  or F_WHWDKey  like '" + strcontent + "%'  or F_ZXAtt like '" + strcontent + "'  or F_Des like '" + strcontent + "')";
+                sql = " and( F_ZXZCode like '%" + strcontent + "%' or F_ZXZName  like '%" + strcontent + "%'  or F_WHBDKey like '%" + strcontent + "%'  or F_WHWDKey  like '%" + strcontent + "%'  or F_ZXAtt like '%" + strcontent + "%'  or F_Des like '%" + strcontent + "%')";
             }
                 if (strpageindex.Trim() != "")
                 {
@@ -114,14 +114,14 @@ namespace CallCenterApi.Interface.Controllers
                     sModel.F_ZXZCode = input.ZXZCode.Trim();
                 else
                 {
-                    res = Error("编号不能为空");
+                    res = Error("坐席组编号不能为空");
                     return res;
                 }
                 if (input.ZXZName != null)
                     sModel.F_ZXZName = input.ZXZName.Trim();
                 else
                 {
-                    res = Error("名称不能为空");
+                    res = Error("坐席组名称不能为空");
                     return res;
                 }
                 if (input.ZXAtt != null)

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

@@ -851,6 +851,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                                             }
                                     }
                                     dModel.F_CompanyName = dr["客户姓名"].ToString();
+                                dModel.F_LegalName = dr["客户姓名"].ToString();
                                         if (dr["性别"].ToString()=="女")
                                         dModel.F_Gender  =2;
                                        else

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -402,7 +402,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     sql += " and (F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
                         + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
                 }
-                string str = "SELECT  F_Expand1 AS '所属分类',F_Title AS '标题',F_Description AS '关键字',F_Content AS '内容' FROM dbo.T_RepositoryInformation where 1=1 " + sql + " ORDER BY F_RepositoryId desc";
+                string str = "SELECT  F_Expand1 AS '所属分类',F_Title AS '标题',F_KeyWords AS '关键字',F_Content AS '内容' FROM dbo.T_RepositoryInformation where 1=1 " + sql + " ORDER BY F_RepositoryId desc";
                 dt = DbHelperSQL.Query(str).Tables[0];
                 foreach (DataRow dr in dt.Rows)
                 {

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

@@ -129,7 +129,7 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 NPOIHelper npoi = new NPOIHelper();
                 DataTable dt = GetData(stime);
-                if (npoi.ExportToExcel("通话时长数据", dt) == "")
+                if (npoi.ExportToExcel("每日呼叫数据统计", dt) == "")
                 {
                     return Success("导出成功");
                 }

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

@@ -17,9 +17,9 @@ namespace CallCenterApi.Interface.Controllers.report
         public ActionResult GetColumnList()
         {
             ActionResult res = NoToken("未知错误，请重新登录");
-            
-                String[] str = { "部门", "坐席", "坐席工号", "呼入电话数", "坐席接通量", "呼损量"
-                        ,"接通率","呼损率","平均排队时间","接听通话次数","通话分钟数","通话秒数"
+            //"接听通话次数",
+            String[] str = { "部门", "坐席", "坐席工号", "呼入电话数", "坐席接通量", "呼损量"
+                        ,"接通率","呼损率","平均排队时间","通话分钟数","通话秒数"
                         ,"平均接听通话秒数","平均振铃秒数","呼入占有率","用户评价","坐席登录次数"
                         ,"登录时长分钟数","工作时长分钟数","平均每天工作时长（小时）","平均操作分钟数"
                         ,"置忙次数","休息时长分钟数","平均每天休息时长（小时）"
@@ -419,7 +419,7 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc7 = new DataColumn("接通率");
             DataColumn dc8 = new DataColumn("呼损率");
             DataColumn dc9 = new DataColumn("平均排队时间");
-            DataColumn dc10 = new DataColumn("接听通话次数");
+            //DataColumn dc10 = new DataColumn("接听通话次数");
             DataColumn dc11 = new DataColumn("通话分钟数");
             DataColumn dc12 = new DataColumn("通话秒数");
             DataColumn dc13 = new DataColumn("平均接听通话秒数");
@@ -446,7 +446,7 @@ namespace CallCenterApi.Interface.Controllers.report
             dtNew.Columns.Add(dc7);
             dtNew.Columns.Add(dc8);
             dtNew.Columns.Add(dc9);
-            dtNew.Columns.Add(dc10);
+            //dtNew.Columns.Add(dc10);
             dtNew.Columns.Add(dc11);
             dtNew.Columns.Add(dc12);
             dtNew.Columns.Add(dc13);
@@ -614,7 +614,7 @@ namespace CallCenterApi.Interface.Controllers.report
                                 izlms = 0;
                             }
                         }
-                        drNew["接听通话次数"] = ijtcs.ToString();
+                        //drNew["接听通话次数"] = ijtcs.ToString();
                         drNew["通话分钟数"] = (ithms / 60).ToString();
                         drNew["通话秒数"] = ithms.ToString();
 

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

@@ -29,7 +29,7 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                 if (strtelnum != null && strtelnum.Trim() != "")
                 {
-                    sql += " and (F_MobileNum= '" + strtelnum.Trim() + "' or F_ZipCode like '%" + strtelnum.Trim()
+                    sql += " and (F_MobileNum like '%" + strtelnum.Trim() + "%' or F_ZipCode like '%" + strtelnum.Trim()
                         + "%' or F_CityDes like '%" + strtelnum.Trim() + "%'or F_CardDes like '%" + strtelnum.Trim() + "%')";
                 }