bug

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

                 string strpagesize = RequestString.GetQueryString("pagesize");
                 int pagesize = 10;
 
+              
                 if (keyword.Trim() != "" && keyword != "undefined")
                 {
-                    sql += $" and (F_Telephone like '%" + keyword.Trim() + "%' or F_Physician like '%" + keyword.Trim() + "%' or F_Title like '%" + keyword.Trim() + "%') ";
+                    var modelfept = new BLL.T_Sys_Department().GetModelList("F_DeptName='"+ keyword.Trim()+"'").FirstOrDefault ();
+                    if (modelfept!=null )
+                    {
+                        sql += $" and (F_Department  ='" + modelfept.F_DeptId  + "' or F_Section= '" + modelfept.F_DeptId + "') ";
+                    }
+                    else
+                    sql += $" and ( F_Telephone like'%" + keyword.Trim() + "%' or F_Title like'%" + keyword.Trim() + "%'" + "or F_Physician like'%" + keyword.Trim() + "%') ";
+
                 }
                 if (strtel.Trim() != "" && strtel != "undefined")
                 {
                         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").Tables[0]).ToList();
                         foreach (DataRow dr in dt.Rows)
                         {
                           
                                     var model_Dept = list_Dep.SingleOrDefault(x => x.F_DeptName.Equals(dr["部门"].ToString()));
                                     var model_Sec = list_Dep.SingleOrDefault(x => x.F_DeptName.Equals(dr["科室"].ToString()));
                                     dModel.F_Department = model_Dept != null ? model_Dept.F_DeptId : 0;     //dr["部门"].ToString();
+                              
                                     dModel.F_Section = model_Sec != null ? model_Sec.F_DeptId : 0;    //dr["科室"].ToString();
                                     dModel.F_Telephone = dr["电话"].ToString();
 
                                     {
                                         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/SMSController.cs

                         true,
                         out recordCount);
                 List<Model.T_SMS_Template> modlelist = new BLL.T_SMS_Template().DataTableToList(dt);
+              List <  Sms> sms = Template(modlelist);
                 var obj = new
                 {
                     state = "success",
                     message = "成功",
-                    rows = modlelist,
+                    rows = sms,
                     total = recordCount
 
                 };
             if (userId != 0)
             {
                 Model.T_SMS_Template dModel = new Model.T_SMS_Template();
+                string NameTyoe = "";
                 if (string.IsNullOrEmpty(name.Trim()))
                     return Error("短信类型不能为空！");
                 var model = new BLL.T_SMS_Template().GetModelList($"Name like '%" + name.Trim() + "%'").FirstOrDefault();
+                 
                 if (model == null)
                     return Error("查询不到此模板！");
-                return Success("获取成功", model);
+                Sms sms = Template(model);
+
+                return Success("获取成功", sms);
             }
             else
                 return Error("无操作权限！");
         }
+        public List <Sms> Template(List<Model.T_SMS_Template> sms)
+        {
+
+            List<Sms> SMS = new List<Sms>();
+            if (sms!=null )
+            {
+                foreach (var it in sms)
+                {
+                    Sms t_SMS = new Sms();
+                    t_SMS.ID = it.ID;
+                    t_SMS.Name = it.Name;
+                    t_SMS.Detail = it.Detail;
+                    t_SMS.IsEnable = it.IsEnable;
+                    t_SMS.MID = it.MID;
+                    t_SMS.MName = it.MName;
+                    t_SMS.CreateDate = it.CreateDate;
+                    string NameType = "";
+                    try
+                    {
+                        var dic = new BLL.T_Sys_DictionaryValue().GetModel(int.Parse(it.Name));
+                        if (dic != null)
+                            NameType = dic.F_Name;
+                    }
+                    catch
+                    {
+                        NameType = it.Name;
+                    }
+                    t_SMS.NameType = NameType;
+                    SMS.Add(t_SMS);
+                }
+            }
+          
+            return SMS;
+        }
+        public Sms Template(Model.T_SMS_Template sms )
+        {
+            Sms t_SMS = new Sms();
+            t_SMS.ID = sms.ID;
+            t_SMS.Name = sms.Name;
+            t_SMS.Detail = sms.Detail;
+            t_SMS.IsEnable = sms.IsEnable;
+            t_SMS.MID = sms.MID;
+            t_SMS.MName = sms.MName;
+            t_SMS.CreateDate = sms.CreateDate;
+            string NameType = "";
+            try
+            {
+                var dic = new BLL.T_Sys_DictionaryValue().GetModel(int.Parse(sms.Name));
+                if (dic != null)
+                    NameType = dic.F_Name;
+            }
+            catch
+            {
+                NameType = sms.Name;
+            }
+            t_SMS.NameType = NameType;
+            return t_SMS;
+        }
         /// <summary>
         /// 获取模板详情
         /// </summary>
             if (userId != 0)
             {
                 Model.T_SMS_Template dModel = new Model.T_SMS_Template();
-
+                string NameTyoe = "";
                 if (id <= 0)
                     return Error("参数错误！");
                 var model = new BLL.T_SMS_Template().GetModel(id);
                 if (model == null)
                     return Error("查询不到此模板！");
+                Sms sms = Template(model);
+
 
-                return Success("获取成功", model);
+                return Success("获取成功", sms);
             }
             else
                 return Error("无操作权限！");
         }
+        public class Sms
+        {
+            public int ID
+            {
+                get;set;
+            }
+            public string Name
+            {
+                get; set;
+            }
+        
+            public string Detail
+            {
+                get; set;
+            }
+            public int? IsEnable
+            {
+                get; set;
+            }
+           
+            public string MID
+            {
+                get; set;
+            }
+       
+            public string MName
+            {
+                get; set;
+            }
+            public DateTime? CreateDate
+            {
+                get; set;
+            }
+            public string NameType
+            {
+                get; set;
+            }
+        }
         /// <summary>
         /// 导入excel
         /// </summary>
             dt.Columns.Add("发送时间");
             dt.Columns.Add("短信类型");
             dt.Columns.Add("发送人");
-            var itemlist = new BLL.T_SMS_List().GetModelList(sql);
+            var itemlist = new BLL.T_SMS_List().GetModelList(sql+ "order by ID desc");
+            int i = 1;
             foreach (var it in itemlist)
             {
+               
                 DataRow drNew = dt.NewRow();
-                drNew["编号"] =it .ID ;
+                drNew["编号"] = i++;
                 drNew["接收号码"] = it.Telephone ;
                 drNew["发送内容"] = it.Detail ;
                 if (it .SendWay==0 )

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

             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
             if (string.IsNullOrEmpty(tel))
-                return Error("电话不能为空！");            
+                return Error("客户电话不能为空！");            
             string sql = " and F_DeleteFlag = 0 ";
             if (!string.IsNullOrEmpty(tel))
                 sql += " and F_Mobile = '" + tel + "' ";
                     return Error("编号已被占用，请重新输入！");
             }
             if (string.IsNullOrEmpty(input.F_LegalName))
-                return Error("姓名不能为空！");
+                return Error("客户姓名不能为空！");
             if (string.IsNullOrEmpty(input.F_LegalTel))
-                return Error("电话不能为空！");
+                return Error("客户电话不能为空！");
             if (getunphone(0, input.F_LegalTel))
                 return Error("已存在该客户请勿重复添加");
             #endregion
             if (input.F_CustomerId <= 0)
                 return Error("参数错误！");
             if (string.IsNullOrEmpty(input.F_LegalName))
-                return Error("姓名不能为空！");
+                return Error("客户姓名不能为空！");
             if (string.IsNullOrEmpty(input.F_LegalTel))
-                return Error("电话不能为空！");
+                return Error("客户电话不能为空！");
            
             #endregion
             var model = bll.GetModel(input.F_CustomerId);
             string usercode = CurrentUser.UserData.F_UserCode;
             #region 添加验证判断
             if (string.IsNullOrEmpty(input.F_LegalName))
-                return Error("姓名不能为空！");
+                return Error("客户姓名不能为空！");
             if (string.IsNullOrEmpty(input.F_LegalTel))
-                return Error("电话不能为空！");
+                return Error("客户电话不能为空！");
 
             #endregion
             BLL.T_Cus_CustomerBaseNew bll = new BLL.T_Cus_CustomerBaseNew();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/IndexBaseController.cs

                 }
                 if (!string.IsNullOrWhiteSpace(sort.Trim()))
                 {
-                    dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                    try
+                    {
+                        dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                    }
+                    catch
+                    {
+                        return Error("请输入正确的格式");
+                    }
+                  
                 }
                 if (!string.IsNullOrWhiteSpace(score.Trim()))
                 {
-                    dModel.F_Score = Convert.ToInt32(score.Trim());
+                    try
+                    {
+                        dModel.F_Score = Convert.ToInt32(score.Trim());
+                    }
+                    catch
+                    {
+                        return Error("请输入正确的格式");
+                    }
                 }
                 if (!string.IsNullOrWhiteSpace(title.Trim()))
                 {
                         }
                         if (!string.IsNullOrWhiteSpace(sort.Trim()))
                         {
-                            dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                            try
+                            {
+                                dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                            }
+                            catch
+                            {
+                                return Error("请输入正确的格式");
+                            }
+                           
                         }
                         if (!string.IsNullOrWhiteSpace(score.Trim()))
                         {
-                            dModel.F_Score = Convert.ToInt32(score.Trim());
+                            try
+                            {
+                                dModel.F_Score = Convert.ToInt32(score.Trim());
+                            }
+                            catch
+                            {
+                                return Error("请输入正确的格式");
+                            }
+                           
                         }
                         if (!string.IsNullOrWhiteSpace(title.Trim()))
                         {
                             dModel.F_Title = WebHelper.UrlDecode(title.Trim());
+
                         }
                         if (!string.IsNullOrWhiteSpace(remark.Trim()))
                         {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/IndexCategoryController.cs

                     }
                     if (!string.IsNullOrWhiteSpace(sort.Trim()))
                     {
+                    try
+                    {
                         dModel.F_Sort = Convert.ToInt32(sort.Trim());
                     }
+                    catch
+                    {
+                        return Error("请输入正确的格式");
+                    }
+                   
+                    }
                     if (!string.IsNullOrWhiteSpace(pid.Trim()))
                     {
+                    try
+                    {
                         dModel.F_ParentId = Convert.ToInt32(pid.Trim());
                     }
+                    catch
+                    {
+                        return Error("请输入正确的格式");
+                    }
+                   
+                    }
                     dModel.F_CreateOn = DateTime.Now;
                     dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
                     dModel.F_DeleteFlag = 0;
                             }
                             if (!string.IsNullOrWhiteSpace(sort.Trim()))
                             {
+                            try
+                            {
                                 dModel.F_Sort = Convert.ToInt32(sort.Trim());
                             }
+                            catch
+                            {
+                                return Error("请输入正确的格式");
+                            }
+                           
+                            }
                             if (!string.IsNullOrWhiteSpace(pid.Trim()))
                             {
+                            try
+                            {
                                 dModel.F_ParentId = Convert.ToInt32(pid.Trim());
                             }
+                            catch
+                            {
+                                return Error("请输入正确的格式");
+                            }
+
+                           
+                            }
                             bool b = dBLL.Update(dModel);
                             if (b)
                             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/QCManageController.cs

 
             if (phone.Trim() != "")
             {
-                sql += " and CallNumber='" + phone + "'";
+                sql += " and CallNumber like'%" + phone + "%'";
             }
             if (usercode.Trim() != "")
             {
 
             if (phone.Trim() != "")
             {
-                sql += " and CallNumber='" + phone + "'";
+                sql += " and CallNumber like'%" + phone + "%'";
             }
             if (usercode.Trim() != "")
             {

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

                     drNew["月份"] = (i + 1).ToString() + "月";
                     drNew[beginyear + "年客户呼叫数"] = bkhcall[i];
                     drNew[beginyear + "年坐席接听数"] = bzxjt[i];
-                    drNew[beginyear + "年坐席接听率"] = bjtl[i];
+                    drNew[beginyear + "年接听率"] = bjtl[i];
                     drNew[endyear + "年客户呼叫数"] = ekhcall[i];
                     drNew[endyear + "年坐席接听数"] = ezxjt[i];
-                    drNew[endyear + "年坐席接听率"] = ejtl[i];
+                    drNew[endyear + "年接听率"] = ejtl[i];
                     dtNew.Rows.Add(drNew);
                 }
             }

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

             if (Request.IsAuthenticated)
             {
                 NPOIHelper npoi = new NPOIHelper();
-                DataTable dt = getData(stime, endtime);
+                DataTable dt = getData(stime, endtime,1);
                 if (npoi.ExportToExcel("坐席满意度评价情况", dt) == "")
                 {
                     return Success("导出成功");
             return res;
         }
 
-        private DataTable getData(string stime, string endtime)
+        private DataTable getData(string stime, string endtime,int isdc=0)
         {
             DataTable dtNew = new DataTable();
             #region
                     body.Add(UNDN[1], bodylist);
                 }
             }
-            foreach (string key in body.Keys)
+            if (isdc ==0)
             {
-                DataRow dr = dtNew.NewRow();
-                int count = body[key].Count;
-                foreach (List<string> listiteam in body[key])
+                foreach (string key in body.Keys)
                 {
-                    dr["坐席姓名"] = listiteam[0].ToString();
-                    dr["非常满意"] = listiteam[1].ToString();
-                    dr["非常满意占比"] = listiteam[2].ToString();
-                    dr["基本满意"] = listiteam[3].ToString();
-                    dr["基本满意占比"] = listiteam[4].ToString();
-                    dr["不满意"] = listiteam[5].ToString();
-                    dr["不满意占比"] = listiteam[6].ToString();
-                    dr["未评价"] = listiteam[7].ToString();
-                    dr["未评价占比"] = listiteam[8].ToString();
+                    DataRow dr = dtNew.NewRow();
+                    int count = body[key].Count;
+                    foreach (List<string> listiteam in body[key])
+                    {
+                        dr["坐席姓名"] = listiteam[0].ToString();
+                        dr["非常满意"] = listiteam[1].ToString();
+                        dr["非常满意占比"] = listiteam[2].ToString();
+                        dr["基本满意"] = listiteam[3].ToString();
+                        dr["基本满意占比"] = listiteam[4].ToString();
+                        dr["不满意"] = listiteam[5].ToString();
+                        dr["不满意占比"] = listiteam[6].ToString();
+                        dr["未评价"] = listiteam[7].ToString();
+                        dr["未评价占比"] = listiteam[8].ToString();
+                    }
+                    dtNew.Rows.Add(dr);
                 }
-                dtNew.Rows.Add(dr);
             }
+            else
+            {
+                foreach (string key in body.Keys)
+                {
+                    DataRow dr = dtNew.NewRow();
+                    int count = body[key].Count;
+                    foreach (List<string> listiteam in body[key])
+                    {
+                        dr["坐席姓名"] = listiteam[0].ToString();
+                        dr["非常满意"] = listiteam[1].ToString();
+                        try
+                        {
+                            dr["非常满意占比"] = string.Format("{0:f2}%", int.Parse(listiteam[2]) * 100);
+                        }
+                        catch
+                        {
+                            dr["非常满意占比"] = string.Format("{0:f2}%", 0*100);
+                        }
+                       
+                        dr["基本满意"] = listiteam[3].ToString();
+                        try
+                        {
+                            dr["基本满意占比"] = string.Format("{0:f2}%", int.Parse(listiteam[4]) * 100);
+                        }
+                        catch
+                        {
+                            dr["基本满意占比"] = string.Format("{0:f2}%", 0 * 100);
+                        }
+                      
+                        dr["不满意"] = listiteam[5].ToString();
+                        try
+                        {
+                            dr["不满意占比"] = string.Format("{0:f2}%", int.Parse(listiteam[6]) * 100);
+                        }
+                        catch
+                        {
+                            dr["不满意占比"] = string.Format("{0:f2}%", 0 * 100);
+                        }
+
+                        dr["未评价"] = listiteam[7].ToString();
+                        try
+                        {
+                            dr["未评价占比"] = string.Format("{0:f2}%", int.Parse(listiteam[8]) * 100);
+                        }
+                        catch
+                        {
+                            dr["未评价占比"] = string.Format("{0:f2}%", 0 * 100);
+                        }
+                    }
+                    dtNew.Rows.Add(dr);
+                }
+            }
+           
             return dtNew;
         }
 

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

             return workOrders;
         }
         /// <summary>
+        /// 查询工单记录列表
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public ActionResult GetItemList(int id, int pageindex = 1, int pagesize = 10)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                DataTable dt = new DataTable();
+                string sql = "";
+                string msg = "";
+                if (id <= 0)
+                    return Error("请输入正确的id");
+                sql += " and  F_WoID=" + id + ")";
+                int recordCount = 0;
+                if (!string.IsNullOrWhiteSpace(sql))
+                {
+
+                    dt = BLL.PagerBLL.GetListPager(
+                        "T_Wo_WorkOrderItem_New",
+                        "F_ID",
+                        "*",
+                        sql,
+                        "ORDER BY T_Wo_WorkOrderItem_New.F_ID desc",
+                        pagesize,
+                        pageindex,
+                        true,
+                        out recordCount);
+                }
+                List<Model.T_Wo_WorkOrderItem_New> modlelist = new BLL.T_Wo_WorkOrderItem_New().DataTableToList(dt);
+                if (modlelist.Count > 0)
+                {
+                    var obj = new
+                    {
+                        state = "success",
+                        message = "成功",
+                        rows = modlelist,
+                        total = recordCount
+                    };
+
+                    return Content(obj.ToJson()); ;
+                }
+                else
+                {
+
+                    return Success("暂无工单"); ;
+                }
+            }
+            {
+                return Error("无操作权限！");
+            }
+
+        }
+        /// <summary>
         /// 根据传入的对象和input的内容返回对象（添加修改使用）
         /// </summary>
         private Model.T_Wo_WorkOrderNew inputtoobj(Model.T_Wo_WorkOrderNew model, WorkOrder input, int type)