修改bug

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -250,9 +250,9 @@ namespace CallCenterApi.Interface.Controllers
                         }
 
                         BLL.T_Wo_WorkOrder bll = new BLL.T_Wo_WorkOrder();
-                        var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
+                        var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and (State =" + (int)EnumWorkOrderState.finish + " or State =" + (int)EnumWorkOrderState.evaluate  + ") and IsDel=0 ").Tables[0];
                         var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State <" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
-                        var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
+                        var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and (State =" + (int)EnumWorkOrderState.finish + "or State =" + (int)EnumWorkOrderState.evaluate + ") and IsDel=0 ").Tables[0];
                         var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State <" + (int)EnumWorkOrderState.finish + " and IsDel=0 ").Tables[0];
                         #region
                         //var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =2 and IsDel=0 ").Tables[0];

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

@@ -125,7 +125,7 @@ namespace CallCenterApi.Interface.Controllers
                 }
                 if (!string.IsNullOrWhiteSpace(userCode))
                 {
-                    sql += " and F_UserCode=" + userCode;
+                    sql += " and F_UserCode='" + userCode+"'";
                 }
                 if (string.IsNullOrWhiteSpace(sql))
                     return Error("获取失败");

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

@@ -20,7 +20,10 @@ namespace CallCenterApi.Interface.Controllers.report
             ActionResult res = NoToken("未知错误，请重新登录");
          
                 ArrayList arrlist = new ArrayList();
-                
+            if (!string.IsNullOrEmpty(beginyear) && beginyear == endyear)
+            {
+                return Error("请选择不同的年份");
+            }
                 if (beginyear != null && beginyear.Trim() != "")
                 {
                     //var data = new
@@ -83,8 +86,12 @@ namespace CallCenterApi.Interface.Controllers.report
         public ActionResult ExptList(string beginyear, string endyear)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
+            if (!string.IsNullOrEmpty(beginyear) && beginyear == endyear)
+            {
+                return Error("请选择不同的年份");
+            }
             //if (Request.IsAuthenticated)
-            if(1==1)
+            if (1==1)
             {
                 NPOIHelper npoi = new NPOIHelper();
                 DataTable dt = GetData(beginyear, endyear);

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

@@ -33,7 +33,7 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                     if (strtelnum != null && strtelnum.Trim() != "")
                     {
-                        sql += " and F_Phone like'" + strtelnum.Trim() + "%' ";
+                        sql += " and F_Phone like'%" + strtelnum.Trim() + "%' ";
                     }
                     if (strsettime.Trim() != "" && strsettime != "undefined")
                     {

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

@@ -418,11 +418,11 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                         if (stime.Trim() != "" && stime != "undefined")
                         {
-                            sql += " and F_Date > '" + Convert.ToDateTime(stime.Trim()) + "' ";
+                            sql += " and F_Date >= '" + Convert.ToDateTime(stime.Trim()+" 00:00:00") + "' ";
                         }
                         if (etime.Trim() != "" && etime != "undefined")
                         {
-                            sql += " and F_Date < '" + Convert.ToDateTime(etime.Trim()) + "' ";
+                            sql += " and F_Date <= '" + Convert.ToDateTime(etime.Trim()+" 23:59:59") + "' ";
                         }
                         sql += " and F_CreateUser='" + usercode + "' ";
                         if (strpageindex.Trim() != "")

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

@@ -63,7 +63,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     if (customerTel.Trim() != "" && customerTel != "undefined")
                     {
-                        sql += "and  CustomerTel=" + customerTel;
+                        sql += "and  CustomerTel='" + customerTel+"'";
                     }
                     if (strpageindex.Trim() != "")
                     {