修改排班模块

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/GroupClassController.cs

@@ -143,6 +143,7 @@ namespace CallCenterApi.Interface.Controllers
 
             var obj = list.Select(p => {
                 var cls = new BLL.T_Sys_Class().GetModelList(" F_Code='" + p.F_ClassCode + "' ").FirstOrDefault();
+                var group = new BLL.T_Sys_Group().GetModelList(" F_GroupCode='" + p.F_GroupCode + "' ").FirstOrDefault();
                 string[] ins = cls.F_InTime.Split(':');
                 string[] outs = cls.F_OutTime.Split(':');
                 bool bl = Int32.Parse(ins[0]) > Int32.Parse(outs[0]);
@@ -150,10 +151,11 @@ namespace CallCenterApi.Interface.Controllers
                 return new
                 {
                     id = p.F_Id,
-                    title = cls.F_Name + "[" + cls.F_InTime + "-" + cls.F_OutTime + "]",
+                    groupcode= p.F_GroupCode,
+                    classcode= p.F_ClassCode,
+                    title = group.F_GroupName+" "+cls.F_Name + "[" + cls.F_InTime + "-" + cls.F_OutTime + "]",
                     start = p.F_Date.Value.ToString("yyyy-MM-dd") + " " + cls.F_InTime,
-                    end = edate.ToString("yyyy-MM-dd") + " " + cls.F_OutTime,
-                    code = p.F_ClassCode
+                    end = edate.ToString("yyyy-MM-dd") + " " + cls.F_OutTime
                 };
             });
             return Content(obj.ToJson());
@@ -197,7 +199,7 @@ namespace CallCenterApi.Interface.Controllers
                     dModel.F_GroupCode = groupcode;
                     dModel.F_State = 0;
                     dModel.F_IsDelete = 0;
-                    dModel.F_CreateUser = userModel.F_GroupCode;
+                    dModel.F_CreateUser = userModel.F_UserCode;
                     dModel.F_CreateTime = DateTime.Now;
                     long n = new BLL.T_Sys_GroupClass().Add(dModel);
                     if (n > 0)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/GroupController.cs

@@ -100,6 +100,11 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult GetGroupList()
         {
             DataTable dt = new BLL.T_Sys_Group().GetList(" F_State=0 and F_IsDelete=0 ").Tables[0];
+            dt.Columns.Add("Users", typeof(object));
+            foreach (DataRow dr in dt.Rows)
+            {
+                dr["Users"] = new BLL.T_Sys_UserAccount().GetList(" F_GroupCode='"+dr["F_GroupCode"].ToString()+"' ").Tables[0];
+            }
             return Success("加载成功", dt);
         }