zhupei %!s(int64=4) %!d(string=hace) años
padre
commit
bf50deb616

+ 9 - 6
RMYY_CallCenter_Api/Controllers/DictionaryType/GongDanTypeController.cs

@@ -73,7 +73,7 @@ namespace RMYY_CallCenter_Api.Controllers
73 73
             model.F_Sort = input.F_Sort;
74 74
             model.F_ParentID = input.F_ParentID;
75 75
             model.F_CreateTime = DateTime.Now;
76
-            //model.F_TypeId = input.F_TypeId;
76
+            model.F_TypeId = input.F_TypeId;
77 77
             if (gongdanBll.Add(model) > 0)
78 78
             {
79 79
                 return Success("类型添加成功!");
@@ -101,7 +101,7 @@ namespace RMYY_CallCenter_Api.Controllers
101 101
                     remark = entity_ModuleInfo.F_Remark,
102 102
                     sort = entity_ModuleInfo.F_Sort,
103 103
                     fid=entity_ModuleInfo.F_ParentID,
104
-                    //tid=entity_ModuleInfo.F_TypeId
104
+                    tid=entity_ModuleInfo.F_TypeId
105 105
                 });
106 106
             }
107 107
             else
@@ -121,14 +121,17 @@ namespace RMYY_CallCenter_Api.Controllers
121 121
             {
122 122
                 string idd = " ";
123 123
                 foreach (string str in ids)
124
-                {
124
+                {                    
125
+                    var model = gongdanBll.GetModel(Convert.ToInt32(str));
126
+                    if(model.F_TypeId==1 || model.F_TypeId==2)
127
+                        return Error("不能删除一级二级工单类型!");
125 128
                     idd += str + ",";
126 129
                 }
127 130
                 #region 判断子栏目是否存在
128 131
                 var sql = "";
129 132
                 sql += "F_ParentID in (" + idd.TrimEnd(',') + ") ";
130
-                var list = gongdanBll.DataTableToList(gongdanBll.GetList(sql).Tables[0]);
131
-                if (list.Count > 0)
133
+                var list =gongdanBll.GetList(sql).Tables[0];
134
+                if (list.Rows.Count > 0)
132 135
                     return Error("操作失败:子栏目存在,不能删除");
133 136
                 #endregion
134 137
                 if (gongdanBll.DeleteList(idd.TrimEnd(',')))
@@ -161,7 +164,7 @@ namespace RMYY_CallCenter_Api.Controllers
161 164
                 ModuleInfo.F_Name = input.F_Name;
162 165
                 ModuleInfo.F_Remark = input.F_Remark;
163 166
                 ModuleInfo.F_Sort = input.F_Sort;
164
-                //ModuleInfo.F_TypeId = input.F_TypeId;
167
+                ModuleInfo.F_TypeId = input.F_TypeId;
165 168
                 if (gongdanBll.Update(ModuleInfo))
166 169
                 {
167 170
                     return Success("修改成功");

+ 45 - 4
RMYY_CallCenter_Api/Controllers/System/KnowledgeController.cs

@@ -13,6 +13,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
13 13
     public class KnowledgeController : BaseController
14 14
     {
15 15
         Bll.T_Sys_Knowledge knbll = new Bll.T_Sys_Knowledge();
16
+        Bll.T_Sys_GongDan gdbll = new Bll.T_Sys_GongDan();
16 17
 
17 18
 
18 19
         /// <summary>
@@ -72,10 +73,8 @@ namespace RMYY_CallCenter_Api.Controllers.System
72 73
 
73 74
         }
74 75
             
75
-
76
-
77 76
         //添加知识库
78
-        public ActionResult AddInfo(string title, string key, string con, string tid, string fileids)
77
+        public ActionResult AddInfo(string title, string key, string con, string tid, string fileids="")
79 78
         {
80 79
 
81 80
             Model.T_Sys_Knowledge kmodel = new Model.T_Sys_Knowledge();
@@ -111,7 +110,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
111 110
         }
112 111
 
113 112
         //编辑知识库
114
-        public ActionResult EditInfo(int kid,string title, string key, string con, string tid, string fileids)
113
+        public ActionResult EditInfo(int kid,string title, string key, string con, string tid, string fileids="")
115 114
         {
116 115
             if (kid > 0)
117 116
             {
@@ -168,5 +167,47 @@ namespace RMYY_CallCenter_Api.Controllers.System
168 167
 
169 168
         }
170 169
 
170
+        /// <summary>
171
+        /// 获取工单类型树
172
+        /// </summary>
173
+        /// <returns></returns>
174
+        public ActionResult GetTypeTree()
175
+        {
176
+            var tmodel = gdbll.GetModelList("");
177
+            tmodel.Sort((x, y) => x.F_Sort- y.F_Sort);//排序
178
+            var treeList = new List<TreeModel>();
179
+            foreach (var item in tmodel.Where(p => p.F_ParentID == 0).ToList())
180
+            {
181
+                TreeModel treeModel = new TreeModel();
182
+                treeModel.id = item.F_GDId.ToString();
183
+                treeModel.IconCls = item.F_ImgUrl; 
184
+                treeModel.text = item.F_Name;
185
+                treeModel.parentid = item.F_ParentID.ToString();
186
+                treeModel.children = TreeRecursion(tmodel, item.F_GDId.ToString());
187
+                treeList.Add(treeModel);
188
+            }
189
+            //return Content(treeList.ToJson());
190
+            return Success("获取菜单树成功", treeList);
191
+        }
192
+
193
+        public List<TreeModel> TreeRecursion(List<Model.T_Sys_GongDan> dt, string parentid="0")
194
+        {
195
+            List<TreeModel> treelist = new List<TreeModel>();
196
+            if (parentid != "0")
197
+            {
198
+                foreach (var item in dt.Where(p => p.F_ParentID == Convert.ToInt32(parentid)).ToList())
199
+                {
200
+                    TreeModel treeModel = new TreeModel();
201
+                    treeModel.id = item.F_GDId.ToString();
202
+                    treeModel.IconCls = item.F_ImgUrl;
203
+                    treeModel.text = item.F_Name;
204
+                    treeModel.parentid = item.F_ParentID.ToString();
205
+                    treeModel.children = TreeRecursion(dt, item.F_GDId.ToString());
206
+                    treelist.Add(treeModel);
207
+                }
208
+            }
209
+            return treelist;
210
+        }
211
+
171 212
     }
172 213
 }

+ 19 - 19
RMYY_CallCenter_Api/Controllers/WorkOrder/Con_WorkOrderController.cs

@@ -239,7 +239,7 @@ namespace RMYY_CallCenter_Api.Controllers
239 239
             if (User != null)
240 240
             {
241 241
                 #region 添加判断
242
-                if (!(input.F_Type1 > 0 && input.F_Type1 < 6))
242
+                if (!(input.F_Type1!=1001 || input.F_Type1 != 1002 ||input.F_Type1 != 1003 || input.F_Type1 != 1004 || input.F_Type1 != 1005))
243 243
                     return Error("工单类型错误!");
244 244
                 if (opt == 0)
245 245
                     return Error("请选择处理方式!");
@@ -247,12 +247,12 @@ namespace RMYY_CallCenter_Api.Controllers
247 247
                     return Error("请输入客户姓名!");
248 248
                 if (string.IsNullOrEmpty(input.F_Phon))
249 249
                     return Error("请输入客户电话!");
250
-                if (input.F_Type1 == 4)
250
+                if (input.F_Type1 == 1004)
251 251
                 {
252 252
                     if (string.IsNullOrEmpty(input.F_ServiceItems))
253 253
                         return Error("请选择服务项目!");
254 254
                 }
255
-                if (input.F_Type1 == 3)
255
+                if (input.F_Type1 == 1003)
256 256
                 {
257 257
                     if (string.IsNullOrEmpty(input.F_Address))
258 258
                         return Error("请填写地区!");
@@ -278,7 +278,7 @@ namespace RMYY_CallCenter_Api.Controllers
278 278
                     {
279 279
                         if (work != null)
280 280
                         {
281
-                            if(input.F_Type1==1 || input.F_Type1 == 3)
281
+                            if(input.F_Type1==1001 || input.F_Type1 == 1003)
282 282
                             {
283 283
                                 var res = DealWO(User, work, cont, "", 1);
284 284
                                 if (res)
@@ -295,7 +295,7 @@ namespace RMYY_CallCenter_Api.Controllers
295 295
                     }
296 296
                     else if (opt == 2)//提交审核
297 297
                     {
298
-                        if (input.F_Type1 == 2)//投诉建议需要提交审核
298
+                        if (input.F_Type1 == 1002)//投诉建议需要提交审核
299 299
                         {
300 300
                             Model.T_Sys_UserAccount userleader = userbll.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=60 ").FirstOrDefault();//护士长角色
301 301
                             if (userleader != null)
@@ -310,7 +310,7 @@ namespace RMYY_CallCenter_Api.Controllers
310 310
                     }
311 311
                     else if (opt == 3)//转派
312 312
                     {
313
-                        if (input.F_Type1 == 4 || input.F_Type1 == 5)//家庭预约,静脉置管维护 立即处理并给健康事业部或置管室 推送一条钉钉消息
313
+                        if (input.F_Type1 == 1004 || input.F_Type1 == 1005)//家庭预约,静脉置管维护 立即处理并给健康事业部或置管室 推送一条钉钉消息
314 314
                         {
315 315
                             int clbm = 0;//健康事业部的部门Id
316 316
                             bool tt = DealWO(User, work, cont, "", 1);
@@ -420,7 +420,7 @@ namespace RMYY_CallCenter_Api.Controllers
420 420
                     {
421 421
                         if (model != null)
422 422
                         {
423
-                            if (input.F_Type1 == 1 || input.F_Type1 == 3)
423
+                            if (input.F_Type1 == 1001 || input.F_Type1 == 1003)
424 424
                             {
425 425
                                 var res = DealWO(user, model, cont, "", 1);
426 426
                                 if (res)
@@ -437,7 +437,7 @@ namespace RMYY_CallCenter_Api.Controllers
437 437
                     }
438 438
                     else if (opt == 2)//提交审核
439 439
                     {
440
-                        if (input.F_Type1 == 2)//投诉建议需要提交审核
440
+                        if (input.F_Type1 == 1002)//投诉建议需要提交审核
441 441
                         {
442 442
                             Model.T_Sys_UserAccount userleader = userbll.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=60 ").FirstOrDefault();//护士长角色
443 443
                             if (userleader != null)
@@ -452,7 +452,7 @@ namespace RMYY_CallCenter_Api.Controllers
452 452
                     }
453 453
                     else if (opt == 3)//转派
454 454
                     {
455
-                        if (input.F_Type1 == 4 || input.F_Type1 == 5)//家庭预约,静脉置管维护 立即处理并给健康事业部或置管室 推送一条钉钉消息
455
+                        if (input.F_Type1 == 1004 || input.F_Type1 == 1005)//家庭预约,静脉置管维护 立即处理并给健康事业部或置管室 推送一条钉钉消息
456 456
                         {
457 457
                             int clbm = 0;//健康事业部的部门Id
458 458
                             bool tt = DealWO(user, model, cont, "", 1);
@@ -537,11 +537,11 @@ namespace RMYY_CallCenter_Api.Controllers
537 537
             model.F_Phon = input.F_Phon;//来电人电话
538 538
             model.F_CusAddress = input.F_CusAddress;//地址
539 539
             model.F_IdCard = input.F_IdCard;//身份证号
540
-            if (input.F_Type1 == 4)
540
+            if (input.F_Type1 == 1004)
541 541
             {
542 542
                 model.F_ServiceItems = input.F_ServiceItems;//服务项目
543 543
             }
544
-            if (input.F_Type1 == 3)
544
+            if (input.F_Type1 == 1003)
545 545
             {
546 546
                 model.F_Address = input.F_Address;//地区
547 547
                 model.F_FirstCheckHospital = input.F_FirstCheckHospital;//首次检查医院
@@ -552,7 +552,7 @@ namespace RMYY_CallCenter_Api.Controllers
552 552
                 else
553 553
                     model.F_Urgency = model.F_Urgency;
554 554
             }
555
-            if (input.F_Type1 == 5)
555
+            if (input.F_Type1 == 1005)
556 556
             {
557 557
                 model.F_Cathetertype = input.F_Cathetertype;//  
558 558
                 model.F_Catheterdept = input.F_Catheterdept;//置管科室
@@ -644,19 +644,19 @@ namespace RMYY_CallCenter_Api.Controllers
644 644
                     Inputmodel.F_Source = item.F_Source;//工单来源
645 645
 
646 646
                     Inputmodel.F_Type1 = item.F_type1;//工单来源
647
-                    if (item.F_type1 == 1)
647
+                    if (item.F_type1 == 1001)
648 648
                     {
649 649
                         Inputmodel.F_TypeName1 = "健康咨询";//工单类别最高
650 650
                     }
651
-                    else if (item.F_type1 == 2)
651
+                    else if (item.F_type1 == 1002)
652 652
                     {
653 653
                         Inputmodel.F_TypeName1 = "投诉建议";
654 654
                     }
655
-                    else if (item.F_type1 == 3)
655
+                    else if (item.F_type1 == 1003)
656 656
                     {
657 657
                         Inputmodel.F_TypeName1 = "外聘专家咨询";
658 658
                     }
659
-                    else if (item.F_type1 == 4)
659
+                    else if (item.F_type1 == 1004)
660 660
                     {
661 661
                         Inputmodel.F_TypeName1 = "家庭预约上门";
662 662
                     }
@@ -725,11 +725,11 @@ namespace RMYY_CallCenter_Api.Controllers
725 725
                     Inputmodel.F_CusAddress = item.F_CusAddress;//地址
726 726
                     Inputmodel.F_Phon = item.F_Phon;//电话
727 727
                     Inputmodel.F_IdCard = item.F_IdCard;//身份证号
728
-                    if (item.F_type1 == 4)
728
+                    if (item.F_type1 == 1004)
729 729
                     {
730 730
                         Inputmodel.F_ServiceItems = item.F_ServiceItems;//服务项目
731 731
                     }
732
-                    if (item.F_type1 == 3)
732
+                    if (item.F_type1 == 1003)
733 733
                     {
734 734
                         Inputmodel.F_Address = item.F_Address;//地区
735 735
                         Inputmodel.F_FirstCheckHospital = item.F_FirstCheckHospital;//首次检查医院
@@ -737,7 +737,7 @@ namespace RMYY_CallCenter_Api.Controllers
737 737
                         Inputmodel.F_FirstFindTime = item.F_FirstFindTime;//首次发现肺结节时间
738 738
                         Inputmodel.F_Urgency = item.F_Urgency;//紧急程度
739 739
                     }
740
-                    if (item.F_type1 == 5)
740
+                    if (item.F_type1 == 1005)
741 741
                     {
742 742
                         Inputmodel.F_Cathetertype = item.F_Cathetertype;//置管类型
743 743
                         Inputmodel.F_Catheterdept = item.F_Catheterdept;//置管科室

+ 38 - 0
RMYY_CallCenter_Api/Controllers/WorkOrderBaseController.cs

@@ -14,6 +14,7 @@ namespace RMYY_CallCenter_Api.Controllers
14 14
         private Bll.T_Sys_Department deptbll = new Bll.T_Sys_Department();
15 15
         private Bll.T_Sys_UserAccount userbll = new Bll.T_Sys_UserAccount();
16 16
         private Bll.T_Wowo_repairyqbll yqbll = new Bll.T_Wowo_repairyqbll();
17
+        private Bll.T_Sys_GongDan gdbll = new Bll.T_Sys_GongDan();
17 18
         // GET: WorkOrderBase
18 19
 
19 20
       
@@ -128,6 +129,43 @@ namespace RMYY_CallCenter_Api.Controllers
128 129
             return Error("不存在此科室信息");
129 130
         }
130 131
 
132
+        /// <summary>
133
+        /// 获取工单类型
134
+        /// </summary>
135
+        /// <param name="pid"></param>
136
+        /// <param name="typeid"></param>
137
+        /// <returns></returns>
138
+        public ActionResult GetGongDanType(int pid = 0, int typeid = 1)
139
+        {
140
+            var modelist = gdbll.GetModelList("");
141
+            if (pid != 0)
142
+            {
143
+                var obj = new
144
+                {
145
+                    rows = modelist.Where(t => t.F_ParentID == pid && t.F_TypeId == typeid).Select(p => new
146
+                    {
147
+                        fid = p.F_GDId,
148
+                        fname = p.F_Name,
149
+                        pid = p.F_ParentID
150
+                    })
151
+                };
152
+                return Content(obj.ToJson());
153
+            }
154
+            else
155
+            {
156
+                var obj = new
157
+                {
158
+                    rows = modelist.Where(t => t.F_TypeId == typeid).Select(p => new
159
+                    {
160
+                        fid = p.F_GDId,
161
+                        fname = p.F_Name,
162
+                        pid = p.F_ParentID
163
+                    })
164
+                };
165
+                return Content(obj.ToJson());
166
+            }
167
+
168
+        }
131 169
 
132 170
         /// <summary>
133 171
         /// 上传附件