xiugai

RMYY_CallCenter_Api/Controllers/GroupClassController.cs

@@ -115,18 +115,7 @@ namespace RMYY_CallCenter_Api.Controllers
       
             string strsql = " select *,dbo.GetUserName(F_UserCode) as UserName,[dbo].[GetClassNameByClassCode](F_ClassCode) ClassName,CONVERT(varchar(10),F_Date) F_DateStr from T_Sys_GroupClass"+ where;
 
-            dt = DbHelperSQL.Query(strsql).Tables[0];
-
-            //dt = Bll.PagerBll.GetListPager(
-            //    "T_Sys_GroupClass",
-            //    "F_Id",
-            //    cols,
-            //    sql,
-            //    "ORDER BY F_Date DESC",
-            //    pagesize,
-            //    pageindex,
-            //    true,
-            //    out recordCount);
+            dt = DbHelperSQL.Query(strsql).Tables[0]; 
 
             var obj = new
             {
@@ -172,6 +161,11 @@ namespace RMYY_CallCenter_Api.Controllers
             DateTime starttime = Convert.ToDateTime(stime);
 
             DateTime  lasttime = Convert.ToDateTime(endtime);
+
+            var groupclasslist = new Bll.T_Sys_GroupClass().GetModelList("F_ClassCode='" + classcode + "' and F_Date>='" + stime + "' and   F_Date<='" + lasttime + "' and F_DeptId='" + deptid + "' and F_IsDelete=0 ");
+
+            var T_Sys_WorkOFFDayslist = new Bll.T_Sys_WorkOffDays().GetModelList("F_OffDate>='" + starttime.ToString("yyyy-MM-dd") + "' and F_OffDate<='" + lasttime.ToString("yyyy-MM-dd") + "'and F_OffState=0");
+
             //固定
             if (type == 0)
             {
@@ -185,15 +179,16 @@ namespace RMYY_CallCenter_Api.Controllers
                         foreach (string strusercode in userlist)
                         {
                             Model.T_Sys_GroupClass dModel = new Model.T_Sys_GroupClass();
-                            var list = new Bll.T_Sys_GroupClass().GetModelList(" F_ClassCode='" + classcode + "' and F_Date='" + time + "' and F_DeptId='" + deptid + "' and F_IsDelete=0  and F_UserCode='" + usercode + "'");
-                            if (list.Count > 0)
+                            var list= groupclasslist.Where(x => x.F_UserCode == strusercode && x.F_Date == time).ToList();
+
+                            //var list = new Bll.T_Sys_GroupClass().GetModelList(" F_ClassCode='" + classcode + "' and F_Date='" + time + "' and F_DeptId='" + deptid + "' and F_IsDelete=0  and F_UserCode='" + strusercode + "'");
+                            if (list!=null&& list.Count() > 0)
                             {
                                 continue;
                             }
                             else
                             {
-                                //添加值班信息
-                               
+                                //添加值班信息                               
                                     dModel.F_UserCode = strusercode;
                                     dModel.F_Date = time;
                                     dModel.F_DeptId = deptid;
@@ -203,8 +198,6 @@ namespace RMYY_CallCenter_Api.Controllers
                                     dModel.F_CreateUser = User.F_UserCode;
                                     dModel.F_CreateTime = DateTime.Now;
                                     long n = new Bll.T_Sys_GroupClass().Add(dModel);
-                                
-                               
                             }
                         }
 
@@ -223,9 +216,10 @@ namespace RMYY_CallCenter_Api.Controllers
                 {
                     for (DateTime time = starttime; time <= lasttime; time = time.AddDays(1))
                     {
-                        string sql = "select count(1) from T_Sys_WorkOFFDays  where F_OffDate='"+time+"' and F_OffState=0";
-                        int n = Convert.ToInt32( DbHelperSQL.GetSingle(sql).ToString());
-                        if (n > 0)
+                        var n = T_Sys_WorkOFFDayslist.Where(x => x.F_OffDate == time).ToList();
+                        //string sql = "select count(1) from T_Sys_WorkOFFDays  where F_OffDate='"+time+"' and F_OffState=0";
+                        //int n = Convert.ToInt32( DbHelperSQL.GetSingle(sql).ToString());
+                        if (n!=null&& n.Count()  > 0)
                         {
                             continue;
                         }
@@ -235,8 +229,12 @@ namespace RMYY_CallCenter_Api.Controllers
                         foreach (string strusercode in userlist)
                         {
                             Model.T_Sys_GroupClass dModel = new Model.T_Sys_GroupClass();
-                            var list = new Bll.T_Sys_GroupClass().GetModelList(" F_ClassCode='" + classcode + "' and F_Date='" + time + "' and F_DeptId='" + deptid + "' and F_IsDelete=0  and F_UserCode='" + usercode + "'");
-                            if (list.Count > 0)
+                            //var list = new Bll.T_Sys_GroupClass().GetModelList(" F_ClassCode='" + classcode + "' and F_Date='" + time + "' and F_DeptId='" + deptid + "' and F_IsDelete=0  and F_UserCode='" + usercode + "'");
+                            //if (list.Count > 0)
+                            var list = groupclasslist.Where(x => x.F_UserCode == strusercode && x.F_Date == time).ToList();
+
+                         
+                            if (list != null && list.Count() > 0)
                             {
                                 continue;
                             }
@@ -282,8 +280,12 @@ namespace RMYY_CallCenter_Api.Controllers
                             DateTime newdt = time.AddDays(i);
 
                             Model.T_Sys_GroupClass dModel = new Model.T_Sys_GroupClass();
-                            var list = new Bll.T_Sys_GroupClass().GetModelList(" F_ClassCode='" + classcode + "' and F_Date='" + newdt + "' and F_DeptId='" + deptid + "' and F_IsDelete=0  and F_UserCode='" + struserlist[useri] + "'");
-                            if (list.Count > 0)
+                            //var list = new Bll.T_Sys_GroupClass().GetModelList(" F_ClassCode='" + classcode + "' and F_Date='" + newdt + "' and F_DeptId='" + deptid + "' and F_IsDelete=0  and F_UserCode='" + struserlist[useri] + "'");
+                            //if (list.Count > 0)
+                            var list = groupclasslist.Where(x => x.F_UserCode == struserlist[useri] && x.F_Date == newdt).ToList();
+
+
+                            if (list != null && list.Count() > 0)
                             {
                                 continue;
                             }
@@ -316,8 +318,13 @@ namespace RMYY_CallCenter_Api.Controllers
                 //跳过节假日
                 else
                 {
-                    var T_Sys_WorkOFFDays = new Bll.T_Sys_WorkOffDays().GetModelList("F_OffDate>='" + starttime.ToString("yyyy-MM-dd") + "' and F_OffDate<='" + lasttime.ToString("yyyy-MM-dd") + "'and F_OffState=0");
-                    int useri = 0;
+                    //var T_Sys_WorkOFFDays = new Bll.T_Sys_WorkOffDays().GetModelList("F_OffDate>='" + starttime.ToString("yyyy-MM-dd") + "' and F_OffDate<='" + lasttime.ToString("yyyy-MM-dd") + "'and F_OffState=0");
+
+                  //  var n = T_Sys_WorkOFFDayslist.Where(x => x.F_OffDate == time).ToList();
+                    ////string sql = "select count(1) from T_Sys_WorkOFFDays  where F_OffDate='"+time+"' and F_OffState=0";
+                    ////int n = Convert.ToInt32( DbHelperSQL.GetSingle(sql).ToString());
+                    //if (n != null && n.Count() > 0)
+                        int useri = 0;
                     for (DateTime time = starttime; time <= lasttime; time = time.AddDays(rotationdays))
                     {
                        
@@ -331,9 +338,9 @@ namespace RMYY_CallCenter_Api.Controllers
                         for (int i = 0; i < days; i++)
                         {
                             DateTime newdt = time.AddDays(i);
-                            if (T_Sys_WorkOFFDays != null && T_Sys_WorkOFFDays.Count > 0)
+                            if (T_Sys_WorkOFFDayslist != null && T_Sys_WorkOFFDayslist.Count() > 0)
                             {
-                                if (T_Sys_WorkOFFDays.Where(x => x.F_OffDate.Value.ToString("yyyy-MM-dd") == newdt.ToString("yyyy-MM-dd")).Count() > 0)
+                                if (T_Sys_WorkOFFDayslist.Where(x => x.F_OffDate.Value.ToString("yyyy-MM-dd") == newdt.ToString("yyyy-MM-dd")).Count() > 0)
                                 {
                                     days += 1;
                                    
@@ -342,8 +349,11 @@ namespace RMYY_CallCenter_Api.Controllers
                                 }
                             }
                             Model.T_Sys_GroupClass dModel = new Model.T_Sys_GroupClass();
-                            var list = new Bll.T_Sys_GroupClass().GetModelList(" F_ClassCode='" + classcode + "' and F_Date='" + newdt + "' and F_DeptId='" + deptid + "' and F_IsDelete=0  and F_UserCode='" + struserlist[useri] + "'");
-                            if (list.Count > 0)
+                            //var list = new Bll.T_Sys_GroupClass().GetModelList(" F_ClassCode='" + classcode + "' and F_Date='" + newdt + "' and F_DeptId='" + deptid + "' and F_IsDelete=0  and F_UserCode='" + struserlist[useri] + "'");
+                            //if (list.Count > 0)
+                            var list = groupclasslist.Where(x => x.F_UserCode == struserlist[useri] && x.F_Date == newdt).ToList();
+
+                            if (list != null && list.Count() > 0)
                             {
                                 continue;
                             }