Sfoglia il codice sorgente

上班时间bug修改

zhengbingbing 6 anni fa
parent
commit
247d4682c7

+ 54 - 54
codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_WorkTimes.cs

38
         {
38
         {
39
             StringBuilder strSql = new StringBuilder();
39
             StringBuilder strSql = new StringBuilder();
40
             strSql.Append("insert into T_Sys_WorkTimes(");
40
             strSql.Append("insert into T_Sys_WorkTimes(");
41
-            strSql.Append("F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn)");
41
+            strSql.Append("F_StartDate,F_EndDate,F_Name,F_Remark,F_HolidaysCode,F_GroupCode,F_CreateUser,F_CreateTime)");
42
             strSql.Append(" values (");
42
             strSql.Append(" values (");
43
-            strSql.Append("@F_WorkStartTimes,@F_WorkEndTimes,@F_TimeName,@F_Remark,@F_UserID,@F_UserCode,@F_UserName,@F_CreateOn)");
43
+            strSql.Append("@F_StartDate,@F_EndDate,@F_Name,@F_Remark,@F_HolidaysCode,@F_GroupCode,@F_CreateUser,@F_CreateTime)");
44
             strSql.Append(";select @@IDENTITY");
44
             strSql.Append(";select @@IDENTITY");
45
             SqlParameter[] parameters = {
45
             SqlParameter[] parameters = {
46
-                    new SqlParameter("@F_WorkStartTimes", SqlDbType.DateTime),
47
-                    new SqlParameter("@F_WorkEndTimes", SqlDbType.DateTime),
48
-                    new SqlParameter("@F_TimeName", SqlDbType.NVarChar,100),
46
+                    new SqlParameter("@F_StartDate", SqlDbType.VarChar,20),
47
+                    new SqlParameter("@F_EndDate", SqlDbType.VarChar,20),
48
+                    new SqlParameter("@F_Name", SqlDbType.NVarChar,100),
49
                     new SqlParameter("@F_Remark", SqlDbType.NVarChar,200),
49
                     new SqlParameter("@F_Remark", SqlDbType.NVarChar,200),
50
-                    new SqlParameter("@F_UserID", SqlDbType.Int,4),
51
-                    new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
52
-                    new SqlParameter("@F_UserName", SqlDbType.VarChar,50),
53
-                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime)};
54
-            parameters[0].Value = model.F_WorkStartTimes;
55
-            parameters[1].Value = model.F_WorkEndTimes;
56
-            parameters[2].Value = model.F_TimeName;
50
+                    new SqlParameter("@F_HolidaysCode", SqlDbType.VarChar,50),
51
+                    new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50),
52
+                    new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
53
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime)};
54
+            parameters[0].Value = model.F_StartDate;
55
+            parameters[1].Value = model.F_EndDate;
56
+            parameters[2].Value = model.F_Name;
57
             parameters[3].Value = model.F_Remark;
57
             parameters[3].Value = model.F_Remark;
58
-            parameters[4].Value = model.F_UserID;
59
-            parameters[5].Value = model.F_UserCode;
60
-            parameters[6].Value = model.F_UserName;
61
-            parameters[7].Value = model.F_CreateOn;
58
+            parameters[4].Value = model.F_HolidaysCode;
59
+            parameters[5].Value = model.F_GroupCode;
60
+            parameters[6].Value = model.F_CreateUser;
61
+            parameters[7].Value = model.F_CreateTime;
62
 
62
 
63
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
63
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
64
             if (obj == null)
64
             if (obj == null)
77
         {
77
         {
78
             StringBuilder strSql = new StringBuilder();
78
             StringBuilder strSql = new StringBuilder();
79
             strSql.Append("update T_Sys_WorkTimes set ");
79
             strSql.Append("update T_Sys_WorkTimes set ");
80
-            strSql.Append("F_WorkStartTimes=@F_WorkStartTimes,");
81
-            strSql.Append("F_WorkEndTimes=@F_WorkEndTimes,");
82
-            strSql.Append("F_TimeName=@F_TimeName,");
80
+            strSql.Append("F_StartDate=@F_StartDate,");
81
+            strSql.Append("F_EndDate=@F_EndDate,");
82
+            strSql.Append("F_Name=@F_Name,");
83
             strSql.Append("F_Remark=@F_Remark,");
83
             strSql.Append("F_Remark=@F_Remark,");
84
-            strSql.Append("F_UserID=@F_UserID,");
85
-            strSql.Append("F_UserCode=@F_UserCode,");
86
-            strSql.Append("F_UserName=@F_UserName,");
87
-            strSql.Append("F_CreateOn=@F_CreateOn");
84
+            strSql.Append("F_HolidaysCode=@F_HolidaysCode,");
85
+            strSql.Append("F_GroupCode=@F_GroupCode,");
86
+            strSql.Append("F_CreateUser=@F_CreateUser,");
87
+            strSql.Append("F_CreateTime=@F_CreateTime");
88
             strSql.Append(" where F_ID=@F_ID");
88
             strSql.Append(" where F_ID=@F_ID");
89
             SqlParameter[] parameters = {
89
             SqlParameter[] parameters = {
90
-                    new SqlParameter("@F_WorkStartTimes", SqlDbType.DateTime),
91
-                    new SqlParameter("@F_WorkEndTimes", SqlDbType.DateTime),
92
-                    new SqlParameter("@F_TimeName", SqlDbType.NVarChar,100),
90
+                    new SqlParameter("@F_StartDate", SqlDbType.VarChar,20),
91
+                    new SqlParameter("@F_EndDate", SqlDbType.VarChar,20),
92
+                    new SqlParameter("@F_Name", SqlDbType.NVarChar,100),
93
                     new SqlParameter("@F_Remark", SqlDbType.NVarChar,200),
93
                     new SqlParameter("@F_Remark", SqlDbType.NVarChar,200),
94
-                    new SqlParameter("@F_UserID", SqlDbType.Int,4),
95
-                    new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
96
-                    new SqlParameter("@F_UserName", SqlDbType.VarChar,50),
97
-                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
94
+                    new SqlParameter("@F_HolidaysCode", SqlDbType.VarChar,50),
95
+                    new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50),
96
+                    new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
97
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
98
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
98
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
99
-            parameters[0].Value = model.F_WorkStartTimes;
100
-            parameters[1].Value = model.F_WorkEndTimes;
101
-            parameters[2].Value = model.F_TimeName;
99
+            parameters[0].Value = model.F_StartDate;
100
+            parameters[1].Value = model.F_EndDate;
101
+            parameters[2].Value = model.F_Name;
102
             parameters[3].Value = model.F_Remark;
102
             parameters[3].Value = model.F_Remark;
103
-            parameters[4].Value = model.F_UserID;
104
-            parameters[5].Value = model.F_UserCode;
105
-            parameters[6].Value = model.F_UserName;
106
-            parameters[7].Value = model.F_CreateOn;
103
+            parameters[4].Value = model.F_HolidaysCode;
104
+            parameters[5].Value = model.F_GroupCode;
105
+            parameters[6].Value = model.F_CreateUser;
106
+            parameters[7].Value = model.F_CreateTime;
107
             parameters[8].Value = model.F_ID;
107
             parameters[8].Value = model.F_ID;
108
 
108
 
109
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
109
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
168
         {
168
         {
169
 
169
 
170
             StringBuilder strSql = new StringBuilder();
170
             StringBuilder strSql = new StringBuilder();
171
-            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 ");
171
+            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 ");
172
             strSql.Append(" where F_ID=@F_ID");
172
             strSql.Append(" where F_ID=@F_ID");
173
             SqlParameter[] parameters = {
173
             SqlParameter[] parameters = {
174
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
174
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
200
                 {
200
                 {
201
                     model.F_ID = int.Parse(row["F_ID"].ToString());
201
                     model.F_ID = int.Parse(row["F_ID"].ToString());
202
                 }
202
                 }
203
-                if (row["F_WorkStartTimes"] != null && row["F_WorkStartTimes"].ToString() != "")
203
+                if (row["F_StartDate"] != null)
204
                 {
204
                 {
205
-                    model.F_WorkStartTimes = DateTime.Parse(row["F_WorkStartTimes"].ToString());
205
+                    model.F_StartDate = row["F_StartDate"].ToString();
206
                 }
206
                 }
207
-                if (row["F_WorkEndTimes"] != null && row["F_WorkEndTimes"].ToString() != "")
207
+                if (row["F_EndDate"] != null)
208
                 {
208
                 {
209
-                    model.F_WorkEndTimes = DateTime.Parse(row["F_WorkEndTimes"].ToString());
209
+                    model.F_EndDate = row["F_EndDate"].ToString();
210
                 }
210
                 }
211
-                if (row["F_TimeName"] != null)
211
+                if (row["F_Name"] != null)
212
                 {
212
                 {
213
-                    model.F_TimeName = row["F_TimeName"].ToString();
213
+                    model.F_Name = row["F_Name"].ToString();
214
                 }
214
                 }
215
                 if (row["F_Remark"] != null)
215
                 if (row["F_Remark"] != null)
216
                 {
216
                 {
217
                     model.F_Remark = row["F_Remark"].ToString();
217
                     model.F_Remark = row["F_Remark"].ToString();
218
                 }
218
                 }
219
-                if (row["F_UserID"] != null && row["F_UserID"].ToString() != "")
219
+                if (row["F_HolidaysCode"] != null)
220
                 {
220
                 {
221
-                    model.F_UserID = int.Parse(row["F_UserID"].ToString());
221
+                    model.F_HolidaysCode = row["F_HolidaysCode"].ToString();
222
                 }
222
                 }
223
-                if (row["F_UserCode"] != null)
223
+                if (row["F_GroupCode"] != null)
224
                 {
224
                 {
225
-                    model.F_UserCode = row["F_UserCode"].ToString();
225
+                    model.F_GroupCode = row["F_GroupCode"].ToString();
226
                 }
226
                 }
227
-                if (row["F_UserName"] != null)
227
+                if (row["F_CreateUser"] != null)
228
                 {
228
                 {
229
-                    model.F_UserName = row["F_UserName"].ToString();
229
+                    model.F_CreateUser = row["F_CreateUser"].ToString();
230
                 }
230
                 }
231
-                if (row["F_CreateOn"] != null && row["F_CreateOn"].ToString() != "")
231
+                if (row["F_CreateTime"] != null && row["F_CreateTime"].ToString() != "")
232
                 {
232
                 {
233
-                    model.F_CreateOn = DateTime.Parse(row["F_CreateOn"].ToString());
233
+                    model.F_CreateTime = DateTime.Parse(row["F_CreateTime"].ToString());
234
                 }
234
                 }
235
             }
235
             }
236
             return model;
236
             return model;
242
         public DataSet GetList(string strWhere)
242
         public DataSet GetList(string strWhere)
243
         {
243
         {
244
             StringBuilder strSql = new StringBuilder();
244
             StringBuilder strSql = new StringBuilder();
245
-            strSql.Append("select F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn ");
245
+            strSql.Append("select F_ID,F_StartDate,F_EndDate,F_Name,F_Remark,F_HolidaysCode,F_GroupCode,F_CreateUser,F_CreateTime ");
246
             strSql.Append(" FROM T_Sys_WorkTimes ");
246
             strSql.Append(" FROM T_Sys_WorkTimes ");
247
             if (strWhere.Trim() != "")
247
             if (strWhere.Trim() != "")
248
             {
248
             {
262
             {
262
             {
263
                 strSql.Append(" top " + Top.ToString());
263
                 strSql.Append(" top " + Top.ToString());
264
             }
264
             }
265
-            strSql.Append(" F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn ");
265
+            strSql.Append(" F_ID,F_StartDate,F_EndDate,F_Name,F_Remark,F_HolidaysCode,F_GroupCode,F_CreateUser,F_CreateTime ");
266
             strSql.Append(" FROM T_Sys_WorkTimes ");
266
             strSql.Append(" FROM T_Sys_WorkTimes ");
267
             if (strWhere.Trim() != "")
267
             if (strWhere.Trim() != "")
268
             {
268
             {

+ 129 - 158
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/WorkcalendarController.cs

119
         //获取上班时间段
119
         //获取上班时间段
120
         public ActionResult GetTimesList()
120
         public ActionResult GetTimesList()
121
         {
121
         {
122
-            ActionResult res = NoToken("未知错误,请重新登录");
123
-            if (Request.IsAuthenticated)
124
-            {
125
-                string sql = "";
126
-                DataTable dt = new DataTable();
127
-               
122
+            //ActionResult res = NoToken("未知错误,请重新登录");
123
+            //if (Request.IsAuthenticated)
124
+            //{
125
+            string sql = "";
126
+            DataTable dt = new DataTable();
128
 
127
 
129
-                    string keyword = HttpUtility.UrlDecode(RequestString.GetQueryString("keyword"));
130
-                    if (keyword.Trim() != "" && keyword != "undefined")
131
-                    {
132
-                        sql += " and (convert(varchar,F_WorkEndTimes,120) like '%" + keyword.Trim() + "%' or convert(varchar,F_WorkEndTimes,120) like '%" + keyword.Trim()
133
-                            + "%' or F_TimeName like '%" + keyword.Trim() + "%'or F_Remark like '%" + keyword.Trim() + "%')";
134
-                    }
135
 
128
 
136
-                    string strpageindex = RequestString.GetQueryString("page");
137
-                    int pageindex = 1;
138
-                    string strpagesize = RequestString.GetQueryString("pagesize");
139
-                    int pagesize = 10;
129
+            string keyword = HttpUtility.UrlDecode(RequestString.GetQueryString("keyword"));
130
+            string holidayscode = HttpUtility.UrlDecode(RequestString.GetQueryString("holidayscode"));
131
+            if (keyword.Trim() != "" && keyword != "undefined")
132
+            {
133
+                sql += " and (F_StartDate like '%" + keyword.Trim() + "%' or F_EndDate like '%" + keyword.Trim()
134
+                    + "%' or F_Name like '%" + keyword.Trim() + "%'or F_Remark like '%" + keyword.Trim() + "%')";
135
+            }
136
+            if (!string.IsNullOrEmpty(holidayscode))
137
+                sql += " and F_HolidaysCode = '" + holidayscode.Trim() + "' ";
140
 
138
 
141
-                    if (strpageindex.Trim() != "")
142
-                    {
143
-                        pageindex = Convert.ToInt32(strpageindex);
144
-                    }
139
+            string strpageindex = RequestString.GetQueryString("page");
140
+            int pageindex = 1;
141
+            string strpagesize = RequestString.GetQueryString("pagesize");
142
+            int pagesize = 10;
145
 
143
 
146
-                    if (strpagesize.Trim() != "")
147
-                    {
148
-                        pagesize = Convert.ToInt32(strpagesize);
149
-                    }
150
-                    int recordCount = 0;
151
-                    dt = BLL.PagerBLL.GetListPager(
152
-                         "T_Sys_WorkTimes",
153
-                        "F_ID",
154
-                        "*",
155
-                        sql,
156
-                        "ORDER BY F_ID desc",
157
-                        pagesize,
158
-                        pageindex,
159
-                        true,
160
-                        out recordCount);
161
-
162
-                    var obj = new
163
-                    {
164
-                        state = "success",
165
-                        message = "成功",
166
-                        rows = dt,
167
-                        total = recordCount
168
-                    };
144
+            if (strpageindex.Trim() != "")
145
+            {
146
+                pageindex = Convert.ToInt32(strpageindex);
147
+            }
169
 
148
 
170
-                    res = Content(obj.ToJson());
171
-            
149
+            if (strpagesize.Trim() != "")
150
+            {
151
+                pagesize = Convert.ToInt32(strpagesize);
172
             }
152
             }
173
-            return res;
153
+            int recordCount = 0;
154
+            dt = BLL.PagerBLL.GetListPager(
155
+                 "T_Sys_WorkTimes",
156
+                "F_ID",
157
+                "*",
158
+                sql,
159
+                "ORDER BY F_ID desc",
160
+                pagesize,
161
+                pageindex,
162
+                true,
163
+                out recordCount);
164
+
165
+            var obj = new
166
+            {
167
+                state = "success",
168
+                message = "成功",
169
+                rows = dt,
170
+                total = recordCount
171
+            };
172
+
173
+            return Content(obj.ToJson());
174
+
175
+            //}
176
+            //return res;
174
         }
177
         }
175
 
178
 
176
         //获取某一条时间段信息
179
         //获取某一条时间段信息
179
             ActionResult res = NoToken("未知错误,请重新登录");
182
             ActionResult res = NoToken("未知错误,请重新登录");
180
             if (Request.IsAuthenticated)
183
             if (Request.IsAuthenticated)
181
             {
184
             {
182
-                
183
-                    if (id != null && id.Trim() != "")
185
+
186
+                if (id != null && id.Trim() != "")
187
+                {
188
+                    BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
189
+                    Model.T_Sys_WorkTimes dModel = dBLL.GetModel(int.Parse(id.Trim()));
190
+                    if (dModel != null)
184
                     {
191
                     {
185
-                        BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
186
-                        Model.T_Sys_WorkTimes dModel = dBLL.GetModel(int.Parse(id.Trim()));
187
-                        if (dModel != null)
188
-                        {
189
-                            res = Success("获取成功", dModel);
190
-                        }
191
-                        else
192
-                        {
193
-                            res = Error("获取失败");
194
-                        }
192
+                        res = Success("获取成功", dModel);
195
                     }
193
                     }
196
                     else
194
                     else
197
                     {
195
                     {
198
-                        res = Error("获取参数失败");
196
+                        res = Error("获取失败");
199
                     }
197
                     }
200
-                
201
-             
198
+                }
199
+                else
200
+                {
201
+                    res = Error("获取参数失败");
202
+                }
203
+
204
+
202
             }
205
             }
203
             return res;
206
             return res;
204
         }
207
         }
205
 
208
 
206
         //添加/修改上班时间段
209
         //添加/修改上班时间段
207
-        public ActionResult AddTimes(string workid, string workstart, string workend, string timename, string remark)
210
+        public ActionResult AddTimes(string workid, string workstart, string workend, string timename, string holidayscode, string remark)
208
         {
211
         {
209
-            ActionResult res = NoToken("未知错误,请重新登录");
210
             if (Request.IsAuthenticated)
212
             if (Request.IsAuthenticated)
211
             {
213
             {
212
-                
213
-                    int userId = CurrentUser.UserData.F_UserId;
214
-                    if (userId != 0)
214
+
215
+                int userId = CurrentUser.UserData.F_UserId;
216
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
217
+                if (userId != 0)
218
+                {
219
+                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
220
+                    if (ua != null)
215
                     {
221
                     {
216
-                        Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
217
-                        if (ua != null)
222
+                        if (workid != null && workid != "")
218
                         {
223
                         {
219
-                            res=Error("操作失败");
220
-                            if (workid != null && workid != "")
224
+                            int id = 0;
225
+                            if (int.TryParse(workid, out id))
221
                             {
226
                             {
222
-                                int id = 0;
223
-                                if (int.TryParse(workid, out id))
227
+                                BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
228
+                                Model.T_Sys_WorkTimes dModel = dBLL.GetModel(id);
229
+                                if (dModel != null)
224
                                 {
230
                                 {
225
-                                    BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
226
-                                    Model.T_Sys_WorkTimes dModel = dBLL.GetModel(id);
227
-                                    if (dModel != null)
231
+                                    dModel.F_StartDate = workstart;
232
+                                    dModel.F_EndDate = workend;
233
+                                    dModel.F_HolidaysCode = holidayscode;
234
+                                    dModel.F_Name = timename.Trim();
235
+                                    dModel.F_Remark = remark.Trim();
236
+
237
+                                    bool b = dBLL.Update(dModel);
238
+                                    if (b)
239
+                                    {
240
+                                        return Success("编辑成功");
241
+                                    }
242
+                                    else
228
                                     {
243
                                     {
229
-                                        if (!string.IsNullOrWhiteSpace(workstart.Trim()))
230
-                                        {
231
-                                            DateTime dt1 = new DateTime();
232
-                                            if (DateTime.TryParse(workstart.Trim(), out dt1))
233
-                                                dModel.F_WorkStartTimes = Convert.ToDateTime(dt1.ToString("1900-01-01 HH:mm:ss"));
234
-                                        }
235
-                                        if (!string.IsNullOrWhiteSpace(workend.Trim()))
236
-                                        {
237
-                                            DateTime dt1 = new DateTime();
238
-                                            if (DateTime.TryParse(workend.Trim(), out dt1))
239
-                                                dModel.F_WorkEndTimes = Convert.ToDateTime(dt1.ToString("1900-01-01 HH:mm:ss"));
240
-                                        }
241
-                                        if (!string.IsNullOrWhiteSpace(timename.Trim()))
242
-                                        {
243
-                                            dModel.F_TimeName = timename.Trim();
244
-                                        }
245
-                                        if (!string.IsNullOrWhiteSpace(remark.Trim()))
246
-                                        {
247
-                                            dModel.F_Remark = remark.Trim();
248
-                                        }
249
-
250
-                                        bool b = dBLL.Update(dModel);
251
-                                        if (b)
252
-                                        {
253
-                                            res = Success("编辑成功");
254
-                                        }
255
-                                        else
256
-                                        {
257
-                                            res = Error("编辑失败");
258
-                                        }
244
+                                        return Error("编辑失败");
259
                                     }
245
                                     }
260
                                 }
246
                                 }
261
                             }
247
                             }
248
+                        }
249
+                        else
250
+                        {
251
+                            Model.T_Sys_WorkTimes _model = new Model.T_Sys_WorkTimes();
252
+                            _model.F_StartDate = workstart;
253
+                            _model.F_EndDate = workend;
254
+                            _model.F_Name = timename.Trim();
255
+                            _model.F_Remark = remark.Trim();
256
+                            _model.F_HolidaysCode = holidayscode.Trim();
257
+                            _model.F_GroupCode = ua.groupcode;
258
+                            _model.F_CreateUser = ua.F_UserCode;
259
+                            _model.F_CreateTime = DateTime.Now;
260
+
261
+                            int b = new BLL.T_Sys_WorkTimes().Add(_model);
262
+                            if (b > 0)
263
+                            {
264
+                                return Success("添加成功");
265
+                            }
262
                             else
266
                             else
263
                             {
267
                             {
264
-                                Model.T_Sys_WorkTimes _model = new Model.T_Sys_WorkTimes();
265
-                                if (!string.IsNullOrWhiteSpace(workstart.Trim()))
266
-                                {
267
-                                    DateTime dt2 = new DateTime();
268
-                                    if (DateTime.TryParse("1900-01-01 " + workstart.Trim(), out dt2))
269
-                                        _model.F_WorkStartTimes = Convert.ToDateTime(dt2.ToString("1900-01-01 HH:mm:ss"));
270
-                                }
271
-                                if (!string.IsNullOrWhiteSpace(workend.Trim()))
272
-                                {
273
-                                    DateTime dt2 = new DateTime();
274
-                                    if (DateTime.TryParse("1900-01-01 " + workend.Trim(), out dt2))
275
-                                        _model.F_WorkEndTimes = Convert.ToDateTime(dt2.ToString("1900-01-01 HH:mm:ss"));
276
-                                }
277
-                                if (!string.IsNullOrWhiteSpace(timename.Trim()))
278
-                                {
279
-                                    _model.F_TimeName = timename.Trim();
280
-                                }
281
-                                if (!string.IsNullOrWhiteSpace(remark.Trim()))
282
-                                {
283
-                                    _model.F_Remark = remark.Trim();
284
-                                }
285
-                                _model.F_CreateOn = DateTime.Now;
286
-                                _model.F_UserID = ua.F_UserId;
287
-                                _model.F_UserName = ua.F_UserName;
288
-                                _model.F_UserCode = ua.F_UserCode;
289
-
290
-                                int b = new BLL.T_Sys_WorkTimes().Add(_model);
291
-                                if (b > 0)
292
-                                {
293
-                                    res = Success("添加成功");
294
-                                }
295
-                                else
296
-                                {
297
-                                    res = Error("添加失败");
298
-                                }
268
+                                return Error("添加失败");
299
                             }
269
                             }
300
                         }
270
                         }
301
                     }
271
                     }
302
-            
272
+                }
273
+
303
             }
274
             }
304
-            return res;
275
+            return NoToken("未知错误,请重新登录");
305
         }
276
         }
306
 
277
 
307
         //删除上班时间段
278
         //删除上班时间段
310
             ActionResult res = NoToken("未知错误,请重新登录");
281
             ActionResult res = NoToken("未知错误,请重新登录");
311
             if (Request.IsAuthenticated)
282
             if (Request.IsAuthenticated)
312
             {
283
             {
313
-                
314
-                    if (ids != null && ids.Length > 0)
284
+
285
+                if (ids != null && ids.Length > 0)
286
+                {
287
+                    string idd = " ";
288
+                    foreach (string str in ids)
315
                     {
289
                     {
316
-                        string idd = " ";
317
-                        foreach (string str in ids)
318
-                        {
319
-                            idd += "'" + str + "',";
320
-                        }
321
-                        if (new BLL.T_Sys_WorkTimes().DeleteList(idd.TrimEnd(',')))
322
-                        {
323
-                            res = Success("删除成功");
324
-                        }
325
-                        else
326
-                            res = Error("删除失败");
290
+                        idd += "'" + str + "',";
327
                     }
291
                     }
328
-                    else
292
+                    if (new BLL.T_Sys_WorkTimes().DeleteList(idd.TrimEnd(',')))
329
                     {
293
                     {
330
-                        res = Error("请选择要删除的记录");
294
+                        res = Success("删除成功");
331
                     }
295
                     }
332
-            
296
+                    else
297
+                        res = Error("删除失败");
298
+                }
299
+                else
300
+                {
301
+                    res = Error("请选择要删除的记录");
302
+                }
303
+
333
             }
304
             }
334
             return res;
305
             return res;
335
         }
306
         }

+ 3 - 1
codegit/CallCenterApi/CallCenterApi.Model/T_Sys_UserAccount.cs

328
         #region 接口添加字段
328
         #region 接口添加字段
329
         public string depname { get; set; }
329
         public string depname { get; set; }
330
         public string zxzname { get; set; }
330
         public string zxzname { get; set; }
331
-
331
+        public string rolename { get; set; }
332
+        public string rolecode { get; set; }
333
+        public string groupcode { get; set; }
332
         #endregion
334
         #endregion
333
     }
335
     }
334
 }
336
 }

+ 32 - 32
codegit/CallCenterApi/CallCenterApi.Model/T_Sys_WorkTimes.cs

11
         { }
11
         { }
12
         #region Model
12
         #region Model
13
         private int _f_id;
13
         private int _f_id;
14
-        private DateTime? _f_workstarttimes;
15
-        private DateTime? _f_workendtimes;
16
-        private string _f_timename;
14
+        private string _f_startdate;
15
+        private string _f_enddate;
16
+        private string _f_name;
17
         private string _f_remark;
17
         private string _f_remark;
18
-        private int? _f_userid;
19
-        private string _f_usercode;
20
-        private string _f_username;
21
-        private DateTime? _f_createon;
18
+        private string _f_holidayscode;
19
+        private string _f_groupcode;
20
+        private string _f_createuser;
21
+        private DateTime? _f_createtime;
22
         /// <summary>
22
         /// <summary>
23
         /// 
23
         /// 
24
         /// </summary>
24
         /// </summary>
30
         /// <summary>
30
         /// <summary>
31
         /// 工作开始时间
31
         /// 工作开始时间
32
         /// </summary>
32
         /// </summary>
33
-        public DateTime? F_WorkStartTimes
33
+        public string F_StartDate
34
         {
34
         {
35
-            set { _f_workstarttimes = value; }
36
-            get { return _f_workstarttimes; }
35
+            set { _f_startdate = value; }
36
+            get { return _f_startdate; }
37
         }
37
         }
38
         /// <summary>
38
         /// <summary>
39
         /// 工作结束时间
39
         /// 工作结束时间
40
         /// </summary>
40
         /// </summary>
41
-        public DateTime? F_WorkEndTimes
41
+        public string F_EndDate
42
         {
42
         {
43
-            set { _f_workendtimes = value; }
44
-            get { return _f_workendtimes; }
43
+            set { _f_enddate = value; }
44
+            get { return _f_enddate; }
45
         }
45
         }
46
         /// <summary>
46
         /// <summary>
47
         /// 时间段名称
47
         /// 时间段名称
48
         /// </summary>
48
         /// </summary>
49
-        public string F_TimeName
49
+        public string F_Name
50
         {
50
         {
51
-            set { _f_timename = value; }
52
-            get { return _f_timename; }
51
+            set { _f_name = value; }
52
+            get { return _f_name; }
53
         }
53
         }
54
         /// <summary>
54
         /// <summary>
55
         /// 时间段备注
55
         /// 时间段备注
60
             get { return _f_remark; }
60
             get { return _f_remark; }
61
         }
61
         }
62
         /// <summary>
62
         /// <summary>
63
-        /// 
63
+        /// 时间段备注
64
         /// </summary>
64
         /// </summary>
65
-        public int? F_UserID
65
+        public string F_HolidaysCode
66
         {
66
         {
67
-            set { _f_userid = value; }
68
-            get { return _f_userid; }
67
+            set { _f_holidayscode = value; }
68
+            get { return _f_holidayscode; }
69
         }
69
         }
70
         /// <summary>
70
         /// <summary>
71
-        /// 
71
+        /// 坐席组
72
         /// </summary>
72
         /// </summary>
73
-        public string F_UserCode
73
+        public string F_GroupCode
74
         {
74
         {
75
-            set { _f_usercode = value; }
76
-            get { return _f_usercode; }
75
+            set { _f_groupcode = value; }
76
+            get { return _f_groupcode; }
77
         }
77
         }
78
         /// <summary>
78
         /// <summary>
79
-        /// 
79
+        /// 创建人
80
         /// </summary>
80
         /// </summary>
81
-        public string F_UserName
81
+        public string F_CreateUser
82
         {
82
         {
83
-            set { _f_username = value; }
84
-            get { return _f_username; }
83
+            set { _f_createuser = value; }
84
+            get { return _f_createuser; }
85
         }
85
         }
86
         /// <summary>
86
         /// <summary>
87
-        /// 
87
+        /// 创建时间
88
         /// </summary>
88
         /// </summary>
89
-        public DateTime? F_CreateOn
89
+        public DateTime? F_CreateTime
90
         {
90
         {
91
-            set { _f_createon = value; }
92
-            get { return _f_createon; }
91
+            set { _f_createtime = value; }
92
+            get { return _f_createtime; }
93
         }
93
         }
94
         #endregion Model
94
         #endregion Model
95
 
95