上班时间bug修改

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_WorkTimes.cs

@@ -38,27 +38,27 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_WorkTimes(");
-            strSql.Append("F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn)");
+            strSql.Append("F_StartDate,F_EndDate,F_Name,F_Remark,F_HolidaysCode,F_GroupCode,F_CreateUser,F_CreateTime)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkStartTimes,@F_WorkEndTimes,@F_TimeName,@F_Remark,@F_UserID,@F_UserCode,@F_UserName,@F_CreateOn)");
+            strSql.Append("@F_StartDate,@F_EndDate,@F_Name,@F_Remark,@F_HolidaysCode,@F_GroupCode,@F_CreateUser,@F_CreateTime)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_WorkStartTimes", SqlDbType.DateTime),
-                    new SqlParameter("@F_WorkEndTimes", SqlDbType.DateTime),
-                    new SqlParameter("@F_TimeName", SqlDbType.NVarChar,100),
+                    new SqlParameter("@F_StartDate", SqlDbType.VarChar,20),
+                    new SqlParameter("@F_EndDate", SqlDbType.VarChar,20),
+                    new SqlParameter("@F_Name", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_Remark", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_UserID", SqlDbType.Int,4),
-                    new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_UserName", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime)};
-            parameters[0].Value = model.F_WorkStartTimes;
-            parameters[1].Value = model.F_WorkEndTimes;
-            parameters[2].Value = model.F_TimeName;
+                    new SqlParameter("@F_HolidaysCode", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime)};
+            parameters[0].Value = model.F_StartDate;
+            parameters[1].Value = model.F_EndDate;
+            parameters[2].Value = model.F_Name;
             parameters[3].Value = model.F_Remark;
-            parameters[4].Value = model.F_UserID;
-            parameters[5].Value = model.F_UserCode;
-            parameters[6].Value = model.F_UserName;
-            parameters[7].Value = model.F_CreateOn;
+            parameters[4].Value = model.F_HolidaysCode;
+            parameters[5].Value = model.F_GroupCode;
+            parameters[6].Value = model.F_CreateUser;
+            parameters[7].Value = model.F_CreateTime;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -77,33 +77,33 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("update T_Sys_WorkTimes set ");
-            strSql.Append("F_WorkStartTimes=@F_WorkStartTimes,");
-            strSql.Append("F_WorkEndTimes=@F_WorkEndTimes,");
-            strSql.Append("F_TimeName=@F_TimeName,");
+            strSql.Append("F_StartDate=@F_StartDate,");
+            strSql.Append("F_EndDate=@F_EndDate,");
+            strSql.Append("F_Name=@F_Name,");
             strSql.Append("F_Remark=@F_Remark,");
-            strSql.Append("F_UserID=@F_UserID,");
-            strSql.Append("F_UserCode=@F_UserCode,");
-            strSql.Append("F_UserName=@F_UserName,");
-            strSql.Append("F_CreateOn=@F_CreateOn");
+            strSql.Append("F_HolidaysCode=@F_HolidaysCode,");
+            strSql.Append("F_GroupCode=@F_GroupCode,");
+            strSql.Append("F_CreateUser=@F_CreateUser,");
+            strSql.Append("F_CreateTime=@F_CreateTime");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_WorkStartTimes", SqlDbType.DateTime),
-                    new SqlParameter("@F_WorkEndTimes", SqlDbType.DateTime),
-                    new SqlParameter("@F_TimeName", SqlDbType.NVarChar,100),
+                    new SqlParameter("@F_StartDate", SqlDbType.VarChar,20),
+                    new SqlParameter("@F_EndDate", SqlDbType.VarChar,20),
+                    new SqlParameter("@F_Name", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_Remark", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_UserID", SqlDbType.Int,4),
-                    new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_UserName", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
+                    new SqlParameter("@F_HolidaysCode", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
-            parameters[0].Value = model.F_WorkStartTimes;
-            parameters[1].Value = model.F_WorkEndTimes;
-            parameters[2].Value = model.F_TimeName;
+            parameters[0].Value = model.F_StartDate;
+            parameters[1].Value = model.F_EndDate;
+            parameters[2].Value = model.F_Name;
             parameters[3].Value = model.F_Remark;
-            parameters[4].Value = model.F_UserID;
-            parameters[5].Value = model.F_UserCode;
-            parameters[6].Value = model.F_UserName;
-            parameters[7].Value = model.F_CreateOn;
+            parameters[4].Value = model.F_HolidaysCode;
+            parameters[5].Value = model.F_GroupCode;
+            parameters[6].Value = model.F_CreateUser;
+            parameters[7].Value = model.F_CreateTime;
             parameters[8].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
@@ -168,7 +168,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn from T_Sys_WorkTimes ");
+            strSql.Append("select  top 1 F_ID,F_StartDate,F_EndDate,F_Name,F_Remark,F_HolidaysCode,F_GroupCode,F_CreateUser,F_CreateTime from T_Sys_WorkTimes ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -200,37 +200,37 @@ namespace CallCenterApi.DAL
                 {
                     model.F_ID = int.Parse(row["F_ID"].ToString());
                 }
-                if (row["F_WorkStartTimes"] != null && row["F_WorkStartTimes"].ToString() != "")
+                if (row["F_StartDate"] != null)
                 {
-                    model.F_WorkStartTimes = DateTime.Parse(row["F_WorkStartTimes"].ToString());
+                    model.F_StartDate = row["F_StartDate"].ToString();
                 }
-                if (row["F_WorkEndTimes"] != null && row["F_WorkEndTimes"].ToString() != "")
+                if (row["F_EndDate"] != null)
                 {
-                    model.F_WorkEndTimes = DateTime.Parse(row["F_WorkEndTimes"].ToString());
+                    model.F_EndDate = row["F_EndDate"].ToString();
                 }
-                if (row["F_TimeName"] != null)
+                if (row["F_Name"] != null)
                 {
-                    model.F_TimeName = row["F_TimeName"].ToString();
+                    model.F_Name = row["F_Name"].ToString();
                 }
                 if (row["F_Remark"] != null)
                 {
                     model.F_Remark = row["F_Remark"].ToString();
                 }
-                if (row["F_UserID"] != null && row["F_UserID"].ToString() != "")
+                if (row["F_HolidaysCode"] != null)
                 {
-                    model.F_UserID = int.Parse(row["F_UserID"].ToString());
+                    model.F_HolidaysCode = row["F_HolidaysCode"].ToString();
                 }
-                if (row["F_UserCode"] != null)
+                if (row["F_GroupCode"] != null)
                 {
-                    model.F_UserCode = row["F_UserCode"].ToString();
+                    model.F_GroupCode = row["F_GroupCode"].ToString();
                 }
-                if (row["F_UserName"] != null)
+                if (row["F_CreateUser"] != null)
                 {
-                    model.F_UserName = row["F_UserName"].ToString();
+                    model.F_CreateUser = row["F_CreateUser"].ToString();
                 }
-                if (row["F_CreateOn"] != null && row["F_CreateOn"].ToString() != "")
+                if (row["F_CreateTime"] != null && row["F_CreateTime"].ToString() != "")
                 {
-                    model.F_CreateOn = DateTime.Parse(row["F_CreateOn"].ToString());
+                    model.F_CreateTime = DateTime.Parse(row["F_CreateTime"].ToString());
                 }
             }
             return model;
@@ -242,7 +242,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn ");
+            strSql.Append("select F_ID,F_StartDate,F_EndDate,F_Name,F_Remark,F_HolidaysCode,F_GroupCode,F_CreateUser,F_CreateTime ");
             strSql.Append(" FROM T_Sys_WorkTimes ");
             if (strWhere.Trim() != "")
             {
@@ -262,7 +262,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn ");
+            strSql.Append(" F_ID,F_StartDate,F_EndDate,F_Name,F_Remark,F_HolidaysCode,F_GroupCode,F_CreateUser,F_CreateTime ");
             strSql.Append(" FROM T_Sys_WorkTimes ");
             if (strWhere.Trim() != "")
             {

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

@@ -119,58 +119,61 @@ namespace CallCenterApi.Interface.Controllers.tel
         //获取上班时间段
         public ActionResult GetTimesList()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
-            if (Request.IsAuthenticated)
-            {
-                string sql = "";
-                DataTable dt = new DataTable();
-               
+            //ActionResult res = NoToken("未知错误，请重新登录");
+            //if (Request.IsAuthenticated)
+            //{
+            string sql = "";
+            DataTable dt = new DataTable();
 
-                    string keyword = HttpUtility.UrlDecode(RequestString.GetQueryString("keyword"));
-                    if (keyword.Trim() != "" && keyword != "undefined")
-                    {
-                        sql += " and (convert(varchar,F_WorkEndTimes,120) like '%" + keyword.Trim() + "%' or convert(varchar,F_WorkEndTimes,120) like '%" + keyword.Trim()
-                            + "%' or F_TimeName like '%" + keyword.Trim() + "%'or F_Remark like '%" + keyword.Trim() + "%')";
-                    }
 
-                    string strpageindex = RequestString.GetQueryString("page");
-                    int pageindex = 1;
-                    string strpagesize = RequestString.GetQueryString("pagesize");
-                    int pagesize = 10;
+            string keyword = HttpUtility.UrlDecode(RequestString.GetQueryString("keyword"));
+            string holidayscode = HttpUtility.UrlDecode(RequestString.GetQueryString("holidayscode"));
+            if (keyword.Trim() != "" && keyword != "undefined")
+            {
+                sql += " and (F_StartDate like '%" + keyword.Trim() + "%' or F_EndDate like '%" + keyword.Trim()
+                    + "%' or F_Name like '%" + keyword.Trim() + "%'or F_Remark like '%" + keyword.Trim() + "%')";
+            }
+            if (!string.IsNullOrEmpty(holidayscode))
+                sql += " and F_HolidaysCode = '" + holidayscode.Trim() + "' ";
 
-                    if (strpageindex.Trim() != "")
-                    {
-                        pageindex = Convert.ToInt32(strpageindex);
-                    }
+            string strpageindex = RequestString.GetQueryString("page");
+            int pageindex = 1;
+            string strpagesize = RequestString.GetQueryString("pagesize");
+            int pagesize = 10;
 
-                    if (strpagesize.Trim() != "")
-                    {
-                        pagesize = Convert.ToInt32(strpagesize);
-                    }
-                    int recordCount = 0;
-                    dt = BLL.PagerBLL.GetListPager(
-                         "T_Sys_WorkTimes",
-                        "F_ID",
-                        "*",
-                        sql,
-                        "ORDER BY F_ID desc",
-                        pagesize,
-                        pageindex,
-                        true,
-                        out recordCount);
-
-                    var obj = new
-                    {
-                        state = "success",
-                        message = "成功",
-                        rows = dt,
-                        total = recordCount
-                    };
+            if (strpageindex.Trim() != "")
+            {
+                pageindex = Convert.ToInt32(strpageindex);
+            }
 
-                    res = Content(obj.ToJson());
-            
+            if (strpagesize.Trim() != "")
+            {
+                pagesize = Convert.ToInt32(strpagesize);
             }
-            return res;
+            int recordCount = 0;
+            dt = BLL.PagerBLL.GetListPager(
+                 "T_Sys_WorkTimes",
+                "F_ID",
+                "*",
+                sql,
+                "ORDER BY F_ID desc",
+                pagesize,
+                pageindex,
+                true,
+                out recordCount);
+
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                rows = dt,
+                total = recordCount
+            };
+
+            return Content(obj.ToJson());
+
+            //}
+            //return res;
         }
 
         //获取某一条时间段信息
@@ -179,129 +182,97 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
-                    if (id != null && id.Trim() != "")
+
+                if (id != null && id.Trim() != "")
+                {
+                    BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
+                    Model.T_Sys_WorkTimes dModel = dBLL.GetModel(int.Parse(id.Trim()));
+                    if (dModel != null)
                     {
-                        BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
-                        Model.T_Sys_WorkTimes dModel = dBLL.GetModel(int.Parse(id.Trim()));
-                        if (dModel != null)
-                        {
-                            res = Success("获取成功", dModel);
-                        }
-                        else
-                        {
-                            res = Error("获取失败");
-                        }
+                        res = Success("获取成功", dModel);
                     }
                     else
                     {
-                        res = Error("获取参数失败");
+                        res = Error("获取失败");
                     }
-                
-             
+                }
+                else
+                {
+                    res = Error("获取参数失败");
+                }
+
+
             }
             return res;
         }
 
         //添加/修改上班时间段
-        public ActionResult AddTimes(string workid, string workstart, string workend, string timename, string remark)
+        public ActionResult AddTimes(string workid, string workstart, string workend, string timename, string holidayscode, string remark)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
-                    int userId = CurrentUser.UserData.F_UserId;
-                    if (userId != 0)
+
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                if (userId != 0)
+                {
+                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
+                    if (ua != null)
                     {
-                        Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
-                        if (ua != null)
+                        if (workid != null && workid != "")
                         {
-                            res=Error("操作失败");
-                            if (workid != null && workid != "")
+                            int id = 0;
+                            if (int.TryParse(workid, out id))
                             {
-                                int id = 0;
-                                if (int.TryParse(workid, out id))
+                                BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
+                                Model.T_Sys_WorkTimes dModel = dBLL.GetModel(id);
+                                if (dModel != null)
                                 {
-                                    BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
-                                    Model.T_Sys_WorkTimes dModel = dBLL.GetModel(id);
-                                    if (dModel != null)
+                                    dModel.F_StartDate = workstart;
+                                    dModel.F_EndDate = workend;
+                                    dModel.F_HolidaysCode = holidayscode;
+                                    dModel.F_Name = timename.Trim();
+                                    dModel.F_Remark = remark.Trim();
+
+                                    bool b = dBLL.Update(dModel);
+                                    if (b)
+                                    {
+                                        return Success("编辑成功");
+                                    }
+                                    else
                                     {
-                                        if (!string.IsNullOrWhiteSpace(workstart.Trim()))
-                                        {
-                                            DateTime dt1 = new DateTime();
-                                            if (DateTime.TryParse(workstart.Trim(), out dt1))
-                                                dModel.F_WorkStartTimes = Convert.ToDateTime(dt1.ToString("1900-01-01 HH:mm:ss"));
-                                        }
-                                        if (!string.IsNullOrWhiteSpace(workend.Trim()))
-                                        {
-                                            DateTime dt1 = new DateTime();
-                                            if (DateTime.TryParse(workend.Trim(), out dt1))
-                                                dModel.F_WorkEndTimes = Convert.ToDateTime(dt1.ToString("1900-01-01 HH:mm:ss"));
-                                        }
-                                        if (!string.IsNullOrWhiteSpace(timename.Trim()))
-                                        {
-                                            dModel.F_TimeName = timename.Trim();
-                                        }
-                                        if (!string.IsNullOrWhiteSpace(remark.Trim()))
-                                        {
-                                            dModel.F_Remark = remark.Trim();
-                                        }
-
-                                        bool b = dBLL.Update(dModel);
-                                        if (b)
-                                        {
-                                            res = Success("编辑成功");
-                                        }
-                                        else
-                                        {
-                                            res = Error("编辑失败");
-                                        }
+                                        return Error("编辑失败");
                                     }
                                 }
                             }
+                        }
+                        else
+                        {
+                            Model.T_Sys_WorkTimes _model = new Model.T_Sys_WorkTimes();
+                            _model.F_StartDate = workstart;
+                            _model.F_EndDate = workend;
+                            _model.F_Name = timename.Trim();
+                            _model.F_Remark = remark.Trim();
+                            _model.F_HolidaysCode = holidayscode.Trim();
+                            _model.F_GroupCode = ua.groupcode;
+                            _model.F_CreateUser = ua.F_UserCode;
+                            _model.F_CreateTime = DateTime.Now;
+
+                            int b = new BLL.T_Sys_WorkTimes().Add(_model);
+                            if (b > 0)
+                            {
+                                return Success("添加成功");
+                            }
                             else
                             {
-                                Model.T_Sys_WorkTimes _model = new Model.T_Sys_WorkTimes();
-                                if (!string.IsNullOrWhiteSpace(workstart.Trim()))
-                                {
-                                    DateTime dt2 = new DateTime();
-                                    if (DateTime.TryParse("1900-01-01 " + workstart.Trim(), out dt2))
-                                        _model.F_WorkStartTimes = Convert.ToDateTime(dt2.ToString("1900-01-01 HH:mm:ss"));
-                                }
-                                if (!string.IsNullOrWhiteSpace(workend.Trim()))
-                                {
-                                    DateTime dt2 = new DateTime();
-                                    if (DateTime.TryParse("1900-01-01 " + workend.Trim(), out dt2))
-                                        _model.F_WorkEndTimes = Convert.ToDateTime(dt2.ToString("1900-01-01 HH:mm:ss"));
-                                }
-                                if (!string.IsNullOrWhiteSpace(timename.Trim()))
-                                {
-                                    _model.F_TimeName = timename.Trim();
-                                }
-                                if (!string.IsNullOrWhiteSpace(remark.Trim()))
-                                {
-                                    _model.F_Remark = remark.Trim();
-                                }
-                                _model.F_CreateOn = DateTime.Now;
-                                _model.F_UserID = ua.F_UserId;
-                                _model.F_UserName = ua.F_UserName;
-                                _model.F_UserCode = ua.F_UserCode;
-
-                                int b = new BLL.T_Sys_WorkTimes().Add(_model);
-                                if (b > 0)
-                                {
-                                    res = Success("添加成功");
-                                }
-                                else
-                                {
-                                    res = Error("添加失败");
-                                }
+                                return Error("添加失败");
                             }
                         }
                     }
-            
+                }
+
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         //删除上班时间段
@@ -310,26 +281,26 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
-                    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_Sys_WorkTimes().DeleteList(idd.TrimEnd(',')))
-                        {
-                            res = Success("删除成功");
-                        }
-                        else
-                            res = Error("删除失败");
+                        idd += "'" + str + "',";
                     }
-                    else
+                    if (new BLL.T_Sys_WorkTimes().DeleteList(idd.TrimEnd(',')))
                     {
-                        res = Error("请选择要删除的记录");
+                        res = Success("删除成功");
                     }
-            
+                    else
+                        res = Error("删除失败");
+                }
+                else
+                {
+                    res = Error("请选择要删除的记录");
+                }
+
             }
             return res;
         }

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_UserAccount.cs

@@ -328,7 +328,9 @@ namespace CallCenterApi.Model
         #region 接口添加字段
         public string depname { get; set; }
         public string zxzname { get; set; }
-
+        public string rolename { get; set; }
+        public string rolecode { get; set; }
+        public string groupcode { get; set; }
         #endregion
     }
 }

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_WorkTimes.cs

@@ -11,14 +11,14 @@ namespace CallCenterApi.Model
         { }
         #region Model
         private int _f_id;
-        private DateTime? _f_workstarttimes;
-        private DateTime? _f_workendtimes;
-        private string _f_timename;
+        private string _f_startdate;
+        private string _f_enddate;
+        private string _f_name;
         private string _f_remark;
-        private int? _f_userid;
-        private string _f_usercode;
-        private string _f_username;
-        private DateTime? _f_createon;
+        private string _f_holidayscode;
+        private string _f_groupcode;
+        private string _f_createuser;
+        private DateTime? _f_createtime;
         /// <summary>
         /// 
         /// </summary>
@@ -30,26 +30,26 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 工作开始时间
         /// </summary>
-        public DateTime? F_WorkStartTimes
+        public string F_StartDate
         {
-            set { _f_workstarttimes = value; }
-            get { return _f_workstarttimes; }
+            set { _f_startdate = value; }
+            get { return _f_startdate; }
         }
         /// <summary>
         /// 工作结束时间
         /// </summary>
-        public DateTime? F_WorkEndTimes
+        public string F_EndDate
         {
-            set { _f_workendtimes = value; }
-            get { return _f_workendtimes; }
+            set { _f_enddate = value; }
+            get { return _f_enddate; }
         }
         /// <summary>
         /// 时间段名称
         /// </summary>
-        public string F_TimeName
+        public string F_Name
         {
-            set { _f_timename = value; }
-            get { return _f_timename; }
+            set { _f_name = value; }
+            get { return _f_name; }
         }
         /// <summary>
         /// 时间段备注
@@ -60,36 +60,36 @@ namespace CallCenterApi.Model
             get { return _f_remark; }
         }
         /// <summary>
-        /// 
+        /// 时间段备注
         /// </summary>
-        public int? F_UserID
+        public string F_HolidaysCode
         {
-            set { _f_userid = value; }
-            get { return _f_userid; }
+            set { _f_holidayscode = value; }
+            get { return _f_holidayscode; }
         }
         /// <summary>
-        /// 
+        /// 坐席组
         /// </summary>
-        public string F_UserCode
+        public string F_GroupCode
         {
-            set { _f_usercode = value; }
-            get { return _f_usercode; }
+            set { _f_groupcode = value; }
+            get { return _f_groupcode; }
         }
         /// <summary>
-        /// 
+        /// 创建人
         /// </summary>
-        public string F_UserName
+        public string F_CreateUser
         {
-            set { _f_username = value; }
-            get { return _f_username; }
+            set { _f_createuser = value; }
+            get { return _f_createuser; }
         }
         /// <summary>
-        /// 
+        /// 创建时间
         /// </summary>
-        public DateTime? F_CreateOn
+        public DateTime? F_CreateTime
         {
-            set { _f_createon = value; }
-            get { return _f_createon; }
+            set { _f_createtime = value; }
+            get { return _f_createtime; }
         }
         #endregion Model