yuqian 8 yıl önce
ebeveyn
işleme
7094ba4eea

+ 15 - 40
CallCenterApi/CallCenterApi.DAL/T_Sys_WorkTimes.cs

@@ -38,27 +38,22 @@ namespace CallCenterApi.DAL
38 38
         {
39 39
             StringBuilder strSql = new StringBuilder();
40 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_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_DeptId)");
42 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_WorkStartTimes,@F_WorkEndTimes,@F_TimeName,@F_Remark,@F_DeptId)");
44 44
             strSql.Append(";select @@IDENTITY");
45 45
             SqlParameter[] parameters = {
46 46
                     new SqlParameter("@F_WorkStartTimes", SqlDbType.DateTime),
47 47
                     new SqlParameter("@F_WorkEndTimes", SqlDbType.DateTime),
48 48
                     new SqlParameter("@F_TimeName", SqlDbType.NVarChar,100),
49 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)};
50
+                    new SqlParameter("@F_DeptId", SqlDbType.Int,4)
51
+            };
54 52
             parameters[0].Value = model.F_WorkStartTimes;
55 53
             parameters[1].Value = model.F_WorkEndTimes;
56 54
             parameters[2].Value = model.F_TimeName;
57 55
             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;
56
+            parameters[4].Value = model.F_DeptId;
62 57
 
63 58
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
64 59
             if (obj == null)
@@ -81,30 +76,21 @@ namespace CallCenterApi.DAL
81 76
             strSql.Append("F_WorkEndTimes=@F_WorkEndTimes,");
82 77
             strSql.Append("F_TimeName=@F_TimeName,");
83 78
             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");
79
+            strSql.Append("F_DeptId=@F_DeptId,");
88 80
             strSql.Append(" where F_ID=@F_ID");
89 81
             SqlParameter[] parameters = {
90 82
                     new SqlParameter("@F_WorkStartTimes", SqlDbType.DateTime),
91 83
                     new SqlParameter("@F_WorkEndTimes", SqlDbType.DateTime),
92 84
                     new SqlParameter("@F_TimeName", SqlDbType.NVarChar,100),
93 85
                     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),
86
+                    new SqlParameter("@F_DeptId", SqlDbType.Int,4),
98 87
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
99 88
             parameters[0].Value = model.F_WorkStartTimes;
100 89
             parameters[1].Value = model.F_WorkEndTimes;
101 90
             parameters[2].Value = model.F_TimeName;
102 91
             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;
107
-            parameters[8].Value = model.F_ID;
92
+            parameters[4].Value = model.F_DeptId;
93
+            parameters[5].Value = model.F_ID;
108 94
 
109 95
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
110 96
             if (rows > 0)
@@ -168,7 +154,7 @@ namespace CallCenterApi.DAL
168 154
         {
169 155
 
170 156
             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 ");
157
+            strSql.Append("select  top 1 F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_DeptId from T_Sys_WorkTimes ");
172 158
             strSql.Append(" where F_ID=@F_ID");
173 159
             SqlParameter[] parameters = {
174 160
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -216,22 +202,11 @@ namespace CallCenterApi.DAL
216 202
                 {
217 203
                     model.F_Remark = row["F_Remark"].ToString();
218 204
                 }
219
-                if (row["F_UserID"] != null && row["F_UserID"].ToString() != "")
220
-                {
221
-                    model.F_UserID = int.Parse(row["F_UserID"].ToString());
222
-                }
223
-                if (row["F_UserCode"] != null)
224
-                {
225
-                    model.F_UserCode = row["F_UserCode"].ToString();
226
-                }
227
-                if (row["F_UserName"] != null)
228
-                {
229
-                    model.F_UserName = row["F_UserName"].ToString();
230
-                }
231
-                if (row["F_CreateOn"] != null && row["F_CreateOn"].ToString() != "")
205
+                if (row["F_DeptId"] != null && row["F_DeptId"].ToString() != "")
232 206
                 {
233
-                    model.F_CreateOn = DateTime.Parse(row["F_CreateOn"].ToString());
207
+                    model.F_DeptId = int.Parse(row["F_DeptId"].ToString());
234 208
                 }
209
+
235 210
             }
236 211
             return model;
237 212
         }
@@ -242,7 +217,7 @@ namespace CallCenterApi.DAL
242 217
         public DataSet GetList(string strWhere)
243 218
         {
244 219
             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 ");
220
+            strSql.Append("select F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_DeptId ");
246 221
             strSql.Append(" FROM T_Sys_WorkTimes ");
247 222
             if (strWhere.Trim() != "")
248 223
             {
@@ -262,7 +237,7 @@ namespace CallCenterApi.DAL
262 237
             {
263 238
                 strSql.Append(" top " + Top.ToString());
264 239
             }
265
-            strSql.Append(" F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn ");
240
+            strSql.Append(" F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_DeptId  ");
266 241
             strSql.Append(" FROM T_Sys_WorkTimes ");
267 242
             if (strWhere.Trim() != "")
268 243
             {

+ 11 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallPlanController.cs

@@ -624,6 +624,7 @@ namespace CallCenterApi.Interface.Controllers.callout
624 624
             {
625 625
                 rows = modelList.Select(x => new
626 626
                 {
627
+                    id = x.F_Id,
627 628
                     taskname = x.TaskName,
628 629
                     phone = x.F_Phone,
629 630
                     agent = string.IsNullOrWhiteSpace(x.F_UserName) ? "" : x.F_UserName,
@@ -911,7 +912,6 @@ namespace CallCenterApi.Interface.Controllers.callout
911 912
 
912 913
 
913 914
 
914
-
915 915
         /// <summary>
916 916
         /// 坐席自主获取号码(点击外呼分配号码)
917 917
         /// </summary>
@@ -947,15 +947,25 @@ namespace CallCenterApi.Interface.Controllers.callout
947 947
         /// </summary>
948 948
         /// <param name="ids"></param>
949 949
         /// <returns></returns>
950
+
951
+
950 952
         public ActionResult CancelPhone(int[] ids)
951 953
         {
952 954
             if (ids == null || ids.Length <= 0)
953 955
                 return Error("请选择");
954 956
             var arr = string.Join(",", ids);
957
+            var dt = DbHelperSQL.Query($"SELECT F_Id,F_FPState  from T_Call_TaskTelNum where F_FPState=0 and  F_ID in ({arr})");
958
+
959
+            if (dt != null && dt.Tables.Count > 0 && dt.Tables[0].Rows.Count > 0)
960
+                return Error("选中的选项中存在未分配的数据,无法取消");
961
+
955 962
             if (taskTellNumBLL.CancelFP(arr))
956 963
                 return Success("取消成功");
957 964
             return Error("取消失败");
958 965
         }
966
+
967
+
968
+
959 969
         /// <summary>
960 970
         /// 获取坐席可进行呼叫的点击外呼任务
961 971
         /// </summary>

+ 178 - 181
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/WorkcalendarController.cs

@@ -54,64 +54,64 @@ namespace CallCenterApi.Interface.Controllers.tel
54 54
             ActionResult res = NoToken("未知错误,请重新登录");
55 55
             if (Request.IsAuthenticated)
56 56
             {
57
-                
58
-                    if (date != null && date != "")
57
+
58
+                if (date != null && date != "")
59
+                {
60
+                    DateTime dt = new DateTime();
61
+                    if (DateTime.TryParse(date, out dt))
59 62
                     {
60
-                        DateTime dt = new DateTime();
61
-                        if (DateTime.TryParse(date, out dt))
63
+                        Model.T_Sys_WorkCalendar wc = new BLL.T_Sys_WorkCalendar().GetModel(dt);
64
+                        if (wc != null)
62 65
                         {
63
-                            Model.T_Sys_WorkCalendar wc = new BLL.T_Sys_WorkCalendar().GetModel(dt);
64
-                            if (wc != null)
66
+                            if (wc.F_EditFlag == false) //没有修改过
65 67
                             {
66
-                                if (wc.F_EditFlag == false) //没有修改过
68
+                                if (wc.F_WorkingFlag)
67 69
                                 {
68
-                                    if (wc.F_WorkingFlag)
69
-                                    {
70
-                                        wc.F_WorkingFlag = false;
71
-                                    }
72
-                                    else
73
-                                    {
74
-                                        wc.F_WorkingFlag = true;
75
-                                    }
76
-                                    wc.F_EditFlag = true;
70
+                                    wc.F_WorkingFlag = false;
77 71
                                 }
78
-                                else//修改过 
72
+                                else
79 73
                                 {
80
-                                    if (wc.F_WorkingFlag)
81
-                                    {
82
-                                        wc.F_WorkingFlag = false;
83
-                                    }
84
-                                    else
85
-                                    {
86
-                                        wc.F_WorkingFlag = true;
87
-                                    }
88
-                                    wc.F_EditFlag = false;
74
+                                    wc.F_WorkingFlag = true;
89 75
                                 }
90
-                                bool rvalue = new BLL.T_Sys_WorkCalendar().Update(wc);
91
-                                if (rvalue)
76
+                                wc.F_EditFlag = true;
77
+                            }
78
+                            else//修改过 
79
+                            {
80
+                                if (wc.F_WorkingFlag)
92 81
                                 {
93
-                                    res = Success("设置成功!");
82
+                                    wc.F_WorkingFlag = false;
94 83
                                 }
95 84
                                 else
96 85
                                 {
97
-                                    res = Error("设置失败!");
86
+                                    wc.F_WorkingFlag = true;
98 87
                                 }
88
+                                wc.F_EditFlag = false;
89
+                            }
90
+                            bool rvalue = new BLL.T_Sys_WorkCalendar().Update(wc);
91
+                            if (rvalue)
92
+                            {
93
+                                res = Success("设置成功!");
99 94
                             }
100 95
                             else
101 96
                             {
102
-                                res = Error("获取对象失败");
97
+                                res = Error("设置失败!");
103 98
                             }
104 99
                         }
105 100
                         else
106 101
                         {
107
-                            res = Error("日期格式不正确");
102
+                            res = Error("获取对象失败");
108 103
                         }
109 104
                     }
110 105
                     else
111 106
                     {
112
-                        res = Error("获取参数失败");
107
+                        res = Error("日期格式不正确");
113 108
                     }
114
-            
109
+                }
110
+                else
111
+                {
112
+                    res = Error("获取参数失败");
113
+                }
114
+
115 115
             }
116 116
             return res;
117 117
         }
@@ -124,51 +124,51 @@ namespace CallCenterApi.Interface.Controllers.tel
124 124
             {
125 125
                 string sql = "";
126 126
                 DataTable dt = new DataTable();
127
-               
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
+                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
+                }
140 135
 
141
-                    if (strpageindex.Trim() != "")
142
-                    {
143
-                        pageindex = Convert.ToInt32(strpageindex);
144
-                    }
136
+                string strpageindex = RequestString.GetQueryString("page");
137
+                int pageindex = 1;
138
+                string strpagesize = RequestString.GetQueryString("pagesize");
139
+                int pagesize = 10;
145 140
 
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);
141
+                if (strpageindex.Trim() != "")
142
+                {
143
+                    pageindex = Convert.ToInt32(strpageindex);
144
+                }
161 145
 
162
-                    var obj = new
163
-                    {
164
-                        state = "success",
165
-                        message = "成功",
166
-                        rows = dt,
167
-                        total = recordCount
168
-                    };
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
+                };
169
+
170
+                res = Content(obj.ToJson());
169 171
 
170
-                    res = Content(obj.ToJson());
171
-            
172 172
             }
173 173
             return res;
174 174
         }
@@ -179,26 +179,26 @@ namespace CallCenterApi.Interface.Controllers.tel
179 179
             ActionResult res = NoToken("未知错误,请重新登录");
180 180
             if (Request.IsAuthenticated)
181 181
             {
182
-                
183
-                    if (id != null && id.Trim() != "")
182
+
183
+                if (id != null && id.Trim() != "")
184
+                {
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)
184 188
                     {
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
-                        }
189
+                        res = Success("获取成功", dModel);
195 190
                     }
196 191
                     else
197 192
                     {
198
-                        res = Error("获取参数失败");
193
+                        res = Error("获取失败");
199 194
                     }
200
-                
201
-             
195
+                }
196
+                else
197
+                {
198
+                    res = Error("获取参数失败");
199
+                }
200
+
201
+
202 202
             }
203 203
             return res;
204 204
         }
@@ -209,97 +209,94 @@ namespace CallCenterApi.Interface.Controllers.tel
209 209
             ActionResult res = NoToken("未知错误,请重新登录");
210 210
             if (Request.IsAuthenticated)
211 211
             {
212
-                
213
-                    int userId = CurrentUser.UserData.F_UserId;
214
-                    if (userId != 0)
212
+
213
+                int userId = CurrentUser.UserData.F_UserId;
214
+                if (userId != 0)
215
+                {
216
+                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
217
+                    if (ua != null)
215 218
                     {
216
-                        Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
217
-                        if (ua != null)
219
+                        res = Error("操作失败");
220
+                        if (workid != null && workid != "")
218 221
                         {
219
-                            res=Error("操作失败");
220
-                            if (workid != null && workid != "")
222
+                            int id = 0;
223
+                            if (int.TryParse(workid, out id))
221 224
                             {
222
-                                int id = 0;
223
-                                if (int.TryParse(workid, out id))
225
+                                BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
226
+                                Model.T_Sys_WorkTimes dModel = dBLL.GetModel(id);
227
+                                if (dModel != null)
224 228
                                 {
225
-                                    BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
226
-                                    Model.T_Sys_WorkTimes dModel = dBLL.GetModel(id);
227
-                                    if (dModel != null)
229
+                                    if (!string.IsNullOrWhiteSpace(workstart.Trim()))
228 230
                                     {
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
-                                        }
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 249
 
250
-                                        bool b = dBLL.Update(dModel);
251
-                                        if (b)
252
-                                        {
253
-                                            res = Success("编辑成功");
254
-                                        }
255
-                                        else
256
-                                        {
257
-                                            res = Error("编辑失败");
258
-                                        }
250
+                                    bool b = dBLL.Update(dModel);
251
+                                    if (b)
252
+                                    {
253
+                                        res = Success("编辑成功");
254
+                                    }
255
+                                    else
256
+                                    {
257
+                                        res = Error("编辑失败");
259 258
                                     }
260 259
                                 }
261 260
                             }
262
-                            else
261
+                        }
262
+                        else
263
+                        {
264
+                            Model.T_Sys_WorkTimes _model = new Model.T_Sys_WorkTimes();
265
+                            if (!string.IsNullOrWhiteSpace(workstart.Trim()))
263 266
                             {
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;
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_DeptId = CurrentUser.UserData.F_DeptId;
289 286
 
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
-                                }
287
+                            int b = new BLL.T_Sys_WorkTimes().Add(_model);
288
+                            if (b > 0)
289
+                            {
290
+                                res = Success("添加成功");
291
+                            }
292
+                            else
293
+                            {
294
+                                res = Error("添加失败");
299 295
                             }
300 296
                         }
301 297
                     }
302
-            
298
+                }
299
+
303 300
             }
304 301
             return res;
305 302
         }
@@ -310,26 +307,26 @@ namespace CallCenterApi.Interface.Controllers.tel
310 307
             ActionResult res = NoToken("未知错误,请重新登录");
311 308
             if (Request.IsAuthenticated)
312 309
             {
313
-                
314
-                    if (ids != null && ids.Length > 0)
310
+
311
+                if (ids != null && ids.Length > 0)
312
+                {
313
+                    string idd = " ";
314
+                    foreach (string str in ids)
315 315
                     {
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("删除失败");
316
+                        idd += "'" + str + "',";
327 317
                     }
328
-                    else
318
+                    if (new BLL.T_Sys_WorkTimes().DeleteList(idd.TrimEnd(',')))
329 319
                     {
330
-                        res = Error("请选择要删除的记录");
320
+                        res = Success("删除成功");
331 321
                     }
332
-            
322
+                    else
323
+                        res = Error("删除失败");
324
+                }
325
+                else
326
+                {
327
+                    res = Error("请选择要删除的记录");
328
+                }
329
+
333 330
             }
334 331
             return res;
335 332
         }

+ 5 - 31
CallCenterApi/CallCenterApi.Model/T_Sys_WorkTimes.cs

@@ -15,10 +15,7 @@ namespace CallCenterApi.Model
15 15
         private DateTime? _f_workendtimes;
16 16
         private string _f_timename;
17 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 int? _f_deptid;
22 19
         /// <summary>
23 20
         /// 
24 21
         /// </summary>
@@ -62,35 +59,12 @@ namespace CallCenterApi.Model
62 59
         /// <summary>
63 60
         /// 
64 61
         /// </summary>
65
-        public int? F_UserID
62
+        public int? F_DeptId
66 63
         {
67
-            set { _f_userid = value; }
68
-            get { return _f_userid; }
69
-        }
70
-        /// <summary>
71
-        /// 
72
-        /// </summary>
73
-        public string F_UserCode
74
-        {
75
-            set { _f_usercode = value; }
76
-            get { return _f_usercode; }
77
-        }
78
-        /// <summary>
79
-        /// 
80
-        /// </summary>
81
-        public string F_UserName
82
-        {
83
-            set { _f_username = value; }
84
-            get { return _f_username; }
85
-        }
86
-        /// <summary>
87
-        /// 
88
-        /// </summary>
89
-        public DateTime? F_CreateOn
90
-        {
91
-            set { _f_createon = value; }
92
-            get { return _f_createon; }
64
+            set { _f_deptid = value; }
65
+            get { return _f_deptid; }
93 66
         }
67
+
94 68
         #endregion Model
95 69
 
96 70
     }