2 Revīzijas 7f3462ec3c ... a7f60d5b22

Autors SHA1 Ziņojums Datums
  zhupei a7f60d5b22 Merge branch 'master' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_Api 3 gadi atpakaļ
  zhupei 6adb531edd 提交 3 gadi atpakaļ

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 217 - 208
RMYY_CallCenter_Api.Dal/T_Call_CallRecords.cs


+ 10 - 0
RMYY_CallCenter_Api.Model/T_Call_CallRecords.cs

@@ -60,6 +60,7 @@ namespace RMYY_CallCenter_Api.Model
60 60
         private int? _f_callouttype;
61 61
         private int? _actionid = 1;
62 62
         private int? _actiontype = 0;
63
+        private string _tasktype;
63 64
         /// <summary>
64 65
         /// 呼叫编号
65 66
         /// </summary>
@@ -460,7 +461,16 @@ namespace RMYY_CallCenter_Api.Model
460 461
             set { _actiontype = value; }
461 462
             get { return _actiontype; }
462 463
         }
464
+        /// <summary>
465
+        /// 拨号类型:0:拨号外呼;1:未接来电外呼;2:回访外呼
466
+        /// </summary>
467
+        public string TaskType
468
+        {
469
+            set { _tasktype = value; }
470
+            get { return _tasktype; }
471
+        }
463 472
         public string WorkOrderId { set; get; }
473
+        public string PhoneType { set; get; }
464 474
         #endregion Model
465 475
 
466 476
     }

+ 5 - 0
RMYY_CallCenter_Api.Model/T_Wo_StatusOpt.cs

@@ -51,6 +51,11 @@ namespace RMYY_CallCenter_Api.Model
51 51
             set { _f_menuid = value; }
52 52
             get { return _f_menuid; }
53 53
         }
54
+
55
+        public string F_StateName { get; set; }
56
+
57
+        public string F_WoTypeName { get; set; }
58
+        public string F_MenuName { get; set; }
54 59
         #endregion Model
55 60
 
56 61
     }

+ 18 - 0
RMYY_CallCenter_Api/Controllers/System/UserAccountController.cs

@@ -304,5 +304,23 @@ namespace RMYY_CallCenter_Api.Controllers.System
304 304
                 return Error("设置失败");
305 305
         }
306 306
 
307
+
308
+        //获取坐席列表
309
+        public ActionResult GetSeatList()
310
+        {
311
+            //List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(" f_seatflag=1 ");
312
+            var drs = userbll.GetList("").Tables[0].Select("f_seatflag=1");
313
+            var userSeartList = from r in drs
314
+                                select new
315
+                                {
316
+                                    F_UserId = r["F_UserId"].ToString(),
317
+                                    F_UserName = r["F_UserName"].ToString(),
318
+                                    F_UserCode = r["F_UserCode"].ToString()
319
+                                };
320
+            var result = userSeartList.OrderBy(p => p.F_UserName.Substring(p.F_UserName.Length - 1)).ToList();
321
+
322
+            return Success("列表加载成功", result);
323
+        }
324
+
307 325
     }
308 326
 }

+ 80 - 1
RMYY_CallCenter_Api/Controllers/System/WoStatusOptController.cs

@@ -44,7 +44,9 @@ namespace RMYY_CallCenter_Api.Controllers.System
44 44
                       true,
45 45
                       out recordCount
46 46
                       );
47
-
47
+                data.Columns.Add("F_StateName", typeof(string));//工单状态名称
48
+                data.Columns.Add("F_WoTypeName", typeof(string));//工单类型名称
49
+                data.Columns.Add("F_MenuName", typeof(string));//功能模块名称
48 50
                 foreach (DataRow dr in data.Rows)
49 51
                 {
50 52
                     string state = dr["F_State"] != null ? dr["F_State"].ToString() : "";
@@ -53,6 +55,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
53 55
                     {
54 56
                         dr["F_StateName"] = WorkOrderBase.GetTypeState(wotype).Where(t=>t.StateId==state).FirstOrDefault().StateRemark;
55 57
                         dr["F_WoTypeName"] = gdbll.GetModel(Convert.ToInt32(dr["F_Type"])).F_Name;
58
+                        dr["F_MenuName"] = menubll.GetModel(Convert.ToInt32(dr["F_MenuId"])).F_MenuName;
56 59
                     }              
57 60
                 }
58 61
 
@@ -68,5 +71,81 @@ namespace RMYY_CallCenter_Api.Controllers.System
68 71
             }
69 72
             return Error("无操作权限!");
70 73
         }
74
+
75
+        /// <summary>
76
+        /// 获取详情
77
+        /// </summary>
78
+        /// <returns></returns>
79
+        public ActionResult GetModel(int id)
80
+        {
81
+            if (id < 0)
82
+                return Error("参数错误!");
83
+            var model = optbll.GetModel(id);
84
+            if (model != null)
85
+            {
86
+                model.F_StateName = WorkOrderBase.GetTypeState(Convert.ToInt32(model.F_Type)).Where(t => t.StateId == model.F_State.ToString()).FirstOrDefault().StateRemark;
87
+                model.F_WoTypeName= gdbll.GetModel(Convert.ToInt32(model.F_Type)).F_Name;
88
+                model.F_MenuName = menubll.GetModel(Convert.ToInt32(model.F_MenuId)).F_MenuName;
89
+                return Content(model.ToJson());
90
+
91
+            }
92
+            else
93
+                return Error("查询失败!");
94
+        }
95
+        /// <summary>
96
+        /// 添加修改
97
+        /// </summary>
98
+        /// <param name="state"></param>
99
+        /// <param name="type"></param>
100
+        /// <param name="menuid"></param>
101
+        /// <param name="id"></param>
102
+        /// <returns></returns>
103
+        public ActionResult AddModel(int state,int type,int menuid,int id=0)
104
+        {
105
+            if (state == 0)
106
+                return Error("请选择工单状态!");
107
+            if(type==0)
108
+                return Error("请选择工单类型!");
109
+            if (menuid == 0)
110
+                return Error("请选择操作按钮!");
111
+            if (id > 0)
112
+            {
113
+                var optmodel = optbll.GetModel(id);
114
+                optmodel.F_State = state;
115
+                optmodel.F_Type = type;
116
+                optmodel.F_MenuId = menuid;
117
+                optbll.Update(optmodel);
118
+                return Success("修改成功!");
119
+            }
120
+            else
121
+            {
122
+                Model.T_Wo_StatusOpt optmodel = new Model.T_Wo_StatusOpt();
123
+                optmodel.F_State = state;
124
+                optmodel.F_Type = type;
125
+                optmodel.F_MenuId = menuid;
126
+                optbll.Add(optmodel);
127
+                return Success("添加成功!");
128
+            }
129
+        }
130
+
131
+        /// <summary>
132
+        /// 删除
133
+        /// </summary>
134
+        /// <param name="ids"></param>
135
+        /// <returns></returns>
136
+        public ActionResult Delete(string[] ids)
137
+        {
138
+            if (ids != null && ids.Length > 0)
139
+            {
140
+                string idstr = string.Join(",", ids);
141
+                if (optbll.DeleteList(idstr))
142
+                    return Success("删除成功!");
143
+                else return Error("删除失败!");
144
+            }
145
+            else
146
+            {
147
+                return Error("请选择要删除的记录");
148
+            }
149
+        }
71 150
     }
72 151
 }

+ 4 - 2
RMYY_CallCenter_Api/Controllers/WorkOrderBaseController.cs

@@ -120,9 +120,10 @@ namespace RMYY_CallCenter_Api.Controllers
120 120
             var ua = userbll.GetModelList(sql);
121 121
             var obj = new
122 122
             {
123
+                state = "success",
124
+                message = "成功",
123 125
                 rows = ua.Select(p => new
124 126
                 {
125
-                    state= "success",
126 127
                     usercode = p.F_UserCode,
127 128
                     username = p.F_UserName
128 129
                 })
@@ -155,9 +156,10 @@ namespace RMYY_CallCenter_Api.Controllers
155 156
             var modellist = userbll.GetModelList(sql);
156 157
             var obj = new
157 158
             {
159
+                state = "success",
160
+                message = "成功",
158 161
                 rows = modellist.Select(p => new
159 162
                 {
160
-                    state = "success",
161 163
                     usercode = p.F_UserCode,
162 164
                     username = p.F_UserName,
163 165
                     userphon = p.F_Telephone