禁止外呼bug， 值班电话，登录日志搜索bug

CallCenterApi/CallCenterApi.DAL/T_Call_BanCallOut.cs

@@ -30,12 +30,12 @@ namespace CallCenterApi.DAL
         {
             Model.T_Call_BanCallOut model = new Model.T_Call_BanCallOut();
             var sql = "select F_Id,F_Phone,F_SetTime,F_Remark from T_Call_BanCallOut WHERE F_Phone=@F_Phone";
-            var dt = DbHelperSQL.Query(sql, new SqlParameter("@F_Phone", model.F_Phone)).Tables[0];
+            var dt = DbHelperSQL.Query(sql, new SqlParameter("@F_Phone", phone)).Tables[0];
             if (dt.Rows.Count > 0)
             {
                 model.Id = dt.Rows[0]["F_Id"] == DBNull.Value ? 0 : Convert.ToInt32(dt.Rows[0]["F_Id"]);
                 model.F_Phone = dt.Rows[0]["F_Phone"] == DBNull.Value ? "" : dt.Rows[0]["F_Phone"].ToString();
-                model.F_SetTime = dt.Rows[0]["F_SetTime"] == DBNull.Value ? null : (DateTime?)Convert.ToDateTime(dt.Rows[0]["F_Phone"].ToString());
+                model.F_SetTime = dt.Rows[0]["F_SetTime"] == DBNull.Value ? null : (DateTime?)Convert.ToDateTime(dt.Rows[0]["F_SetTime"].ToString());
                 model.F_Remark = dt.Rows[0]["F_Remark"] == DBNull.Value ? "" : dt.Rows[0]["F_Remark"].ToString();
                 return model;
             }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/LogController.cs

@@ -31,7 +31,7 @@ namespace CallCenterApi.Interface.Controllers
                 }
                 if (filter.LoginDate != null)
                 {
-                    sql += " and CONVERT(varchar , F_LoginDate, 120)>=CONVERT(varchar , '" + filter.LoginDate.ToString() + " 00:00:01', 120) and CONVERT(varchar , F_LoginDate, 120)<=CONVERT(varchar , '" + filter.LoginDate.ToString() + " 23:59:59', 120) ";
+                    sql += $" and DATEDIFF(s,'{Convert.ToDateTime(filter.LoginDate).ToShortDateString()} 00:00:01',F_LoginDate)>=0 and DATEDIFF(s,F_LoginDate,'{Convert.ToDateTime(filter.LoginDate).ToShortDateString()} 23:59:59')>0";
                 }
                 int recordCount = 0;
                 var dt = BLL.PagerBLL.GetListPager(

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/DutyPhoneController.cs

@@ -20,60 +20,60 @@ namespace CallCenterApi.Interface.Controllers.tel
             {
                 string sql = "";
                 DataTable dt = new DataTable();
-               
-                    string strtelnum = HttpUtility.UrlDecode(RequestString.GetQueryString("telnum"));
-                    string strbtime = HttpUtility.UrlDecode(RequestString.GetQueryString("btime"));
-                    string stretime = HttpUtility.UrlDecode(RequestString.GetQueryString("etime"));
 
-                    string strpageindex = RequestString.GetQueryString("page");
-                    int pageindex = 1;
-                    string strpagesize = RequestString.GetQueryString("pagesize");
-                    int pagesize = 10;
+                string strtelnum = HttpUtility.UrlDecode(RequestString.GetQueryString("telnum"));
+                string strbtime = HttpUtility.UrlDecode(RequestString.GetQueryString("btime"));
+                string stretime = HttpUtility.UrlDecode(RequestString.GetQueryString("etime"));
 
-                    if (strtelnum.Trim() != "" && strtelnum != "undefined")
-                    {
-                        sql += " and F_ZBDH like '%" + strtelnum.Trim() + "%' ";
-                    }
-                    if (strbtime.Trim() != "" && strbtime != "undefined")
-                    {
-                        sql += " and F_CreateTime >= '" + Convert.ToDateTime(strbtime.Trim()) + "' ";
-                    }
-                    if (stretime.Trim() != "" && stretime != "undefined")
-                    {
-                        sql += " and F_CreateTime <= '" + Convert.ToDateTime(stretime.Trim()) + "' ";
-                    }
+                string strpageindex = RequestString.GetQueryString("page");
+                int pageindex = 1;
+                string strpagesize = RequestString.GetQueryString("pagesize");
+                int pagesize = 10;
 
-                    if (strpageindex.Trim() != "")
-                    {
-                        pageindex = Convert.ToInt32(strpageindex);
-                    }
+                if (strtelnum.Trim() != "" && strtelnum != "undefined")
+                {
+                    sql += " and F_ZBDH like '%" + strtelnum.Trim() + "%' ";
+                }
+                if (strbtime.Trim() != "" && strbtime != "undefined")
+                {
+                    sql += $" and DATEDIFF(s,'{Convert.ToDateTime(strbtime.Trim()).ToShortDateString()} 00:00:01',F_CreateTime)>=0  ";
+                }
+                if (stretime.Trim() != "" && stretime != "undefined")
+                {
+                    sql += $" and DATEDIFF(s,F_CreateTime,'{Convert.ToDateTime(stretime.Trim()).ToShortDateString()} 23:59:59')>=0  ";
+                }
+
+                if (strpageindex.Trim() != "")
+                {
+                    pageindex = Convert.ToInt32(strpageindex);
+                }
+
+                if (strpagesize.Trim() != "")
+                {
+                    pagesize = Convert.ToInt32(strpagesize);
+                }
+                int recordCount = 0;
+                dt = BLL.PagerBLL.GetListPager(
+               "T_Call_ZBDH",
+               "F_ZBID",
+               "*",
+               sql,
+               "ORDER BY F_ZBID desc",
+               pagesize,
+               pageindex,
+               true,
+               out recordCount);
+
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    rows = dt,
+                    total = recordCount
+                };
+
+                res = Content(obj.ToJson());
 
-                    if (strpagesize.Trim() != "")
-                    {
-                        pagesize = Convert.ToInt32(strpagesize);
-                    }
-                    int recordCount = 0;
-                    dt = BLL.PagerBLL.GetListPager(
-                   "T_Call_ZBDH",
-                   "F_ZBID",
-                   "*",
-                   sql,
-                   "ORDER BY F_ZBID desc",
-                   pagesize,
-                   pageindex,
-                   true,
-                   out recordCount);
-
-                    var obj = new
-                    {
-                        state = "success",
-                        message = "成功",
-                        rows = dt,
-                        total = recordCount
-                    };
-
-                    res = Content(obj.ToJson());
-           
             }
             return res;
         }
@@ -84,25 +84,25 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
-                    if (zbid != null && zbid.Trim() != "")
+
+                if (zbid != null && zbid.Trim() != "")
+                {
+                    BLL.T_Call_ZBDH dBLL = new BLL.T_Call_ZBDH();
+                    Model.T_Call_ZBDH dModel = dBLL.GetModel(int.Parse(zbid.Trim()));
+                    if (dModel != null)
                     {
-                        BLL.T_Call_ZBDH dBLL = new BLL.T_Call_ZBDH();
-                        Model.T_Call_ZBDH dModel = dBLL.GetModel(int.Parse(zbid.Trim()));
-                        if (dModel != null)
-                        {
-                            res = Success("获取值班电话成功", dModel);
-                        }
-                        else
-                        {
-                            res = Error("获取值班电话失败");
-                        }
+                        res = Success("获取值班电话成功", dModel);
                     }
                     else
                     {
-                        res = Error("获取参数失败");
+                        res = Error("获取值班电话失败");
                     }
-           
+                }
+                else
+                {
+                    res = Error("获取参数失败");
+                }
+
             }
             return res;
         }
@@ -113,87 +113,87 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-             
-                    res = Error("操作失败");
-                    if (zbid != null && zbid.Trim() != "")
+
+                res = Error("操作失败");
+                if (zbid != null && zbid.Trim() != "")
+                {
+                    BLL.T_Call_ZBDH dBLL = new BLL.T_Call_ZBDH();
+                    Model.T_Call_ZBDH dModel = dBLL.GetModel(int.Parse(zbid.Trim()));
+                    if (dModel != null)
                     {
-                        BLL.T_Call_ZBDH dBLL = new BLL.T_Call_ZBDH();
-                        Model.T_Call_ZBDH dModel = dBLL.GetModel(int.Parse(zbid.Trim()));
-                        if (dModel != null)
-                        {
-                       
+
                         if (!Validate.IsNumber(telphone.Trim()))
                         {
                             res = Error("电话号码必须为数字！");
                             return res;
                         }
-                            dModel.F_ZBDH = telphone.Trim();
-                            dModel.F_Remark = des.Trim();
-
-                            bool b = dBLL.Update(dModel);
-                            if (b)
-                            {
-                                res = Success("编辑成功");
-                            }
-                            else
-                            {
-                                res = Error("编辑失败");
-                            }
+                        dModel.F_ZBDH = telphone.Trim();
+                        dModel.F_Remark = des.Trim();
+
+                        bool b = dBLL.Update(dModel);
+                        if (b)
+                        {
+                            res = Success("编辑成功");
+                        }
+                        else
+                        {
+                            res = Error("编辑失败");
                         }
                     }
-                    else
-                    {
-                        Model.T_Call_ZBDH dModel = new Model.T_Call_ZBDH();
+                }
+                else
+                {
+                    Model.T_Call_ZBDH dModel = new Model.T_Call_ZBDH();
                     if (!Validate.IsNumber(telphone.Trim()))
                     {
                         res = Error("电话号码必须为数字！");
                         return res;
                     }
                     dModel.F_ZBDH = telphone.Trim();
-                        dModel.F_Remark = des.Trim();
-                        dModel.F_CreateBy = CurrentUser.UserData.F_UserName;
-                        dModel.F_CreateID = CurrentUser.UserData.F_UserId;
-                        dModel.F_CreateTime = DateTime.Now;
+                    dModel.F_Remark = des.Trim();
+                    dModel.F_CreateBy = CurrentUser.UserData.F_UserName;
+                    dModel.F_CreateID = CurrentUser.UserData.F_UserId;
+                    dModel.F_CreateTime = DateTime.Now;
 
-                        int b = new BLL.T_Call_ZBDH().Add(dModel);
-                        if (b > 0)
-                        {
-                            res = Success("添加成功");
-                        }
-                        else
-                        {
-                            res = Error("添加失败");
-                        }
+                    int b = new BLL.T_Call_ZBDH().Add(dModel);
+                    if (b > 0)
+                    {
+                        res = Success("添加成功");
                     }
-            
+                    else
+                    {
+                        res = Error("添加失败");
+                    }
+                }
+
             }
             return res;
         }
-        
+
         //删除值班电话
         public ActionResult DelDutyPhone(string[] ids)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
-         
-                if (ids != null && ids.Length > 0)
+
+            if (ids != null && ids.Length > 0)
+            {
+                string idd = " ";
+                foreach (string str in ids)
                 {
-                    string idd = " ";
-                    foreach (string str in ids)
-                    {
-                        idd += str + ",";
-                    }
-                    if (new BLL.T_Call_ZBDH().DeleteList(idd.TrimEnd(',')))
-                    {
-                        res = Success("删除成功");
-                    }
-                    else
-                        res = Error("删除失败");
+                    idd += str + ",";
                 }
-                else
+                if (new BLL.T_Call_ZBDH().DeleteList(idd.TrimEnd(',')))
                 {
-                    res = Error("请选择要删除的记录");
+                    res = Success("删除成功");
                 }
-         
+                else
+                    res = Error("删除失败");
+            }
+            else
+            {
+                res = Error("请选择要删除的记录");
+            }
+
             return res;
         }
     }