报表搜索bug调整

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

@@ -33,7 +33,7 @@ namespace CallCenterApi.Interface.Controllers
                     sql += " and F_LoginName like '%" + filter.Name + "%' ";
                 }
                 //登录时间
-                if (!string.IsNullOrEmpty(filter.SDate))
+                if (!string.IsNullOrWhiteSpace(filter.SDate))
                 {
                     sql += " and CONVERT(varchar , F_LoginDate, 120)>=CONVERT(varchar , '" + filter.SDate.ToString() + " 00:00:01', 120) ";
                 }
@@ -42,12 +42,12 @@ namespace CallCenterApi.Interface.Controllers
                     sql+= "and CONVERT(varchar , F_LoginDate, 120)<=CONVERT(varchar , '" + filter.EDate.ToString() + " 23:59:59', 120) ";
                 }
                 //条件查询--登录结果
-                if (!string.IsNullOrEmpty(filter.Results))
+                if (!string.IsNullOrWhiteSpace(filter.Results))
                 {
                     sql += " and F_Result like '%" + filter.Results + "%'";
                 }
                 //条件查询--登录IP
-                if (!string.IsNullOrEmpty(filter.LoginIP))
+                if (!string.IsNullOrWhiteSpace(filter.LoginIP))
                 {
                     sql += " and F_LoginIP like '%" + filter.LoginIP + "%'";
                 }
@@ -120,7 +120,7 @@ namespace CallCenterApi.Interface.Controllers
                     sql += " and F_OptName like '%" + filter.Name + "%' ";
                 }
                 //操作时间
-                if (!string.IsNullOrEmpty(filter.SDate))
+                if (!string.IsNullOrWhiteSpace(filter.SDate))
                 {
                     sql += " and CONVERT(varchar , F_OptOn, 120)>=CONVERT(varchar , '" + filter.SDate.ToString() + " 00:00:01', 120) ";
                 }
@@ -129,7 +129,7 @@ namespace CallCenterApi.Interface.Controllers
                     sql += "and CONVERT(varchar , F_OptOn, 120)<=CONVERT(varchar , '" + filter.EDate.ToString() + " 23:59:59', 120) ";
                 }
                 //条件查询--操作结果
-                if (!string.IsNullOrEmpty(filter.Results))
+                if (!string.IsNullOrWhiteSpace(filter.Results))
                 {
                     sql += " and F_Descript like '%" + filter.Results + "%'";
                 }

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

@@ -72,12 +72,12 @@ namespace CallCenterApi.Interface.Controllers.report
             int CallNoTotalSummaryTime = 0;
             #region 时间搜索
             string sqllog = "", sqlzm = "";
-            if (stime != "")
+            if (!string.IsNullOrWhiteSpace(stime))
             {
                 sqlzm += " and DATEDIFF(d,F_OptOn,'" + stime + "')<=0";
                 sqllog += " and datediff(d,F_LoginOutDate,'" + stime + "')<=0";
             }
-            if (endtime != "")
+            if (!string.IsNullOrWhiteSpace(endtime))
             {
                 sqlzm += " and DATEDIFF(d,F_OptOn,'" + endtime + "')>=0";
                 sqllog += " and datediff(d,F_LoginOutDate,'" + endtime + "')>=0";
@@ -86,9 +86,9 @@ namespace CallCenterApi.Interface.Controllers.report
 
             #region 根据条件获取所需数据
             var userAccountList = new BLL.T_Sys_UserAccount().GetModelList("F_DeleteFlag=0 AND F_SeatRight=0");
-            DataTable dtno = DbHelperSQL.Query("select F_OptTime as TalkNoTotalTime,* from T_Sys_CallOptLogs where F_State=2 and F_OptBy in (select F_UserId from T_Sys_UserAccount where F_StateFlag=1 AND F_SeatRight=0)" + sqlzm).Tables[0];
+            DataTable dtno = DbHelperSQL.Query("select F_OptTime as TalkNoTotalTime,* from T_Sys_CallOptLogs where F_State=2 and F_OptBy in (select F_UserId from T_Sys_UserAccount where F_DeleteFlag=0 AND F_SeatRight=0)" + sqlzm).Tables[0];
 
-            DataTable dtLoginLog = DbHelperSQL.Query("SELECT ISNULL(DATEDIFF(s,F_LoginDate,F_LoginOutDate),0) as SummaryOnLine,* FROM dbo.T_Sys_LoginLogs where F_LoginId in (select F_UserId from T_Sys_UserAccount where F_StateFlag=1 and  F_SeatRight=0) " + sqllog + " ORDER BY F_LoginDate DESC ").Tables[0];
+            DataTable dtLoginLog = DbHelperSQL.Query("SELECT ISNULL(DATEDIFF(s,F_LoginDate,F_LoginOutDate),0) as SummaryOnLine,* FROM dbo.T_Sys_LoginLogs where F_LoginId in (select F_UserId from T_Sys_UserAccount where F_DeleteFlag=0 and  F_SeatRight=0) " + sqllog + " ORDER BY F_LoginDate DESC ").Tables[0];
             #endregion
             foreach (Model.T_Sys_UserAccount item in userAccountList)
             {

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

@@ -29,12 +29,12 @@ namespace CallCenterApi.Interface.Controllers.report
             if (type>=1)
             {
                 begintime = DateTime.Now.ToString("yyyy-MM-dd 00:00:01");
-                if (!string.IsNullOrEmpty(sdate))
+                if (!string.IsNullOrWhiteSpace(sdate))
                 {
                     begintime = sdate + " 00:00:01";
                 }
 
-                if (!string.IsNullOrEmpty(edate))
+                if (!string.IsNullOrWhiteSpace(edate))
                 {
                     endtime = edate + " 23:59:59";
                 }

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

@@ -81,26 +81,26 @@ namespace CallCenterApi.Interface.Controllers.report
             DateTime beginTime;
             DateTime endTime;
             string sql = "", sqllog = "";
-            if (stime != "")
+            if (!string.IsNullOrWhiteSpace(stime))
                 beginTime = DateTime.Parse(stime);
             else
                 beginTime = DateTime.Parse(DateTime.Now.AddDays(-days).ToShortDateString());
 
-            if (endtime != "")
+            if (!string.IsNullOrWhiteSpace(endtime))
                 endTime = DateTime.Parse(endtime + " 23:59:59");
             else
                 endTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " 23:59:59");
 
-            sql += " and DATEDIFF(d,BeginTime,'" + beginTime + "')<=0";
-            sql += " and DATEDIFF(d,BeginTime,'" + endTime + "')>=0";
-            sqllog += " and datediff(d,F_LoginOutDate,'" + beginTime + "')<=0";
-            sqllog += " and datediff(d,F_LoginOutDate,'" + endTime + "')>=0";
+            sql += " and DATEDIFF(d,BeginTime,'" + beginTime.ToString("yyyy-MM-dd") + "')<=0";
+            sql += " and DATEDIFF(d,BeginTime,'" + endTime.ToString("yyyy-MM-dd") + "')>=0";
+            sqllog += " and datediff(d,F_LoginOutDate,'" + beginTime.ToString("yyyy-MM-dd") + "')<=0";
+            sqllog += " and datediff(d,F_LoginOutDate,'" + endTime.ToString("yyyy-MM-dd") + "')>=0";
             #endregion
 
             #region 根据条件获取所需数据
-            DataTable dt = DbHelperSQL.Query("select ISNULL(DATEDIFF(s,TalkStartTime,TalkEndTime),0) as TalkTotalTime,* from T_Call_CallRecords where userid in (select F_UserId from T_Sys_UserAccount where F_StateFlag=1 AND F_SeatRight=0) and calltype=0" + sql).Tables[0];//BusinessType=0代表ivr中选择了转人工,calltype=0代表呼入
+            DataTable dt = DbHelperSQL.Query("select ISNULL(DATEDIFF(s,TalkStartTime,TalkEndTime),0) as TalkTotalTime,* from T_Call_CallRecords where userid in (select F_UserId from T_Sys_UserAccount where F_DeleteFlag=0 AND F_SeatRight=0) and calltype=0" + sql).Tables[0];//BusinessType=0代表ivr中选择了转人工,calltype=0代表呼入
 
-            DataTable dtLoginLog = DbHelperSQL.Query("SELECT ISNULL(DATEDIFF(s,F_LoginDate,F_LoginOutDate),0) as SummaryOnLine,* FROM dbo.T_Sys_LoginLogs where F_LoginId in (select F_UserId from T_Sys_UserAccount where F_StateFlag=1 and  F_SeatRight=0) " + sqllog + "  ORDER BY F_LoginDate DESC ").Tables[0];
+            DataTable dtLoginLog = DbHelperSQL.Query("SELECT ISNULL(DATEDIFF(s,F_LoginDate,F_LoginOutDate),0) as SummaryOnLine,* FROM dbo.T_Sys_LoginLogs where F_LoginId in (select F_UserId from T_Sys_UserAccount where F_DeleteFlag=0 and  F_SeatRight=0) " + sqllog + "  ORDER BY F_LoginDate DESC ").Tables[0];
             #endregion
             for (DateTime t = beginTime; t <= endTime; t = t.AddDays(1))
             {

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

@@ -79,13 +79,13 @@ namespace CallCenterApi.Interface.Controllers.report
             string sql = ""; // 呼入
             string sqlzm = ""; // 置忙
             string sqlzx = "";//在线
-            if (stime != "")
+            if (!string.IsNullOrWhiteSpace(stime))
             {
                 sql += " and DATEDIFF(d,BeginTime,'" + stime + "')<=0";
                 sqlzm += " and DATEDIFF(d,F_OptOn,'" + stime + "')<=0";
                 sqlzx += " and DATEDIFF(d,F_LoginOutDate,'" + stime + "')<=0";
             }
-            if (endtime != "")
+            if (!string.IsNullOrWhiteSpace(endtime))
             {
                 sql += " and DATEDIFF(d,BeginTime,'" + endtime + "')>=0";
                 sqlzm += " and DATEDIFF(d,F_OptOn,'" + endtime + "')>=0";
@@ -94,11 +94,11 @@ namespace CallCenterApi.Interface.Controllers.report
             #endregion
 
             #region 根据条件获取所需数据
-            DataTable dt = DbHelperSQL.Query("select ISNULL(DATEDIFF(s,TalkStartTime,TalkEndTime),0) as TalkTotalTime,* from View_CallRecordList where  userid in (select F_UserId from T_Sys_UserAccount where F_StateFlag=1 AND F_SeatRight=0) and CallState=1" + sql).Tables[0];
+            DataTable dt = DbHelperSQL.Query("select ISNULL(DATEDIFF(s,TalkStartTime,TalkEndTime),0) as TalkTotalTime,* from View_CallRecordList where  userid in (select F_UserId from T_Sys_UserAccount where F_DeleteFlag=0 AND F_SeatRight=0) and CallState=1" + sql).Tables[0];
 
-            DataTable dtno = DbHelperSQL.Query("select F_OptTime as TalkNoTotalTime,* from T_Sys_CallOptLogs where F_State=2 and F_OptBy in (select F_UserId from T_Sys_UserAccount where F_StateFlag=1 AND F_SeatRight=0)" + sqlzm).Tables[0];
+            DataTable dtno = DbHelperSQL.Query("select F_OptTime as TalkNoTotalTime,* from T_Sys_CallOptLogs where F_State=2 and F_OptBy in (select F_UserId from T_Sys_UserAccount where F_DeleteFlag=0 AND F_SeatRight=0)" + sqlzm).Tables[0];
 
-            DataTable dtLoginLog = DbHelperSQL.Query("SELECT ISNULL(DATEDIFF(s,F_LoginDate,F_LoginOutDate),0) as SummaryOnLine,* FROM dbo.T_Sys_LoginLogs where F_LoginId in (select F_UserId from T_Sys_UserAccount where F_StateFlag=1 and  F_SeatRight=0) " + sqlzx + "  ORDER BY F_LoginDate DESC ").Tables[0];
+            DataTable dtLoginLog = DbHelperSQL.Query("SELECT ISNULL(DATEDIFF(s,F_LoginDate,F_LoginOutDate),0) as SummaryOnLine,* FROM dbo.T_Sys_LoginLogs where F_LoginId in (select F_UserId from T_Sys_UserAccount where F_DeleteFlag=0 and  F_SeatRight=0) " + sqlzx + "  ORDER BY F_LoginDate DESC ").Tables[0];
             #endregion
             foreach (Model.T_Sys_UserAccount item in userAccountList)
             {

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

@@ -68,11 +68,11 @@ namespace CallCenterApi.Interface.Controllers.report
             #endregion
 
             string time = "";
-            if (stime != null && stime.Trim() != "")
+            if (!string.IsNullOrWhiteSpace(stime))
             {
                 time += " and CONVERT(varchar , BeginTime, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
             }
-            if (endtime != null && endtime.Trim() != "")
+            if (!string.IsNullOrWhiteSpace(endtime))
             {
                 time += " and CONVERT(varchar , BeginTime, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }