xiugai

RMYY_CallCenter_Api.Model/T_Sys_Department.cs

@@ -25,12 +25,12 @@ namespace RMYY_CallCenter_Api.Model
         private string _f_floordistribution;
         private string _f_officetelephone;
 
-        private int _f_transfertype = 0;
-        
+        private int? _f_transfertype = 0;
+
         /// <summary>
-        /// 0是转值班 1 是转组长
+        /// 0 是转值班 1 是转组长  默认0
         /// </summary>
-        public int F_TransferType
+        public int? F_TransferType
         {
             set { _f_transfertype = value; }
             get { return _f_transfertype; }

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -264,7 +264,7 @@ namespace RMYY_CallCenter_Api
         /// </summary>
         /// <param name="dt"></param>
         /// <returns></returns>
-        public static DataTable SetOtherField(DataTable dt, MENUENUM menuName,string usercode, int roleId = 0, int type = 0,int mysubmit=0,int workuser=0)//报修列表是值班人员workuser传1，
+        public static DataTable SetOtherField(DataTable dt, MENUENUM menuName,string usercode, int roleId = 0, int type = 0,int mysubmit=0,int workuser=0,int transfertype=0)//报修列表是值班人员workuser传1，  // transfertype 0 是转值班 1 是转组长 默认0
         {
             if (dt.Columns.Contains("Buttons") && dt.Columns.Contains("GapTime") && dt.Columns.Contains("StateName"))
             {
@@ -495,20 +495,36 @@ namespace RMYY_CallCenter_Api
 
                 #endregion
 
-                //仅仅值班人员可以有这三个按钮
-                if (menuName == MENUENUM.报修列表 && workuser==0)
+                //仅仅值班人员或者组长可以有这三个按钮 workuser=0 不是值班人也不是组长
+                if (menuName == MENUENUM.报修列表 && workuser == 0)
                 {
+
                     var hasButton = allButtons.Where(p => p.value == "内协作").FirstOrDefault();
                     var hasButton1 = allButtons.Where(p => p.value == "外协作").FirstOrDefault();
                     var hasButton2 = allButtons.Where(p => p.value == "转部门").FirstOrDefault();
                     allButtons.Remove(hasButton);
                     allButtons.Remove(hasButton1);
-                    allButtons.Remove(hasButton2);
+                    allButtons.Remove(hasButton2);               
+
                 }
 
+                //转组长和转值班是互斥的按钮，根据部门类型设置的选项决定
+                if (menuName == MENUENUM.报修列表 )
+                {
+                    if (transfertype == 0)
+                    {
+                        var existButton = allButtons.Where(p => p.value == "转组长").FirstOrDefault();
+                        allButtons.Remove(existButton);
+                    }
+                    else
+                    {
+                        var existButton = allButtons.Where(p => p.value == "转值班").FirstOrDefault();
+                        allButtons.Remove(existButton);
+                    }
+                }
 
-                    // 工单管理  我的提交页面，数据有我的提交和我处理的， 只有自己申请的工单 能催单
-                    if (menuName== MENUENUM.我的提交 && mysubmit == 0)
+                // 工单管理  我的提交页面，数据有我的提交和我处理的， 只有自己申请的工单 能催单
+                if (menuName== MENUENUM.我的提交 && mysubmit == 0)
                 {
                     if (dr["F_Proposer"].ToString() != usercode)
                     {

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -1502,7 +1502,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
                     if (userzz != null && userzz.Count > 0)
                     {
-                        //转同事
+                       
                         model.F_Maintenancer = userzz.First().F_UserCode;
                         model.F_UpdateTime = DateTime.Now;
                         model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.receive;
@@ -1660,30 +1660,56 @@ namespace RMYY_CallCenter_Api.Controllers
             string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
             string strworkcode = HttpUtility.UrlDecode(RequestString.GetQueryString("workordercode"));
 
-            #region    今天值班人员可看到全部工单，其他人员看到个人工单
+            //获取部门表中设置的，当前部门是转组长还是转值班
+            //  0 是转值班 1 是转组长 默认0
+            Model.T_Sys_Department depmodel = departmentBLL.GetModel(User.F_DeptId);
+            int transfertype = 0;
+            if (depmodel != null && depmodel.F_TransferType != null)
+            {
+                transfertype = depmodel.F_TransferType.Value;
+            }
+            #region  部门表中设置的转值班，值班人员 可看到部门工单； 设置转组长 ，组长可以看见部门工单；其他人员看到个人工单
+
 
-           List<T_Sys_GroupClass>  GroupClass= GetWorkUser(User.F_DeptId);
             int workuser = 0;
+            if (transfertype == 0)
+            {
+                List<T_Sys_GroupClass> GroupClass = GetWorkUser(User.F_DeptId);
+                if (GroupClass != null && GroupClass.Count > 0)
+                {
+                    var iszhibanrenyuan = GroupClass.Where(x => x.F_UserCode.Contains(User.F_UserCode)).ToList();
 
-            if (GroupClass != null && GroupClass.Count > 0)
-            {            
-                var iszhibanrenyuan = GroupClass.Where(x => x.F_UserCode.Contains(User.F_UserCode)).ToList();
+                    if (iszhibanrenyuan != null && iszhibanrenyuan.Count > 0)
+                    {
+                        workuser = 1;//当前登录人是值班人员
+                        sql += " and F_MaintenanceDept='" + User.F_DeptId + "'";
+                    }
+                    else
+                    {
+                        sql += " and F_Maintenancer='" + User.F_UserCode + "'";
 
-                if (iszhibanrenyuan!=null&& iszhibanrenyuan.Count>0)
-                {
-                    workuser = 1;//当前登录人是值班人员
-                    sql += " and F_MaintenanceDept='" + User.F_DeptId + "'";
+                    }
                 }
                 else
                 {
                     sql += " and F_Maintenancer='" + User.F_UserCode + "'";
-                    
+
                 }
             }
+
             else
             {
-                sql += " and F_Maintenancer='" + User.F_UserCode + "'";
-
+                //  判断当前登录人是不是组长角色               
+                var user = new Bll.T_Sys_UserAccount().GetModelList(" F_UserCode='"+User.F_UserCode+ "' and F_RoleId in ( select F_RoleId from T_Sys_Role where F_RoleCode='WXBZZ' and F_State =1)");
+                if (user!=null && user.Count>0)
+                {
+                    sql += " and F_MaintenanceDept='" + User.F_DeptId + "'";
+                    workuser = 1;
+                }
+                else
+                {
+                    sql += " and F_Maintenancer='" + User.F_UserCode + "'";
+                }
             }
             #endregion
 
@@ -1763,7 +1789,7 @@ namespace RMYY_CallCenter_Api.Controllers
                                             );
 
 
-            datatable = WorkOrderBase.SetOtherField(datatable, MENUENUM.报修列表, User.F_UserCode, User.F_RoleId, 3000,0,workuser);
+            datatable = WorkOrderBase.SetOtherField(datatable, MENUENUM.报修列表, User.F_UserCode, User.F_RoleId, 3000,0,workuser, transfertype);
 
             var obj = new
             {

RMYY_CallCenter_Api/Controllers/System/DepartmentController.cs

@@ -18,17 +18,17 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// 获取列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList(string keyword,int hosid=0,int pid=0, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetList(string keyword, int hosid = 0, int pid = 0, int pageindex = 1, int pagesize = 10)
         {
             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;
+                sql += $" and F_DeptName like '%" + keyword + "%'";
+            if (pid != 0)
+                sql += $" and F_ParentId= " + pid;
             if (hosid != 0)
-            sql += $" and T_Woid="+hosid;
+                sql += $" and T_Woid=" + hosid;
             int recordCount = 0;
             if (!string.IsNullOrEmpty(sql))
             {
@@ -47,20 +47,21 @@ namespace RMYY_CallCenter_Api.Controllers.System
 
                                 );
             //  List<Model.T_Sys_Department> carlist = new Bll.T_Sys_Department().DataTableToList(date);
-                var obj = new
-                {
-                    state = "success",
-                    message = "成功",
-                    rows = date,
-                    total = recordCount
-                };
-                return Content(obj.ToJson());
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                rows = date,
+                total = recordCount
+            };
+            return Content(obj.ToJson());
         }
 
         /// <summary>
         /// 返回树形下拉框 菜单数据
         /// </summary>
         /// <returns></returns>
+   
         [HttpGet]
         public ActionResult GetTreeList(int hosid=0,int pid=0)
         {
@@ -164,7 +165,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="sort"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult Insert(int pid, string code, string name,int hosid, string location, string floorDistribution, string officeTelephone, int sort=0,int transfertype=0)
+        public ActionResult Add(int pid, string code, string name,int hosid, string location, string floorDistribution, string officeTelephone, int sort=0,int transfertype=0)
         {
             if (departmentBLL.Exists(code))
             {
@@ -208,7 +209,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="sort"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult Update(int id, int pid, string code, string name, int sort,int hosid,string location,string floorDistribution,string officeTelephone,int transfertype=0)
+        public ActionResult Edit(int id, int pid, string code, string name, int sort,int hosid,string location,string floorDistribution,string officeTelephone,int transfertype=0)
         {
             Model.T_Sys_Department dModel = departmentBLL.GetModel(id);
             if (dModel != null)

RMYY_CallCenter_Api/Controllers/System/MenuController.cs

@@ -168,7 +168,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="sort"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult Insert(int pid, string code, string name, int sort, int type, string url, string function,string icon,string remark,int menutype=0, int state = 1, string workState = "")
+        public ActionResult Add(int pid, string code, string name, int sort, int type, string url, string function,string icon,string remark,int menutype=0, int state = 1, string workState = "")
         {
             if (menuBLL.Exists(code))
             {
@@ -213,7 +213,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="sort"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult Update(int id, int pid, string code, string name, int sort, int type, string url, string function, string icon,string remark, int menutype=0, int state=1, string workState = "")
+        public ActionResult Edit(int id, int pid, string code, string name, int sort, int type, string url, string function, string icon,string remark, int menutype=0, int state=1, string workState = "")
         {
             Model.T_Sys_Menu dModel = menuBLL.GetModel(id);
             if (dModel != null)

RMYY_CallCenter_Api/Controllers/System/RoleController.cs

@@ -84,7 +84,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="sort"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult Insert(string code, string name, int? sort=0)
+        public ActionResult Add(string code, string name, int? sort=0)
         {
             if (roleBLL.Exists(code))
             {
@@ -121,7 +121,7 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <param name="sort"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult Update(int id, string code, string name, int sort)
+        public ActionResult  Edit(int id, string code, string name, int sort)
         {
             Model.T_Sys_Role dModel = roleBLL.GetModel(id);
             if (dModel != null)