更新

RMYY_CallCenter_Api.Bll/T_Hos_WorkOrder.cs

@@ -134,7 +134,14 @@ namespace RMYY_CallCenter_Api.Bll
 
         #endregion  BasicMethod
         #region  ExtensionMethod
-
+        public DataSet GetListExpt(string strWhere)
+        {
+            return dal.GetListExpt(strWhere);
+        }
+        public bool CustomDelete(string idlist, string usercode)
+        {
+            return dal.CustomDelete(idlist, usercode);
+        }
         #endregion  ExtensionMethod
     }
 }

RMYY_CallCenter_Api.Dal/T_Dev_WorkOrder.cs

@@ -615,7 +615,7 @@ namespace RMYY_CallCenter_Api.Dal
         public bool CustomDelete(string idlist,string usercode)
         {
             StringBuilder strsql = new StringBuilder();
-            strsql.Append("update T_Dev_WorkOrder set F_IsDel = 1, F_DeleteBy = '"+ usercode + "', F_DeleteTime = getdate() where F_Id in ("+ idlist.TrimEnd(',') + ")");
+            strsql.Append("update T_Dev_WorkOrder set F_IsDel = 1, F_DeleteBy = '"+ usercode + "', F_DeleteTime = getdate() where F_Id in ("+ idlist.TrimEnd(',') + ")or F_WoID in (" + idlist.TrimEnd(',') + ")");
             if (DbHelperSQL.ExecuteSql(strsql.ToString()) > 0)
                 return true;
             else return false;

RMYY_CallCenter_Api.Model/T_Hos_WorkOrder.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 
 namespace RMYY_CallCenter_Api.Model
 {
+
     /// <summary>
     /// T_Hos_WorkOrder:实体类(属性说明自动提取数据库字段的描述信息)
     /// </summary>
@@ -31,6 +32,7 @@ namespace RMYY_CallCenter_Api.Model
         private DateTime? _f_createtime;
         private string _f_createcode;
         private string _f_createname;
+        private int? _f_istransfer = 0;
         private int? _f_state;
         private string _f_controlmancode;
         private string _f_controlmanname;
@@ -43,6 +45,16 @@ namespace RMYY_CallCenter_Api.Model
         private string _f_deleteby;
         private DateTime? _f_deletetime;
         private DateTime? _f_finishtime;
+        private string _f_bedposition;
+        private string _f_bedsureby;
+        private string _f_bedsurebyname;
+        private string _f_bedsurephon;
+        private int? _f_iscooperate = 0;
+        private string _f_cooperatedept;
+        private int? _f_woflag;
+        private int? _f_woid;
+        private string _f_operationcode;
+        private string _f_operationname;
         /// <summary>
         /// 
         /// </summary>
@@ -172,6 +184,14 @@ namespace RMYY_CallCenter_Api.Model
             get { return _f_createname; }
         }
         /// <summary>
+        /// 是否转派设备科
+        /// </summary>
+        public int? F_IsTransfer
+        {
+            set { _f_istransfer = value; }
+            get { return _f_istransfer; }
+        }
+        /// <summary>
         /// 工单状态
         /// </summary>
         public int? F_State
@@ -267,6 +287,86 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_finishtime = value; }
             get { return _f_finishtime; }
         }
+        /// <summary>
+        /// 病床位置
+        /// </summary>
+        public string F_BedPosition
+        {
+            set { _f_bedposition = value; }
+            get { return _f_bedposition; }
+        }
+        /// <summary>
+        /// 病床确认人
+        /// </summary>
+        public string F_BedSureBy
+        {
+            set { _f_bedsureby = value; }
+            get { return _f_bedsureby; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_BedSureByName
+        {
+            set { _f_bedsurebyname = value; }
+            get { return _f_bedsurebyname; }
+        }
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string F_BedSurePhon
+        {
+            set { _f_bedsurephon = value; }
+            get { return _f_bedsurephon; }
+        }
+        /// <summary>
+        /// 是否协作
+        /// </summary>
+        public int? F_IsCooperate
+        {
+            set { _f_iscooperate = value; }
+            get { return _f_iscooperate; }
+        }
+        /// <summary>
+        /// 协作部门
+        /// </summary>
+        public string F_CooperateDept
+        {
+            set { _f_cooperatedept = value; }
+            get { return _f_cooperatedept; }
+        }
+        /// <summary>
+        /// 工单标记：0原工单，1新工单(派生)
+        /// </summary>
+        public int? F_WoFlag
+        {
+            set { _f_woflag = value; }
+            get { return _f_woflag; }
+        }
+        /// <summary>
+        /// 原工单ID
+        /// </summary>
+        public int? F_WoID
+        {
+            set { _f_woid = value; }
+            get { return _f_woid; }
+        }
+        /// <summary>
+        /// 派单人编码
+        /// </summary>
+        public string F_OperationCode
+        {
+            set { _f_operationcode = value; }
+            get { return _f_operationcode; }
+        }
+        /// <summary>
+        /// 派单人姓名
+        /// </summary>
+        public string F_OperationName
+        {
+            set { _f_operationname = value; }
+            get { return _f_operationname; }
+        }
         #endregion Model
 
     }

RMYY_CallCenter_Api/Controllers/System/DepartmentController.cs

@@ -1,5 +1,7 @@
-using System;
+using RMYY_CallCenter_Api.Utility;
+using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
@@ -15,11 +17,91 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// 获取列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList()
+        public ActionResult GetList(string keyword,int pid=0, int pageindex = 1, int pagesize = 10)
         {
-            var list = departmentBLL.GetList(" F_State=1 ").Tables[0];
+            DataTable date = new DataTable();
+            string sql = "";
+            string where = " and F_State=1";
+            if (!string.IsNullOrEmpty(keyword))
+            sql += $" and F_DeptName like '%" + keyword + "%'";
+            if(pid!=0)
+            sql += $" and F_ParentId= "+pid;
+            int recordCount = 0;
+            if (!string.IsNullOrEmpty(sql))
+            {
+                where += sql;
+            }
+            date = Bll.PagerBll.GetListPager
+                                ("T_Sys_Department",
+                                  "F_DeptId",
+                                  "*",
+                                  where,
+                                  "order by F_DeptId desc",
+                                  pagesize,
+                                  pageindex,
+                                  true,
+                                  out recordCount
+
+                                );
+              List<Model.T_Sys_Department> carlist = new Bll.T_Sys_Department().DataTableToList(date);
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    rows = carlist,
+                    total = recordCount
+                };
+                return Content(obj.ToJson());
+        }
+
 
-            return Success("", list);
+
+
+        /// <summary>
+        /// 返回树形下拉框 菜单数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult GetTreeList()
+        {
+            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)
+            {
+                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);
+            }
+            //return Content(treeList.ToJson());
+            return Success("获取菜单树成功", treeList);
+        }
+
+        private List<TreeModel> TreeRecursion(List<Model.T_Sys_Department> data, string parentId = "0")
+        {
+            List<TreeModel> newList = new List<TreeModel>();
+            if (parentId != "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)
+                    {
+                        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);
+                    }
+                }
+            }
+            return newList;
         }
 
         /// <summary>

RMYY_CallCenter_Api/Controllers/System/RoleController.cs

@@ -18,19 +18,10 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// 获取分页列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList()
+        public ActionResult GetList(string rolecode,string rolename, int pageindex = 1, int pagesize = 10)
         {
             DataTable dt = new DataTable();
-            string sql = string.Empty;
-
-            string rolecode = Request.Params["rolecode"]?.ToString();
-            string rolename = Request.Params["rolename"]?.ToString();
-
-            string strpageindex = Request.Params["page"];
-            int pageindex = 1;
-            string strpagesize = Request.Params["pagesize"];
-            int pagesize = 10;
-
+            string sql = string.Empty;         
             if (!string.IsNullOrWhiteSpace(rolecode))
             {
                 sql += " and F_RoleCode like '%" + rolecode + "%'";
@@ -39,17 +30,6 @@ namespace RMYY_CallCenter_Api.Controllers.System
             {
                 sql += " and F_RoleName like '%" + rolename + "%'";
             }
-
-            if (!string.IsNullOrWhiteSpace(strpageindex))
-            {
-                pageindex = strpageindex.ToInt();
-            }
-
-            if (!string.IsNullOrWhiteSpace(strpagesize))
-            {
-                pagesize = strpagesize.ToInt();
-            }
-
             int recordCount = 0;
             dt = Bll.PagerBll.GetListPager(
                                     "T_Sys_Role with(nolock)",

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Mat_WorkOrderController.cs

@@ -61,16 +61,21 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 {
                     transql = GetTranPersonsql(usercode, ua.F_RoleId);
                     string assignsql = GetTransql(usercode);
-                    if (transql != "")
+                    if (assignsql != "" && transql != "")
                     {
-                        sql += $"and (F_Id in (" + transql+ ")";
+                        sql += $"and (F_Id in (" + transql + ") or F_Id in (" + assignsql + "))";
+                        wokerlist = (transql + "," + assignsql).Split(',').Distinct().ToList();
                     }
-                    if (assignsql != "")
+                    else if (transql != "")
                     {
-                        sql += $"or F_Id in (" + GetTransql(usercode) + "))";
+                        sql += $"and (F_Id in (" + transql + ")";
+                        wokerlist = transql.Split(',').Distinct().ToList();
+                    }
+                    else if (assignsql != "")
+                    {
+                        sql += $"and F_Id in (" + assignsql + ")";
+                        wokerlist = assignsql.Split(',').Distinct().ToList();
                     }
-
-                    wokerlist = (transql+","+ assignsql).Split(',').Distinct().ToList();
                 }
                 #endregion
                 int recordCount = 0;

RMYY_CallCenter_Api/Models/Enum/EnumHosWorkOrderState.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Web;
+
+namespace RMYY_CallCenter_Api.Models.Enum
+{
+    /// <summary>
+    /// 工单状态枚举
+    /// </summary>
+    public enum EnumHosWorkOrderState
+    {
+        [Description("新工单待指派")]
+        neworder,
+        [Description("已指派待确认")]
+        assign,
+        [Description("已确认待指派")]
+        sure,
+        [Description("已指派待查收")]
+        work,
+        [Description("已查收待转运")]
+        receive,
+        [Description("转运中")]
+        transport,
+        [Description("转运完成")]
+        transcomplete,
+        [Description("已指派待取配件")]
+        awaitfetch,
+        [Description("已取件待安装")]
+        fetch,
+        [Description("已安装待完成")]
+        install,
+        [Description("安装完成")]
+        installcomplete,
+        [Description("异常结束")]
+        abreback,
+        [Description("已完结")]
+        finish
+    }
+
+    /// <summary>
+    /// 工单记录类型枚举
+    /// </summary>
+    public enum EnumHosItemType
+    {
+        [Description("处理")]
+        deal = 1,
+        [Description("催办")]
+        urge = 2,
+        [Description("评价")]
+        evaluate = 3,
+        [Description("修改")]
+        update = 4,
+        [Description("删除")]
+        delete = 5,
+        [Description("回访")]
+        visit = 6,
+        [Description("审批")]
+        audit = 7,
+        [Description("延期")]
+        Delay = 8,
+    }
+    /// <summary>
+    /// 工单记录操作
+    /// </summary>
+    public enum EnumHosItemOpt
+    {
+        [Description("添加")]
+        create,
+        [Description("指派")]
+        assign,
+        [Description("确认")]
+        sure,
+        [Description("查收")]
+        receive,
+        [Description("转运")]
+        transport,
+        [Description("转运完成")]
+        transcomplete,
+        [Description("取配件")]
+        fetch,
+        [Description("安装")]
+        install,
+        [Description("安装完成")]
+        installcomplete,
+        [Description("异常结束")]
+        abreback,
+        [Description("处理完结")]
+        finish,
+        [Description("评价")]
+        evaluate,
+        [Description("修改")]
+        update,
+        [Description("删除")]
+        delete,
+        [Description("待审核")]
+        audit,
+        [Description("已审核")]
+        reaudit,
+        [Description("回访")]
+        visit,
+        [Description("延期")]
+        Delay
+
+    }
+}

RMYY_CallCenter_Api/RMYY_CallCenter_Api.csproj

@@ -150,6 +150,7 @@
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
     <Compile Include="Models\Enum\EnumDevWorkOrderState.cs" />
+    <Compile Include="Models\Enum\EnumHosWorkOrderState.cs" />
     <Compile Include="Models\Enum\EnumMatWorkOrderState.cs" />
     <Compile Include="Models\Enum\EnumWorkOrderState.cs" />
     <Compile Include="Models\Filter\FilterCategory.cs" />
@@ -178,6 +179,7 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="Views\T_Hos_WorkOrder\" />
+    <Folder Include="Views\WorkBase\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Configs\log4net.config" />