提交分支

RMYY_CallCenter_Api.Bll/T_Wowo_repairyqbll.cs

@@ -47,8 +47,9 @@ namespace RMYY_CallCenter_Api.Bll
         /// </summary>
         public List<T_Wowo_repairyq> GetListall()
         {
-            DataSet ds = dal.GetListall();
-            return DataTableToList(ds.Tables[0]);
+            //DataSet ds = dal.GetListall();
+            //return DataTableToList(ds.Tables[0]);
+            return dal.GetListall();
         }
         /// <summary>
         /// 分页获取数据列表

RMYY_CallCenter_Api.Bll/T_Wowo_wocodetypebll.cs

@@ -51,7 +51,7 @@ namespace RMYY_CallCenter_Api.Bll
         /// <summary>
         /// 获取院区信息
         /// </summary>
-        public DataSet GetListall()
+        public List<RMYY_CallCenter_Api.Model.T_Wowo_wocodetype> GetListall()
         {
             return dal.GetListall();
         }

RMYY_CallCenter_Api.Dal/T_Wowo_repairyqdal.cs

@@ -96,11 +96,12 @@ namespace RMYY_CallCenter_Api.Dal
         /// <summary>
         /// 获取院区信息
         /// </summary>
-        public DataSet GetListall()
+        public List<RMYY_CallCenter_Api.Model.T_Wowo_repairyq> GetListall()
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("SELECT * FROM  T_Wowo_repairyq ");
-            return DbHelperSQL.Query(strSql.ToString());
+            DataSet ds= DbHelperSQL.Query(strSql.ToString());
+            return DataTableToList(ds.Tables[0]);
         }
         /// <summary>
         /// 分页获取
@@ -157,6 +158,26 @@ namespace RMYY_CallCenter_Api.Dal
                 return null;
             }
         }
+
+        public List<RMYY_CallCenter_Api.Model.T_Wowo_repairyq> DataTableToList(DataTable dt)
+        {
+            List<RMYY_CallCenter_Api.Model.T_Wowo_repairyq> modelList = new List<RMYY_CallCenter_Api.Model.T_Wowo_repairyq>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                RMYY_CallCenter_Api.Model.T_Wowo_repairyq model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = DataRowToModel(dt.Rows[n]);
+                    if (model != null)
+                    {
+                        modelList.Add(model);
+                    }
+                }
+            }
+            return modelList;
+        }
+
         /// <summary>
         /// 得到一个对象实体
         /// </summary>

RMYY_CallCenter_Api.Dal/T_Wowo_wocodetypedal.cs

@@ -93,11 +93,12 @@ namespace RMYY_CallCenter_Api.Dal
         /// <summary>
         /// 获取院区信息
         /// </summary>
-        public DataSet GetListall()
+        public List<RMYY_CallCenter_Api.Model.T_Wowo_wocodetype> GetListall()
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("SELECT * FROM  T_Wowo_wocodetype ");
-            return DbHelperSQL.Query(strSql.ToString());
+            DataSet ds = DbHelperSQL.Query(strSql.ToString());
+            return DataTableToList(ds.Tables[0]);
         }
         /// <summary>
         /// 分页获取
@@ -154,6 +155,27 @@ namespace RMYY_CallCenter_Api.Dal
                 return null;
             }
         }
+
+
+        public List<RMYY_CallCenter_Api.Model.T_Wowo_wocodetype> DataTableToList(DataTable dt)
+        {
+            List<RMYY_CallCenter_Api.Model.T_Wowo_wocodetype> modelList = new List<RMYY_CallCenter_Api.Model.T_Wowo_wocodetype>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                RMYY_CallCenter_Api.Model.T_Wowo_wocodetype model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = DataRowToModel(dt.Rows[n]);
+                    if (model != null)
+                    {
+                        modelList.Add(model);
+                    }
+                }
+            }
+            return modelList;
+        }
+
         /// <summary>
         /// 得到一个对象实体
         /// </summary>

RMYY_CallCenter_Api.Utility/Tree/TreeModel.cs

@@ -42,7 +42,7 @@ namespace RMYY_CallCenter_Api.Utility
             get { return _text; }
         }
         /// <summary>
-        /// 工单级别类型
+        /// 工单级别类型  (部门类型  1 院区  2 部门)
         /// </summary>
         public int? TypeId { get; set; }
         private List<TreeModel> _children;

RMYY_CallCenter_Api/Controllers/System/DepartmentController.cs

@@ -11,6 +11,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
     public class DepartmentController : BaseController
     {
         private Bll.T_Sys_Department departmentBLL = new Bll.T_Sys_Department();
+        private Bll.T_Wowo_repairyqbll yqBll = new Bll.T_Wowo_repairyqbll();
 
         // GET: Department
         /// <summary>
@@ -61,45 +62,60 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public ActionResult GetTreeList()
+        public ActionResult GetTreeList(int hosid=0,int pid=0)
         {
+            var hoslist = yqBll.GetListall();
             var dptmodel = departmentBLL.GetModelList(" F_State=1");
             dptmodel.Sort((x, y) => x.F_Sort ?? 0 - y.F_Sort ?? 0);//排序
             var treeList = new List<TreeModel>();
-            foreach (var item in dptmodel.Where(p =>p.F_ParentId == 0).ToList())
+            if (hoslist.Count > 0)
             {
-                TreeModel treeModel = new TreeModel();
-                treeModel.id = item.F_DeptId.ToString();
-                treeModel.IconCls = "";
-                treeModel.text = item.F_DeptName;
-                treeModel.parentid = item.F_ParentId.ToString();
-                treeModel.children = TreeRecursion(dptmodel, item.F_DeptId.ToString());
-                treeList.Add(treeModel);
+                foreach (var hositem in hoslist)
+                {
+                    TreeModel treeModel = new TreeModel();
+                    treeModel.id = hositem.T_Woid.ToString();
+                    treeModel.IconCls = "";
+                    treeModel.text = hositem.T_Woname;
+                    treeModel.parentid = "-1";
+                    treeModel.TypeId = 1;
+                    treeModel.children = TreeRecursion(dptmodel, "0", hositem.T_Woid);
+                    treeList.Add(treeModel);
+                    //var dptlist = dptmodel.Where(p => p.F_ParentId == 0 && p.T_Woid == hositem.T_Woid).ToList();
+                }
             }
             //return Content(treeList.ToJson());
             return Success("获取菜单树成功", treeList);
         }
 
-        private List<TreeModel> TreeRecursion(List<Model.T_Sys_Department> data, string parentId = "0")
+        private List<TreeModel> TreeRecursion(List<Model.T_Sys_Department> data, string parentId = "0", int hosid = 0)
         {
+            List<Model.T_Sys_Department> item = null;
             List<TreeModel> newList = new List<TreeModel>();
-            if (parentId != "0")
+            //if (parentId != "0")
+            //{
+            if (hosid != 0)
+            {
+                item = data.FindAll(t => t.F_ParentId.ToString() == parentId && t.T_Woid == hosid);//data建议在调用此扩展方法前已经排序过
+            }
+            else
+            {
+                item = data.FindAll(t => t.F_ParentId.ToString() == parentId);//data建议在调用此扩展方法前已经排序过
+            }
+            if (item.Count > 0)
             {
-                List<Model.T_Sys_Department> item = data.FindAll(t => t.F_ParentId.ToString() == parentId);//data建议在调用此扩展方法前已经排序过
-                if (item.Count > 0)
+                foreach (Model.T_Sys_Department entity in item)
                 {
-                    foreach (Model.T_Sys_Department entity in item)
-                    {
-                        TreeModel treeModel = new TreeModel();
-                        treeModel.id = entity.F_DeptId.ToString();
-                        treeModel.IconCls = "";
-                        treeModel.text = entity.F_DeptName;
-                        treeModel.parentid = entity.F_ParentId.ToString();
-                        treeModel.children = TreeRecursion(item, entity.F_DeptId.ToString());
-                        newList.Add(treeModel);
-                    }
+                    TreeModel treeModel = new TreeModel();
+                    treeModel.id = entity.F_DeptId.ToString();
+                    treeModel.IconCls = "";
+                    treeModel.text = entity.F_DeptName;
+                    treeModel.parentid = entity.F_ParentId.ToString();
+                    treeModel.TypeId = 2;
+                    treeModel.children = TreeRecursion(item, entity.F_DeptId.ToString());
+                    newList.Add(treeModel);
                 }
             }
+            //}
             return newList;
         }