1550076451 1 rok temu
rodzic
commit
295bcfe9c0

+ 39 - 9
CallCenterApi/CallCenterApi.BLL/T_Sys_UserAccount.cs

340
             //  DataSet ds = dal.GetList(strWhere, filedOrder);
340
             //  DataSet ds = dal.GetList(strWhere, filedOrder);
341
             // return DataTableToList(ds.Tables[0]);
341
             // return DataTableToList(ds.Tables[0]);
342
         }
342
         }
343
-
343
+        /// <summary>
344
+        /// 获得数据列表
345
+        /// </summary>
346
+        public List<Model.T_Sys_UserAccount> GetModelList1(string strWhere, string filedOrder = "")
347
+        {
348
+            var dt = GetRedis();
349
+            if (dt != null)
350
+            {
351
+                var dtnew = new DataTable();
352
+                var drs = dt.Select(strWhere, filedOrder);
353
+                if (drs.Length > 0)
354
+                {
355
+                    dtnew = drs.CopyToDataTable();
356
+                }
357
+                return DataTableToList1(dtnew);
358
+            }
359
+            else
360
+            {
361
+                DataSet ds = dal.GetList(strWhere, filedOrder);
362
+                return DataTableToList(ds.Tables[0]);
363
+            }
364
+            //  DataSet ds = dal.GetList(strWhere, filedOrder);
365
+            // return DataTableToList(ds.Tables[0]);
366
+        }
344
         /// <summary>
367
         /// <summary>
345
 		/// 获得数据列表
368
 		/// 获得数据列表
346
 		/// </summary>
369
 		/// </summary>
361
                 var deptbll = new T_Sys_Department();
384
                 var deptbll = new T_Sys_Department();
362
                 var rolebll = new T_Sys_RoleInfo();
385
                 var rolebll = new T_Sys_RoleInfo();
363
                 var seatbll = new T_Sys_SeatGroup();
386
                 var seatbll = new T_Sys_SeatGroup();
387
+                var dept = deptbll.GetModelList("");
388
+                var roles = rolebll.GetModelList("");
389
+                var seat = seatbll.GetModelList("");
364
 
390
 
365
                 Model.T_Sys_UserAccount model;
391
                 Model.T_Sys_UserAccount model;
366
                 for (int n = 0; n < rowsCount; n++)
392
                 for (int n = 0; n < rowsCount; n++)
370
                     {
396
                     {
371
                         if (model.F_DeptId > 0)
397
                         if (model.F_DeptId > 0)
372
                         {
398
                         {
373
-                            model.depname = deptbll.GetModel(model.F_DeptId)?.F_DeptName ?? "";
399
+                            var dept1 = dept.Where(x => x.F_DeptId == model.F_DeptId);
400
+                            if (dept1!=null&& dept1.Count() > 0)
401
+                            {
402
+                                model.depname = dept1.FirstOrDefault().F_DeptName ?? "";
403
+                            }
374
                         }
404
                         }
375
                         if (model.F_RoleId > 0)
405
                         if (model.F_RoleId > 0)
376
                         {
406
                         {
377
-                            var role = rolebll.GetModel(model.F_RoleId);
378
-                            if (role != null)
407
+                            var role = roles.Where(x=>x.F_RoleId==model.F_RoleId);
408
+                            if (role != null&& role.Count() > 0)
379
                             {
409
                             {
380
-                                model.rolname = role.F_RoleName;
381
-                                model.F_RoleCode = role.F_RoleCode;
410
+                                model.rolname = role.FirstOrDefault().F_RoleName;
411
+                                model.F_RoleCode = role.FirstOrDefault().F_RoleCode;
382
                             }
412
                             }
383
                         }
413
                         }
384
                         if (!string.IsNullOrEmpty(model.F_SeartGroupCode))
414
                         if (!string.IsNullOrEmpty(model.F_SeartGroupCode))
385
                         {
415
                         {
386
-                            var group = seatbll.GetList("F_ZXZCode='" + model.F_SeartGroupCode + "' ").Tables[0];
387
-                            if (group != null && group.Rows.Count > 0)
416
+                            var group = seat.Where(x => x.F_ZXZCode == model.F_SeartGroupCode);
417
+                            if (group != null && group.Count() > 0)
388
                             {
418
                             {
389
-                                model.zxzname = group.Rows[0]["F_ZXZName"] != null ? group.Rows[0]["F_ZXZName"].ToString() : "";
419
+                                model.zxzname = group.FirstOrDefault().F_ZXZName != null ? group.FirstOrDefault().F_ZXZName : "";
390
                             }
420
                             }
391
                         }
421
                         }
392
                         modelList.Add(model);
422
                         modelList.Add(model);

+ 19 - 8
CallCenterApi/CallCenterApi.DAL/T_Bus_Feedback.cs

38
         {
38
         {
39
             StringBuilder strSql = new StringBuilder();
39
             StringBuilder strSql = new StringBuilder();
40
             strSql.Append("insert into T_Bus_Feedback(");
40
             strSql.Append("insert into T_Bus_Feedback(");
41
-            strSql.Append("F_AssignedId,F_WorkOrderId,F_Result,F_CreateTime,F_CreateUser,F_CreateDeptId,F_IsFeedEnd,F_File,F_Type,F_State,F_IsAudit,F_AuditUser,F_AuditTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DealUser,F_AuditReason,F_IsProResult,F_ProSituation,F_IsProtect,F_DealUserContact,F_ConnectTime,F_ConnectMode,F_ReplyContent,F_IsSatisfied,F_Duties,F_Situation,F_Unsuccessful,F_AuditPost,F_AuditContact,F_FeedbackReason)");
41
+            strSql.Append("F_AssignedId,F_WorkOrderId,F_Result,F_CreateTime,F_CreateUser,F_CreateDeptId,F_IsFeedEnd,F_File,F_Type,F_State,F_IsAudit,F_AuditUser,F_AuditTime,F_IsDelete,F_DeleteUser,F_DeleteTime,F_DealUser,F_AuditReason,F_IsProResult,F_ProSituation,F_IsProtect,F_DealUserContact,F_ConnectTime,F_ConnectMode,F_ReplyContent,F_IsSatisfied,F_Duties,F_Situation,F_Unsuccessful,F_AuditPost,F_AuditContact,F_FeedbackReason,F_SatisfiedReason)");
42
             strSql.Append(" values (");
42
             strSql.Append(" values (");
43
-            strSql.Append("@F_AssignedId,@F_WorkOrderId,@F_Result,@F_CreateTime,@F_CreateUser,@F_CreateDeptId,@F_IsFeedEnd,@F_File,@F_Type,@F_State,@F_IsAudit,@F_AuditUser,@F_AuditTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_DealUser,@F_AuditReason,@F_IsProResult,@F_ProSituation,@F_IsProtect,@F_DealUserContact,@F_ConnectTime,@F_ConnectMode,@F_ReplyContent,@F_IsSatisfied,@F_Duties,@F_Situation,@F_Unsuccessful,@F_AuditPost,@F_AuditContact,@F_FeedbackReason)");
43
+            strSql.Append("@F_AssignedId,@F_WorkOrderId,@F_Result,@F_CreateTime,@F_CreateUser,@F_CreateDeptId,@F_IsFeedEnd,@F_File,@F_Type,@F_State,@F_IsAudit,@F_AuditUser,@F_AuditTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime,@F_DealUser,@F_AuditReason,@F_IsProResult,@F_ProSituation,@F_IsProtect,@F_DealUserContact,@F_ConnectTime,@F_ConnectMode,@F_ReplyContent,@F_IsSatisfied,@F_Duties,@F_Situation,@F_Unsuccessful,@F_AuditPost,@F_AuditContact,@F_FeedbackReason,@F_SatisfiedReason)");
44
             strSql.Append(";select @@IDENTITY");
44
             strSql.Append(";select @@IDENTITY");
45
             SqlParameter[] parameters = {
45
             SqlParameter[] parameters = {
46
                     new SqlParameter("@F_AssignedId", SqlDbType.Int,4),
46
                     new SqlParameter("@F_AssignedId", SqlDbType.Int,4),
77
 
77
 
78
                      
78
                      
79
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar),
79
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar),
80
-                      new SqlParameter("@F_FeedbackReason", SqlDbType.NVarChar,500)
80
+                      new SqlParameter("@F_FeedbackReason", SqlDbType.NVarChar,500),
81
+                       new SqlParameter("@F_SatisfiedReason", SqlDbType.NVarChar,500)
82
+                      
81
             };
83
             };
82
             parameters[0].Value = model.F_AssignedId;
84
             parameters[0].Value = model.F_AssignedId;
83
             parameters[1].Value = model.F_WorkOrderId;
85
             parameters[1].Value = model.F_WorkOrderId;
111
             parameters[29].Value = model.F_AuditContact;
113
             parameters[29].Value = model.F_AuditContact;
112
             parameters[30].Value = model.F_Situation;
114
             parameters[30].Value = model.F_Situation;
113
             parameters[31].Value = model.F_FeedbackReason;
115
             parameters[31].Value = model.F_FeedbackReason;
116
+            parameters[32].Value = model.F_SatisfiedReason;
117
+            
114
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
118
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
115
             if (obj == null)
119
             if (obj == null)
116
             {
120
             {
161
             strSql.Append("F_AuditContact=@F_AuditContact,");
165
             strSql.Append("F_AuditContact=@F_AuditContact,");
162
             
166
             
163
             strSql.Append("F_Situation=@F_Situation,");
167
             strSql.Append("F_Situation=@F_Situation,");
164
-            strSql.Append("F_FeedbackReason=@F_FeedbackReason");
168
+            strSql.Append("F_FeedbackReason=@F_FeedbackReason,");
169
+            strSql.Append("F_SatisfiedReason=@F_SatisfiedReason");
170
+            
165
             strSql.Append(" where F_Id=@F_Id");
171
             strSql.Append(" where F_Id=@F_Id");
166
             SqlParameter[] parameters = {
172
             SqlParameter[] parameters = {
167
                     new SqlParameter("@F_AssignedId", SqlDbType.Int,4),
173
                     new SqlParameter("@F_AssignedId", SqlDbType.Int,4),
198
                     
204
                     
199
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar),
205
                     new SqlParameter("@F_Situation", SqlDbType.NVarChar),
200
 
206
 
201
-                     new SqlParameter("@F_FeedbackReason", SqlDbType.NVarChar),
202
-                    
203
-
207
+                     new SqlParameter("@F_FeedbackReason", SqlDbType.NVarChar,500),
208
+                      new SqlParameter("@F_SatisfiedReason", SqlDbType.NVarChar,500),
209
+                     
204
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
210
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
205
             parameters[0].Value = model.F_AssignedId;
211
             parameters[0].Value = model.F_AssignedId;
206
             parameters[1].Value = model.F_WorkOrderId;
212
             parameters[1].Value = model.F_WorkOrderId;
236
             
242
             
237
             parameters[31].Value = model.F_Situation;
243
             parameters[31].Value = model.F_Situation;
238
             parameters[32].Value = model.F_FeedbackReason;
244
             parameters[32].Value = model.F_FeedbackReason;
239
-            parameters[33].Value = model.F_Id;
245
+            parameters[33].Value = model.F_SatisfiedReason;
246
+            parameters[34].Value = model.F_Id;
240
 
247
 
241
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
248
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
242
             if (rows > 0)
249
             if (rows > 0)
460
                 {
467
                 {
461
                     model.F_AuditContact = row["F_AuditContact"].ToString();
468
                     model.F_AuditContact = row["F_AuditContact"].ToString();
462
                 }
469
                 }
470
+                if (row["F_SatisfiedReason"] != null)
471
+                {
472
+                    model.F_SatisfiedReason = row["F_SatisfiedReason"].ToString();
473
+                }
463
                 
474
                 
464
             }
475
             }
465
             return model;
476
             return model;

+ 4 - 7
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/HistoryController.cs

71
         //[Authority]
71
         //[Authority]
72
         public ActionResult GetList()
72
         public ActionResult GetList()
73
         {
73
         {
74
-            
75
             string name = RequestString.GetFormString("name");
74
             string name = RequestString.GetFormString("name");
75
+            string sql = "";
76
             if (!string .IsNullOrEmpty (name))
76
             if (!string .IsNullOrEmpty (name))
77
             {
77
             {
78
-                string sql = "and F_Name='" + name + "'";
78
+                 sql = "and F_Name='" + name + "'";
79
             }
79
             }
80
-           
81
-            
82
-            var modellist  = new BLL.T_Sys_History().GetModelList ("F_UserID='"+ User.F_UserId + "'");
83
-           
84
-            return Success("加载成功", modellist);
80
+            var modellist  = new BLL.T_Sys_History().GetList(100,"F_UserID='"+ User.F_UserId + "' "+ sql, " F_ID desc ");
81
+            return Success("加载成功", new BLL.T_Sys_History().DataTableToList(modellist.Tables[0]));
85
         }
82
         }
86
     }
83
     }
87
 }
84
 }

+ 8 - 7
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

521
         public ActionResult GetSeatList()
521
         public ActionResult GetSeatList()
522
         {
522
         {
523
             //List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(" f_seatflag=1 ");
523
             //List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(" f_seatflag=1 ");
524
-            var drs = sysUserAccountBll.GetModelList ("f_seatflag=1");
525
-            var userSeartList = from r in drs select new {
526
-                F_UserId =r .F_UserId ,
527
-                F_UserName = r.F_UserName,
528
-                F_UserCode = r.F_UserCode
529
-            };
530
-           // var result = userSeartList.OrderBy(p => p.F_UserName.Substring(p.F_UserName.Length - 1)).ToList();
524
+            var drs = sysUserAccountBll.GetModelList1 ("f_seatflag=1");
525
+            //var userSeartList = from r in drs select new {
526
+            //    F_UserId =r .F_UserId ,
527
+            //    F_UserName = r.F_UserName,
528
+            //    F_UserCode = r.F_UserCode
529
+            //};
530
+            var userSeartList = drs.Select(p => new { p.F_UserId, p.F_UserName,p.F_UserCode });
531
+            // var result = userSeartList.OrderBy(p => p.F_UserName.Substring(p.F_UserName.Length - 1)).ToList();
531
 
532
 
532
             return Success("列表加载成功", userSeartList);
533
             return Success("列表加载成功", userSeartList);
533
         }
534
         }

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

3273
                         paras.APPLY_NAME = User.F_UserName;
3273
                         paras.APPLY_NAME = User.F_UserName;
3274
                         paras.APPLY_DELAYNUM = newlimittime;
3274
                         paras.APPLY_DELAYNUM = newlimittime;
3275
                         paras.APPLY_ATTATH_ID = files;
3275
                         paras.APPLY_ATTATH_ID = files;
3276
-                        if (type == 1)
3276
+                        if (types == 1)
3277
                             paras.APPLY_TYPE = "20";
3277
                             paras.APPLY_TYPE = "20";
3278
-                        else if (type == 2)
3278
+                        else if (types == 2)
3279
                             paras.APPLY_TYPE = "30";
3279
                             paras.APPLY_TYPE = "30";
3280
                         else
3280
                         else
3281
                             paras.APPLY_TYPE = "10";
3281
                             paras.APPLY_TYPE = "10";

+ 0 - 10
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/ConvergeController.cs

200
 
200
 
201
 
201
 
202
         }
202
         }
203
-
204
-
205
-
206
-
207
         public string pushcase_info(string workorderid)
203
         public string pushcase_info(string workorderid)
208
         {
204
         {
209
             Model.T_Bus_WorkOrder model = new BLL.T_Bus_WorkOrder().GetModel(workorderid);
205
             Model.T_Bus_WorkOrder model = new BLL.T_Bus_WorkOrder().GetModel(workorderid);
1200
                 return "工单不不存在";
1196
                 return "工单不不存在";
1201
 
1197
 
1202
         }
1198
         }
1203
-     
1204
-
1205
         string AREA_CODE = Configs.GetValue("AREACODE");
1199
         string AREA_CODE = Configs.GetValue("AREACODE");
1206
-
1207
         private BLL.T_Bus_WorkOrder workorderBLL = new BLL.T_Bus_WorkOrder();
1200
         private BLL.T_Bus_WorkOrder workorderBLL = new BLL.T_Bus_WorkOrder();
1208
         #region 服务工单受理
1201
         #region 服务工单受理
1209
         public class submit_case_info
1202
         public class submit_case_info
1923
             model.CreateTime = DateTime.Now;
1916
             model.CreateTime = DateTime.Now;
1924
             return model;
1917
             return model;
1925
         }
1918
         }
1926
-
1927
-
1928
-
1929
         #endregion
1919
         #endregion
1930
         # region 工单最终评价
1920
         # region 工单最终评价
1931
         public class submit_case_visit_info
1921
         public class submit_case_visit_info

+ 59 - 27
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

2368
             string strname = HttpUtility.UrlDecode(RequestString.GetQueryString("name"));
2368
             string strname = HttpUtility.UrlDecode(RequestString.GetQueryString("name"));
2369
             int islike = RequestString.GetInt("islike", 1);
2369
             int islike = RequestString.GetInt("islike", 1);
2370
             string strtel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
2370
             string strtel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
2371
+            string note = HttpUtility.UrlDecode(RequestString.GetQueryString("note"));
2371
             string strkey = HttpUtility.UrlDecode(RequestString.GetQueryString("key"));
2372
             string strkey = HttpUtility.UrlDecode(RequestString.GetQueryString("key"));
2372
             string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
2373
             string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
2373
             string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
2374
             string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
2377
             string visituser = HttpUtility.UrlDecode(RequestString.GetQueryString("visituser"));//回访人
2378
             string visituser = HttpUtility.UrlDecode(RequestString.GetQueryString("visituser"));//回访人
2378
             string order = "ORDER BY a.F_Id DESC";
2379
             string order = "ORDER BY a.F_Id DESC";
2379
 
2380
 
2381
+            string smalltypes = HttpUtility.UrlDecode(RequestString.GetQueryString("smalltypes"));
2382
+
2383
+
2380
             int source = RequestString.GetInt("source", 0);
2384
             int source = RequestString.GetInt("source", 0);
2381
             int keyid = RequestString.GetInt("keyid", 0);
2385
             int keyid = RequestString.GetInt("keyid", 0);
2382
             int type = RequestString.GetInt("type", 0);
2386
             int type = RequestString.GetInt("type", 0);
2383
             int bigtype = RequestString.GetInt("bigtype", 0);
2387
             int bigtype = RequestString.GetInt("bigtype", 0);
2384
             int smalltype = RequestString.GetInt("smalltype", 0);
2388
             int smalltype = RequestString.GetInt("smalltype", 0);
2389
+            
2385
             int sourcearea = RequestString.GetInt("sourcearea", 0);
2390
             int sourcearea = RequestString.GetInt("sourcearea", 0);
2386
             int tobereply = RequestString.GetInt("tobereply", 0);
2391
             int tobereply = RequestString.GetInt("tobereply", 0);
2387
             int deptid = RequestString.GetInt("deptid", 0);
2392
             int deptid = RequestString.GetInt("deptid", 0);
2390
             int isresult = RequestString.GetInt("isresult", -1);
2395
             int isresult = RequestString.GetInt("isresult", -1);
2391
             
2396
             
2392
             int smspy = RequestString.GetInt("smspy", -1);//0未发送短信1
2397
             int smspy = RequestString.GetInt("smspy", -1);//0未发送短信1
2398
+            int isprotect = RequestString.GetInt("isprotect", -1);//是否保密0否1是
2393
             int db = RequestString.GetInt("db", 0);
2399
             int db = RequestString.GetInt("db", 0);
2394
             int islabel = RequestString.GetInt("islabel", 0);
2400
             int islabel = RequestString.GetInt("islabel", 0);
2395
             int visit = RequestString.GetInt("visit", -2);//0满意1一评不满意2二评不满意
2401
             int visit = RequestString.GetInt("visit", -2);//0满意1一评不满意2二评不满意
2422
 
2428
 
2423
                 }
2429
                 }
2424
 
2430
 
2431
+
2432
+            if(isprotect>-1)
2433
+            {
2434
+                sql += " and a.F_IsProtect=" + isprotect;
2435
+            }
2436
+            
2425
             if (isresult > -1)
2437
             if (isresult > -1)
2426
             {
2438
             {
2427
                 sql += " and a.F_IsResult="+ isresult;
2439
                 sql += " and a.F_IsResult="+ isresult;
2428
             }
2440
             }
2429
             if (contentment>-2)
2441
             if (contentment>-2)
2430
             {
2442
             {
2431
-                if (contentment ==4)
2432
-                {
2433
-                    sql += " and a.F_Contentment>0  ";
2434
-                }
2435
-                else 
2443
+                sql += " and a.F_Contentment>0  ";
2444
+               
2445
+                if (contentment!=4)
2436
                 {
2446
                 {
2437
-                    sql += " and a.F_Contentment="+ contentment;
2447
+                    sql += " and a.F_Contentment=" + contentment;
2438
                 }
2448
                 }
2449
+                //else 
2450
+                //{
2451
+                   
2452
+                //}
2439
             }
2453
             }
2454
+
2440
             
2455
             
2441
-           
2456
+
2457
+           if (note.Trim() != "" && note != "undefined")
2458
+            {
2459
+                sql += " and a.F_Note   like '%|||" + note + "'";
2460
+            }
2442
 
2461
 
2443
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
2462
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
2444
             {
2463
             {
2463
             if (strtab!="2")
2482
             if (strtab!="2")
2464
             {
2483
             {
2465
               
2484
               
2466
-                if (jianhang == 4)
2485
+                if (smspy==-1)
2467
                 {
2486
                 {
2468
-                    sql += " and F_InfoSource = '2580'";
2469
-                }
2470
-                else
2471
-                {
2472
-                    if (strtab != "5")
2473
-                        if (islabel !=1)
2474
-                        {
2475
-                            sql += " and F_InfoSource != '2580'";
2476
-                        }
2487
+                    if (jianhang == 4)
2488
+                    {
2489
+                        sql += " and F_InfoSource = '2580'";
2490
+                    }
2491
+                    else
2492
+                    {
2493
+                        if (strtab != "5")
2494
+                            if (islabel != 1)
2495
+                            {
2496
+                                sql += " and F_InfoSource != '2580'";
2497
+                            }
2498
+                    }
2477
                 }
2499
                 }
2500
+               
2478
             }
2501
             }
2479
             if (smspy > -1)
2502
             if (smspy > -1)
2480
             {
2503
             {
2881
             {
2904
             {
2882
                 sql += " and F_InfoConSmallType = '" + smalltype + "' ";
2905
                 sql += " and F_InfoConSmallType = '" + smalltype + "' ";
2883
             }
2906
             }
2907
+            
2908
+            if (smalltypes.Trim() != "" && smalltypes != "undefined")
2909
+            {
2910
+                sql += " and a.F_InfoConSmallType in("+ smalltypes + ") ";
2911
+            }
2912
+
2884
             if (islabel>0)
2913
             if (islabel>0)
2885
             {
2914
             {
2886
                 sql += " and F_InfoConSmallType >0 ";
2915
                 sql += " and F_InfoConSmallType >0 ";
2891
             }
2920
             }
2892
             if (deptid != 0)
2921
             if (deptid != 0)
2893
             {
2922
             {
2894
-                sql += " and  (a.F_MainDeptId in (select F_DeptId from  GetDeptId ('" + deptid + "')) or a.F_MainDeptID3  like'%" + deptid + "%')";
2923
+                sql += " and  (a.F_MainDeptId ='"+ deptid + "' or a.F_MainDeptID3  like'%" + deptid + "%')";
2895
             }
2924
             }
2896
             else
2925
             else
2897
             {
2926
             {
10966
                         if (!string.IsNullOrEmpty(modelT_Bus_WorkOrder.F_Content))
10995
                         if (!string.IsNullOrEmpty(modelT_Bus_WorkOrder.F_Content))
10967
                             message = modelT_Bus_WorkOrder.F_Content;
10996
                             message = modelT_Bus_WorkOrder.F_Content;
10968
                         else
10997
                         else
10969
-                            message = modelT_Bus_WorkOrder.F_ComTitle;
10998
+                            message = modelT_Bus_WorkOrder.F_ComContent;
10970
                         if (content != message)
10999
                         if (content != message)
10971
                         {
11000
                         {
10972
                             // modelT_Bus_WorkOrder.F_Content = content;
11001
                             // modelT_Bus_WorkOrder.F_Content = content;
13367
         //[Authority]
13396
         //[Authority]
13368
         public ActionResult SuperWorkOrder()
13397
         public ActionResult SuperWorkOrder()
13369
         {
13398
         {
13370
-
13371
-
13372
-
13373
             string workorderid = RequestString.GetFormString("workorderid");
13399
             string workorderid = RequestString.GetFormString("workorderid");
13374
             int type = RequestString.GetInt("type", 0);//1领导批示 2市长指示 3转督办
13400
             int type = RequestString.GetInt("type", 0);//1领导批示 2市长指示 3转督办
13375
             string superuser = RequestString.GetFormString("superuser");
13401
             string superuser = RequestString.GetFormString("superuser");
17935
                 string auditContact = RequestString.GetFormString("auditContact");//审核领导职务
17961
                 string auditContact = RequestString.GetFormString("auditContact");//审核领导职务
17936
 
17962
 
17937
                 string feedbackreason = RequestString.GetFormString("feedbackReason");//办理操作里   是否向当事人反馈,选择否的时候,有个输入框,可以填原因,
17963
                 string feedbackreason = RequestString.GetFormString("feedbackReason");//办理操作里   是否向当事人反馈,选择否的时候,有个输入框,可以填原因,
17938
-
17939
-
17964
+                string staisfiedreason = RequestString.GetFormString("staisfiedreason");//不满意原因
17965
+                if ((isstaisfied == -1 || isstaisfied == 3) &&string.IsNullOrEmpty(staisfiedreason))
17966
+                {
17967
+                    return Error("请输入不满意原因");
17968
+                }
17940
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
17969
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
17941
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
17970
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
17942
                 Model.T_Bus_Feedback modelT_Bus_Feedback = new Model.T_Bus_Feedback();
17971
                 Model.T_Bus_Feedback modelT_Bus_Feedback = new Model.T_Bus_Feedback();
17972
                                     modelT_Bus_Feedback.F_ConnectMode = connectmode;//沟通方式
18001
                                     modelT_Bus_Feedback.F_ConnectMode = connectmode;//沟通方式
17973
                                     modelT_Bus_Feedback.F_ReplyContent = replycontent;//答复内容
18002
                                     modelT_Bus_Feedback.F_ReplyContent = replycontent;//答复内容
17974
                                     modelT_Bus_Feedback.F_IsSatisfied = isstaisfied;//是否满意:0未评价,1满意,2基本满意,3不满意
18003
                                     modelT_Bus_Feedback.F_IsSatisfied = isstaisfied;//是否满意:0未评价,1满意,2基本满意,3不满意
18004
+                                  
18005
+                                        
17975
 
18006
 
17976
                                     modelT_Bus_Feedback.F_FeedbackReason = feedbackreason;
18007
                                     modelT_Bus_Feedback.F_FeedbackReason = feedbackreason;
17977
 
18008
 
20474
                     oper.F_File = model.F_File;
20505
                     oper.F_File = model.F_File;
20475
                     string userinfo = deptname + "(" + code + ")";
20506
                     string userinfo = deptname + "(" + code + ")";
20476
                     oper.F_Message = userinfo + "发送了市民评价短信";
20507
                     oper.F_Message = userinfo + "发送了市民评价短信";
20477
-
20508
+                    oper.F_CreateTime = DateTime.Now;
20478
                     oper.F_CreateUser = code;
20509
                     oper.F_CreateUser = code;
20479
                    
20510
                    
20480
                     oper.F_IsDelete = 0;
20511
                     oper.F_IsDelete = 0;
20630
                         oper.F_File = model.F_File;
20661
                         oper.F_File = model.F_File;
20631
                         oper.F_Message = userinfo + "转出了工单";
20662
                         oper.F_Message = userinfo + "转出了工单";
20632
                         oper.F_CreateUser = code;
20663
                         oper.F_CreateUser = code;
20633
-
20664
+                        oper.F_CreateTime = DateTime.Now;
20634
                         oper.F_IsDelete = 0;
20665
                         oper.F_IsDelete = 0;
20635
                         operBLL.Add(oper);
20666
                         operBLL.Add(oper);
20636
                     }
20667
                     }
20703
                         oper.F_File = model.F_File;
20734
                         oper.F_File = model.F_File;
20704
                         string userinfo = deptname + "(" + code + ")";
20735
                         string userinfo = deptname + "(" + code + ")";
20705
                         oper.F_Message = userinfo + "发送了市民评价短信";
20736
                         oper.F_Message = userinfo + "发送了市民评价短信";
20706
-
20737
+                        oper.F_CreateTime = DateTime.Now;
20707
                         oper.F_CreateUser = code;
20738
                         oper.F_CreateUser = code;
20708
                        
20739
                        
20709
                         oper.F_IsDelete = 0;
20740
                         oper.F_IsDelete = 0;
20787
                         oper.F_WorkOrderId = dr["F_WorkOrderId"].ToString();
20818
                         oper.F_WorkOrderId = dr["F_WorkOrderId"].ToString();
20788
                         oper.F_Message =  "发送了市民评价短信";
20819
                         oper.F_Message =  "发送了市民评价短信";
20789
                         oper.F_CreateUser = "系统";
20820
                         oper.F_CreateUser = "系统";
20821
+                        oper.F_CreateTime = DateTime.Now;
20790
                         oper.F_IsDelete = 0;
20822
                         oper.F_IsDelete = 0;
20791
                         operBLL.Add(oper);
20823
                         operBLL.Add(oper);
20792
 
20824
 

+ 7 - 3
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/hb_affairsController.cs

353
             JObject paras = null;
353
             JObject paras = null;
354
             paras = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(postString);
354
             paras = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(postString);
355
             var txnBodyCom = paras["paras"].ToString();
355
             var txnBodyCom = paras["paras"].ToString();
356
+            LogFactory.GetLogger("receive_case_delay_audit").Warn(txnBodyCom);
356
             var result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnBodyCom);
357
             var result = (JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(txnBodyCom);
357
             if (result["TROWGUID"] == null)
358
             if (result["TROWGUID"] == null)
358
             {
359
             {
414
 
415
 
415
                                 TimeSpan ts = modelT_Bus_DelayTime.F_NewTime.Value.Subtract(modelT_Bus_DelayTime.F_OldTime.Value);
416
                                 TimeSpan ts = modelT_Bus_DelayTime.F_NewTime.Value.Subtract(modelT_Bus_DelayTime.F_OldTime.Value);
416
                                 int tss = int.Parse(Math.Round(ts.TotalHours, 0).ToString());
417
                                 int tss = int.Parse(Math.Round(ts.TotalHours, 0).ToString());
417
-                                modelT_Bus_WorkOrder.F_LimitTime =
418
-                                    modelT_Bus_WorkOrder.F_LimitTime.Value
419
-                                     .AddHours(tss);
418
+                                if (modelT_Bus_WorkOrder.F_LimitTime!=null)
419
+                                {
420
+                                    modelT_Bus_WorkOrder.F_LimitTime =
421
+                                   modelT_Bus_WorkOrder.F_LimitTime.Value
422
+                                    .AddHours(tss);
423
+                                }
420
                                 des = ",原定办结时间" + modelT_Bus_DelayTime.F_OldTime + ",申请延长到" + modelT_Bus_DelayTime.F_NewTime;
424
                                 des = ",原定办结时间" + modelT_Bus_DelayTime.F_OldTime + ",申请延长到" + modelT_Bus_DelayTime.F_NewTime;
421
                                 int n = DbHelperSQL.ExecuteSql(" update T_Bus_WorkOrder set F_LimitTime='" + modelT_Bus_DelayTime.F_NewTime.Value 
425
                                 int n = DbHelperSQL.ExecuteSql(" update T_Bus_WorkOrder set F_LimitTime='" + modelT_Bus_DelayTime.F_NewTime.Value 
422
                                     + "'   where F_Id ='" + modelT_Bus_WorkOrder.F_Id + "'");
426
                                     + "'   where F_Id ='" + modelT_Bus_WorkOrder.F_Id + "'");

+ 7 - 0
CallCenterApi/CallCenterApi.Model/T_Bus_Feedback.cs

274
             get { return _f_issatisfied; }
274
             get { return _f_issatisfied; }
275
         }
275
         }
276
         /// <summary>
276
         /// <summary>
277
+        /// 不满意原因
278
+        /// </summary>
279
+        public string F_SatisfiedReason
280
+        {
281
+            get;set;
282
+        }
283
+        /// <summary>
277
         /// 承办人职务
284
         /// 承办人职务
278
         /// </summary>
285
         /// </summary>
279
         public string F_Duties
286
         public string F_Duties