工单bug修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -30,7 +30,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         public ActionResult GetList(string code, string cusname, string cusphone, string companyname, string province, string city,
-            string country, string township, string touser, int type = 0, int state=-1, int pageindex = 1,int pagesize = 10)
+            string country, string township, string touser, int source=0,int type = 0, int state=0, int pageindex = 1,int pagesize = 10)
         {
            
               int userId = CurrentUser.UserData.F_UserId;
@@ -41,8 +41,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 筛选条件
                 if (type > 0 && type < 4)//工单类型
                     sql += $" and F_Type=" + type;
-                if (state >=0)//工单状态
-                    sql += $" and F_State=" + state;
+                if (source > 0)//工单来源
+                    sql += $" and F_Source=" + source;
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -61,6 +61,44 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_IncidentCountry like '%" + country.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(province))//乡
                     sql += $" and F_IncidentTownship like '%" + township.Trim() + "%'";
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
+                string uwhere = " ";
+                switch (state)
+                {
+                    case 0://待指派的
+                        if (ro.F_RoleCode == "YWY" ||  ro.F_RoleCode == "JDYPTZX" )
+                        {
+                            sql += $" and F_DealBy like '%" + ua.F_UserCode + "%'";
+                        }
+                        else
+                        {
+                            uwhere = "";
+                        }
+                        sql += $" and F_State=" + (int)EnumWorkOrderState.neworder + " " + uwhere;
+                        break;
+                    case 1://待接单的
+                      if (GetDJDWorkOrderID(ua.F_UserCode)!="")
+                        {
+                            sql += $" and F_State=" + (int)EnumWorkOrderState.assign + $"  and T_Wo_WorkOrder.F_ID in ( " + GetDJDWorkOrderID(ua.F_UserCode) + ") ";;
+                        }
+                        else
+                        {
+
+                            return Success("暂无工单"); ;
+                        }
+
+                        break;
+                    case 2://待完成的(待处理)
+                        sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
+                        break;
+                    case 10://已完成的
+                        sql += " and F_State =" + (int)EnumWorkOrderState.finish + " and F_DealBy = '" + ua.F_UserCode + "' ";
+                        break;
+                    case 3://我参与的
+                        sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ")) ";
+                        break;
+                }
                 #endregion
                 int recordCount = 0;
                 if (!string.IsNullOrWhiteSpace(sql))
@@ -71,113 +109,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         "F_ID",
                         "*,dbo.GetUserName(F_CreateBy) as F_CreateByName",
                         sql,
-                        "ORDER BY F_CustomerId desc",
+                        "ORDER BY T_Wo_WorkOrder.F_ID desc",
                         pagesize,
                         pageindex,
                         true,
                         out recordCount);
                 }
-                int total = 0;
-                List<long> woid = new List<long>();
                 List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
-                List<Model.T_Wo_WorkOrder> list = new List<Model.T_Wo_WorkOrder>();
-                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
-                Model.T_Sys_RoleInfo ro = rolebll .GetModel(ua.F_RoleId);
-                if (ro.F_RoleCode  == "JDYPTZX" || ro.F_RoleCode == "YWY" )
-                {
-                    if (modlelist.Count >0)
-                    {
-                        foreach (var it in modlelist)
-                        {
-                            if (it.F_DealBy == ua.F_UserCode)
-                            {
-                                list.Add(it);
-                                total++;
-                            }
-                        }
-                    }
-                  
-                }
-               else  if (ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
-                {
-                    List<int> detpid = new List<int>();
-                    var deparmentlist = new List<Model.T_Sys_Department>();
-                    Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
-                    if (dModel != null)
-                    {
-
-                        if (dModel.F_Layer == 1)
-                        {
-                            deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
-                            if (deparmentlist.Count > 0)
-                            {
-                                foreach (var it in deparmentlist)
-                                {
-                                    detpid.Add(it.F_DeptId);
-                                  
-                                }
-                            }
-                        }
-                        detpid.Add(dModel.F_DeptId);
-                        var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' " + " ");
-                        if (itemlast.Count > 0)
-                        {
-                            foreach (var it in itemlast)
-                            {
-                                for (int i = 0; i < detpid.Count; i++)
-                                {
-                                    if (it.F_NextDept == detpid[i])
-                                    {
-                                        woid.Add(it.F_WoID);
-                                    }
-                                }
-                            }
-                        }
-                        if (modlelist.Count >0 && woid.Count > 0)
-                        {
-                            foreach (var it in modlelist)
-                            {
-                                for (int i = 0; i < woid.Count; i++)
-                                {
-                                    if (it.F_ID == woid[i])
-                                    {
-                                        list.Add(it);
-                                        total++;
-                                    }
-                                }
-                            }
-                        }
-                       
-                    }
-                    else
-                    {
-                        return Error("加载失败");
-                    }
-                }
-                else if (ro.F_RoleCode == "QTJS")
-                {
-                    return Error("无操作权限！");
-                }
-                else
+                if (modlelist.Count > 0)
                 {
-                    if (modlelist.Count > 0 )
-                    {
-                        foreach (var it in modlelist)
-                        {
-                           list.Add(it);
-                            total++;
-                        }
-                    }
-                }
-                if (list.Count >0)
-                {
-                    List<WorkOrderNewInput> Input = modeltooip(list);
+                    List<WorkOrderNewInput> Input = modeltooip(modlelist);
                     var obj = new
                     {
                         state = "success",
                         message = "成功",
                         rows = Input,
-                        total = total
+                        total = recordCount
                     };
 
                     return Content(obj.ToJson()); ;
@@ -185,83 +132,182 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 else
                 {
 
-                    return Success ("暂无工单"); ;
+                    return Success("暂无工单"); ;
                 }
-               
-
             }
             else
             {
                 return Error("无操作权限！");
             }
-           
+            #region 
+            // if (ro.F_RoleCode  == "JDYPTZX" || ro.F_RoleCode == "YWY" )
+            // {
+
+            //     if (modlelist.Count >0)
+            //     {
+            //         foreach (var it in modlelist)
+            //         {
+            //             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + it.F_ID  + "' order by F_CreateTime desc").FirstOrDefault();
+            //             if (itemlast != null)
+
+            //             if (it.F_DealBy == ua.F_UserCode)
+            //             {
+            //                 list.Add(it);
+            //                 total++;
+            //             }
+            //         }
+            //     }
+
+            // }
+            //else  if (ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
+            // { 
+            //     List<int> detpid = new List<int>();
+            //     var deparmentlist = new List<Model.T_Sys_Department>();
+            //     Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+            //     if (dModel != null)
+            //     {
+
+            //         if (dModel.F_Layer == 1)
+            //         {
+            //             deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
+            //             if (deparmentlist.Count > 0)
+            //             {
+            //                 foreach (var it in deparmentlist)
+            //                 {
+            //                     detpid.Add(it.F_DeptId);
+
+            //                 }
+            //             }
+            //         }
+            //         detpid.Add(dModel.F_DeptId);
+            //         var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' " + " ");
+            //         if (itemlast.Count > 0)
+            //         {
+            //             foreach (var it in itemlast)
+            //             {
+            //                 for (int i = 0; i < detpid.Count; i++)
+            //                 {
+            //                     if (it.F_NextDept == detpid[i])
+            //                     {
+            //                         woid.Add(it.F_WoID);
+            //                     }
+            //                 }
+            //             }
+            //         }
+            //         if (modlelist.Count >0 && woid.Count > 0)
+            //         {
+            //             foreach (var it in modlelist)
+            //             {
+            //                 for (int i = 0; i < woid.Count; i++)
+            //                 {
+            //                     if (it.F_ID == woid[i])
+            //                     {
+            //                         list.Add(it);
+            //                         total++;
+            //                     }
+            //                 }
+            //             }
+            //         }
+
+            //     }
+            //     else
+            //     {
+            //         return Error("加载失败");
+            //     }
+            // }
+            // else if (ro.F_RoleCode == "QTJS")
+            // {
+            //     return Error("无操作权限！");
+            // }
+            // else
+            // {
+            //     if (modlelist.Count > 0 )
+            //     {
+            //         foreach (var it in modlelist)
+            //         {
+            //            list.Add(it);
+            //             total++;
+            //         }
+            //     }
+            // }
+            #endregion
+
         }
-            /// <summary>
-            /// 查询工单详情
-            /// </summary>
-            public ActionResult GetDetails(int id)
+        /// <summary>
+        /// 获取我参与的工单编号
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public string GetCYWorkOrderID(string user)
         {
-            int userId = CurrentUser.UserData.F_UserId;
-            if (userId != 0)
-            {
-                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
-                string sql = "";
-                if (id > 0)
-                {
-                    sql += $" ( F_ID like '%" + id + "%' ) ";
-                }
-                else
-                    return Error("请输入正确的id");
-                var list = new List<Model.T_Wo_WorkOrder>();
-                if (!string.IsNullOrWhiteSpace(sql))
-                {
-                    sql += " and F_IsDelete=0";
-                    list = workOrder.GetModelList(sql);
-                }
-                var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
+            string str = string.Empty;
 
-                if (list.Count > 0)
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_CreateUser='" + user + "' ";
+
+            return str;
+        }
+        /// <summary>
+        /// 获取待完成的工单编号
+        /// </summary>
+        /// <returns></returns>
+        public string GetDWCWorkOrderID(string user)
+        {
+            string str = string.Empty;
+
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
+                + " and ("
+                    + "(F_WoState in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + ") and F_CreateUser='" + user + "') "//办理中和接单状态的操作人
+                    + " or (F_WoState in(" + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser='" + user + "')"//退回下一步操作人
+                + ")"
+                + " and isnull(F_IsUsed,'0')='0' ";
+
+            return str;
+        }
+        /// <summary>
+        /// 获取待接单的工单编号
+        /// </summary>
+        /// <returns></returns>
+        public string GetDJDWorkOrderID(string user)
+        {
+            string str = string.Empty;
+            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + (int)EnumItemType.deal + " and  F_WoState=" + (int)EnumWorkOrderState.assign + " ");
+            //   str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
+            //    + " and F_WoState=" + (int)EnumWorkOrderState.assign
+            //    + " and isnull(F_IsUsed,'0')='0' and F_NextUser='" + user + "' ";
+            foreach (var it in itemlast )
+            {
+               
+                string[] code = it.F_NextUser.Split(','); 
+                for (int i=0;i< code.Length;i++)
                 {
-                    List<WorkOrderNewInput> Input = modeltooip(list);
-                    if (Input !=null )
+                    if (code [i ]==user )
                     {
-                        var obj = new
+                      if (str !=string .Empty )
                         {
-                            state = "success",
-                            message = "成功",
-                            rows = Input,
-                            total= itemlasts,
-                        };
-
-                        return Content(obj.ToJson()); 
-                    }
-                    else
-                    {
-                        return Error("没有查询到此工单");
+                            str = str + "," + it .F_WoID ;
+                        }
+                      else
+                        {
+                            str = it.F_WoID+"";
+                        }
                     }
                 }
-                else
-                    return Error("没有查询到此工单");
-
-            }
-            else
-            {
-                return Error("无操作权限！");
             }
+            return str;
         }
         /// <summary>
-        /// 查询参与工单列表
+        /// 查询工单详情
         /// </summary>
-        public ActionResult GetParticipate()
+        public ActionResult GetDetails(int id)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 string sql = "";
-                if (ua!=null )
+                if (id > 0)
                 {
-                    sql += $" ( F_DealBy like '%" + ua.F_UserCode  + "%' ) ";
+                    sql += $" ( F_ID like '%" + id + "%' ) ";
                 }
                 else
                     return Error("请输入正确的id");
@@ -271,29 +317,30 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += " and F_IsDelete=0";
                     list = workOrder.GetModelList(sql);
                 }
-              
+                var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
 
                 if (list.Count > 0)
                 {
                     List<WorkOrderNewInput> Input = modeltooip(list);
-                    if (Input != null)
+                    if (Input !=null )
                     {
                         var obj = new
                         {
                             state = "success",
                             message = "成功",
                             rows = Input,
+                            total= itemlasts,
                         };
 
-                        return Content(obj.ToJson());
+                        return Content(obj.ToJson()); 
                     }
                     else
                     {
-                        return Error("暂无参与工单");
+                        return Error("没有查询到此工单");
                     }
                 }
                 else
-                    return Error("暂无参与工单");
+                    return Error("没有查询到此工单");
 
             }
             else
@@ -302,10 +349,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
         }
         /// <summary>
-        /// 查询超时工单列表
+        ///综合查询列表
         /// </summary>
-        public ActionResult GetOvertime(string code, string cusname, string cusphone, string companyname, string province, string city,
-            string country, string township, string touser, int type = 0, int state = -1, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetComprehensive(string code, string cusname, string cusphone, string companyname, string province, string city,
+            string country, string township, string touser, int source = 0, int type = 0, int state = 0, int pageindex = 1, int pagesize = 10)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -317,6 +364,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_Type=" + type;
                 if (state >= 0)//工单状态
                     sql += $" and F_State=" + state;
+                if (source > 0)//工单来源
+                    sql += $" and F_Source=" + source;
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -357,7 +406,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 List<Model.T_Wo_WorkOrder> list = new List<Model.T_Wo_WorkOrder>();
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
-                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "YWY" || ro.F_RoleCode == "BLRY")
+                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "YWY" )
                 {
                     if (modlelist.Count > 0)
                     {
@@ -365,17 +414,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             if (it.F_DealBy == ua.F_UserCode)
                             {
-                                if (it.F_IsOver == 1)
-                                {
                                     list.Add(it);
                                     total++;
-                                }
                             }
                         }
                     }
-
                 }
-                else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
+                else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG")
                 {
                     List<int> detpid = new List<int>();
                     var deparmentlist = new List<Model.T_Sys_Department>();
@@ -434,24 +479,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("加载失败");
                     }
                 }
-                else if (ro.F_RoleCode == "JDYBZZX")
-                 {
-                    if (modlelist.Count>0 )
-                    {
-                        foreach (var it in modlelist)
-                        {
-                           
-                                if (it.F_CreateBy  ==ua .F_UserCode )
-                                {
-                                if (it.F_IsOver == 1)
-                                {
-                                    list.Add(it);
-                                    total++;
-                                }
-                                }
-                        }
-                    }
-                }
                 else if (ro.F_RoleCode == "QTJS")
                 {
                     return Error("无操作权限！");
@@ -462,11 +489,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         foreach (var it in modlelist)
                         {
-                            if (it.F_IsOver == 1)
-                            {
                                 list.Add(it);
                                 total++;
-                            }
                         }
                     }
                 }
@@ -494,15 +518,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Error("无操作权限！");
             }
         }
-      
         /// <summary>
-        /// 获取催办工单列表
+        /// 查询超时工单列表
         /// </summary>
-        /// <returns></returns>
-        public ActionResult GetUrgeList(string code, string cusname, string cusphone, string companyname, string province, string city,
-            string country, string township, string touser, int type = 0, int state = -1, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetOvertime(string code, string cusname, string cusphone, string companyname, string province, string city,
+            string country, string township, string touser, int source = 0, int type = 0, int state = 0, int pageindex = 1, int pagesize = 10)
         {
-           
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
@@ -513,6 +534,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_Type=" + type;
                 if (state >= 0)//工单状态
                     sql += $" and F_State=" + state;
+                if (source > 0)//工单来源
+                    sql += $" and F_Source=" + source;
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
@@ -553,37 +576,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 List<Model.T_Wo_WorkOrder> list = new List<Model.T_Wo_WorkOrder>();
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
-                var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.urge + " ");
-                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "YWY")
+                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "YWY" || ro.F_RoleCode == "BLRY")
                 {
-                    woid.Clear();
-                    if (itemlasts.Count > 0)
-                    {
-                        foreach (var it in itemlasts)
-                        {
-                          woid.Add(it.F_WoID);
-                        }
-                    }
                     if (modlelist.Count > 0)
                     {
                         foreach (var it in modlelist)
                         {
                             if (it.F_DealBy == ua.F_UserCode)
                             {
-                                for (int i = 0; i < woid.Count; i++)
+                                if (it.F_IsOver == 1)
                                 {
-                                    if (it.F_ID == woid[i])
-                                    {
-                                        list.Add(it);
-                                        total++;
-                                    }
+                                    list.Add(it);
+                                    total++;
                                 }
                             }
                         }
                     }
 
                 }
-                else if (ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
+                else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
                 {
                     List<int> detpid = new List<int>();
                     var deparmentlist = new List<Model.T_Sys_Department>();
@@ -604,10 +615,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                         }
                         detpid.Add(dModel.F_DeptId);
-                      
-                        if (itemlasts.Count > 0)
+                        var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' " + " ");
+                        if (itemlast.Count > 0)
                         {
-                            foreach (var it in itemlasts)
+                            foreach (var it in itemlast)
                             {
                                 for (int i = 0; i < detpid.Count; i++)
                                 {
@@ -626,8 +637,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     if (it.F_ID == woid[i])
                                     {
-                                        list.Add(it);
-                                        total++;
+                                        if (it.F_IsOver == 1)
+                                        {
+                                            list.Add(it);
+                                            total++;
+                                        }
                                     }
                                 }
                             }
@@ -639,31 +653,38 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("加载失败");
                     }
                 }
+                else if (ro.F_RoleCode == "JDYBZZX")
+                 {
+                    if (modlelist.Count>0 )
+                    {
+                        foreach (var it in modlelist)
+                        {
+                           
+                                if (it.F_CreateBy  ==ua .F_UserCode )
+                                {
+                                if (it.F_IsOver == 1)
+                                {
+                                    list.Add(it);
+                                    total++;
+                                }
+                                }
+                        }
+                    }
+                }
                 else if (ro.F_RoleCode == "QTJS")
                 {
                     return Error("无操作权限！");
                 }
                 else
                 {
-                    woid.Clear();
-                    if (itemlasts.Count > 0)
-                    {
-                        foreach (var it in itemlasts)
-                        {
-                            woid.Add(it.F_WoID);
-                        }
-                    }
                     if (modlelist.Count > 0)
                     {
                         foreach (var it in modlelist)
                         {
-                            for (int i = 0; i < woid.Count; i++)
+                            if (it.F_IsOver == 1)
                             {
-                                if (it.F_ID == woid[i])
-                                {
-                                    list.Add(it);
-                                    total++;
-                                }
+                                list.Add(it);
+                                total++;
                             }
                         }
                     }
@@ -686,8 +707,86 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                     return Success("暂无工单"); ;
                 }
+            }
+            else
+            {
+                return Error("无操作权限！");
+            }
+        }
+      
+        /// <summary>
+        /// 获取催办工单列表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetUrgeList(string code, string cusname, string cusphone, string companyname, string province, string city,
+            string country, string township, string touser,int source=0, int type = 0, int state = -1, int pageindex = 1, int pagesize = 10)
+        {
+           
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                string sql = $" and F_IsDelete=0";
+                DataTable dt = new DataTable();
+                #region 筛选条件
+                if (type > 0 && type < 4)//工单类型
+                    sql += $" and F_Type=" + type;
+                if (state >= 0)//工单状态
+                    sql += $" and F_State=" + state;
+                if (source >= 0)//工单状态
+                    sql += $" and F_Source=" + source;
+                if (!string.IsNullOrWhiteSpace(touser))//参与人
+                    sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(code))//工单编号
+                    sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
+                    sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
+                    sql += $" and F_CusPhone like '%" + cusphone.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(companyname))//公司名称
+                    sql += $" and F_CompanyName like '%" + companyname.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(province))//省
+                    sql += $" and F_IncidentProvince like '%" + province.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(province))//市
+                    sql += $" and F_IncidentCity like '%" + city.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(province))//县
+                    sql += $" and F_IncidentCountry like '%" + country.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(province))//乡
+                    sql += $" and F_IncidentTownship like '%" + township.Trim() + "%'";
+                #endregion
+                int recordCount = 0;
+                if (!string.IsNullOrWhiteSpace(sql))
+                {
 
+                    dt = BLL.PagerBLL.GetListPager(
+                        "T_Wo_WorkOrder",
+                        "F_ID",
+                        "*,dbo.GetUserName(F_CreateBy) as F_CreateByName",
+                        sql,
+                       "ORDER BY T_Wo_WorkOrder.F_ID desc",
+                        pagesize,
+                        pageindex,
+                        true,
+                        out recordCount);
+                    dt.Columns.Add("CBCount", typeof(int));
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        var list = itembll.GetList(" F_WoID ='" + dr["ID"].ToString() + "' and F_ItemType=" + (int)EnumItemType.urge).Tables[0];
+                        dr["CBCount"] = list.Rows.Count;
+                    }
 
+                    var obj = new
+                    {
+                        state = "success",
+                        message = "成功",
+                        rows = dt,
+                        total = recordCount
+                    };
+                    return  Content(obj.ToJson());
+                }
+                else
+                {
+                    return Success("暂无工单"); ;
+                }
             }
             else
             {
@@ -750,21 +849,33 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 if (ids != null && ids.Length > 0)
                 {
+                      bool res = true;
                     string idd = " ";
                     foreach (string str in ids)
                     {
                         idd += str + ",";
                     }
+            
                     if (!string.IsNullOrEmpty(idd.Trim()))
                     {
-                        if (workOrder.DeleteList(idd.TrimEnd(',')))
-                        {
-                            return Success("设置成功");
+                        if (itembll .DeleteList (idd.TrimEnd(',')))
+                          {
+                            if (workOrder.DeleteList(idd.TrimEnd(',')))
+                            {
+
+                                return Success("设置成功");
+
+                            }
+                            else
+                            {
+                                return Error("设置失败");
+                            }
                         }
                         else
                         {
                             return Error("设置失败");
                         }
+                       
                     }
                     else
                     {
@@ -1224,7 +1335,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser ,int overtime,int sms )
+        public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser ,float  overtime,int sms )
         {
             Model.T_Wo_WorkOrderItem_New itemModel = new Model.T_Wo_WorkOrderItem_New();
             #region 
@@ -1277,7 +1388,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         
         [Authority]
-        public ActionResult AssignWorkOrder(long orderid, string cont,int overtime=0,int sms=0,int clbm = 0, int clid = 0)
+        public ActionResult AssignWorkOrder(long orderid, string cont, float overtime =0,int sms=0,int clbm = 0, int clid = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             string usercode = CurrentUser.UserData.F_UserCode;
@@ -1291,7 +1402,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
               
                 if (ua != null)
                 {
-                    if (clbm != 0 && clid == 0)
+                    if (clbm == 0 && clid == 0)
                     {
                         return Error("请选择接收人");
                     }
@@ -1304,12 +1415,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 if (model.F_Type  == "2")
                                 {
-                                    if (deptmodel.F_DeptName == "市场管理科")
+                                    if (deptmodel.F_DeptId  == 37)
                                     {
                                         input. F_SC_QualityMonth = RequestString.GetQueryString("QualityMonth");//市场管理科-超出质保期限
                                         input.F_SC_PreliminaryOpinion = RequestString.GetQueryString("PreliminaryOpinion");//市场管理科-初审意见:退货、换货、补偿、自行处理
                                     }
-                                    else if (deptmodel.F_DeptName == "质量管理部")
+                                    else if (deptmodel.F_DeptId  == 12)
                                     {
                                         input.F_IsVisit = RequestString.GetQueryInt("isvisit");
                                         input.F_ZL_QualityEventLevel = RequestString.GetQueryString("QualityEventLevel");//质量管理科-质量事件等级（未遂、一般、较大、重大）
@@ -1328,14 +1439,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 else if (model.F_Type == "3")
                                 {
-                                    if (deptmodel.F_DeptName == "市场管理科")
+                                    if (deptmodel.F_DeptId == 37)
                                     {
                                         input.F_SC_CJ_SpotResult = RequestString.GetQueryString("SpotResult");//市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
                                         input.F_SC_CJ_SelfResult = RequestString.GetQueryString("SelfResult");//市场管理科-抽检-自检结果
                                         input.F_SC_CJ_ApprovalNo = RequestString.GetQueryString("ApprovalNo");//市场管理科-抽检-对应审批工作流单号
                                         input.F_SC_CJ_ReturnAccount = RequestString.GetQueryString("ReturnAccount");//市场管理科-抽检-对应审批工作流单号
                                     }
-                                    else if (deptmodel.F_DeptName == "质量管理部")
+                                    else if (deptmodel.F_DeptId == 12)
                                     {
                                         input.F_ZL_CJ_IsRecord = RequestString.GetQueryString("IsRecord");//质量管理科-抽检-未备案、已备案
                                         input.F_ZL_ClaimAmount = RequestString.GetQueryString("ClaimAmount");// 质量管理科-索赔金额（单位元，对应责任单位）
@@ -1418,12 +1529,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             if (model.F_Type == "2")
                             {
-                                if (deptmodel.F_DeptName == "市场管理科")
+                                if (deptmodel.F_DeptId == 37)
                                 {
                                     input.F_SC_ProductBase = RequestString.GetQueryString("ProductBase");//市场管理科-超出质保期限
                                     
                                 }
-                                else if (deptmodel.F_DeptName == "质量管理部")
+                                else if (deptmodel.F_DeptId ==12)
                                 {
                                     input.F_IsVisit  = RequestString.GetQueryInt ("isvisit");
                                     input.F_ZL_QualityEventLevel = RequestString.GetQueryString("QualityEventLevel");//质量管理科-质量事件等级（未遂、一般、较大、重大）
@@ -1442,14 +1553,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else if (model.F_Type =="3")
                             {
-                                if (deptmodel.F_DeptName == "市场管理科")
+                                if (deptmodel.F_DeptId ==37)
                                 {
                                     input.F_SC_CJ_SpotResult = RequestString.GetQueryString("SpotResult");//市场管理科-抽检-抽检结果（视同合格、合格、不合格、复检后合格、未送检）
                                     input.F_SC_CJ_SelfResult = RequestString.GetQueryString("SelfResult");//市场管理科-抽检-自检结果
                                     input.F_SC_CJ_ApprovalNo = RequestString.GetQueryString("ApprovalNo");//市场管理科-抽检-对应审批工作流单号
                                     input.F_SC_CJ_ReturnAccount = RequestString.GetQueryString("ReturnAccount");//市场管理科-抽检-确认返账金额（元）
                                 }
-                                else if (deptmodel.F_DeptName == "质量管理部")
+                                else if (deptmodel.F_DeptId == 12)
                                 {
                                     input.F_ZL_CJ_IsRecord = RequestString.GetQueryString("IsRecord");//质量管理科-抽检-未备案、已备案
                                 }
@@ -1487,6 +1598,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
+                //河南心连心化学工业集团股份有限公司-系统维护管理员(8000)指派工单给 李波(80324),张绍申(80325),杜爱国(80326)，说明：无
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 if (ua != null)
                 {
@@ -1876,12 +1988,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #endregion
                 #region 读取上一级指派人员推送系统消息和微信消息
                 var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID  + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
-                if (itemlast.F_CreateUser != model.F_CreateBy)
+                if (itemlast!=null )
                 {
-                    sendsysmsg(model, nowUser, itemlast.F_CreateUser, (int)itemid, "处理接单");
-                    var lastUser = sysUserAccountBll.GetModel(itemlast.F_CreateUser);
-                  //  if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
-                     //   sendwxmsg(model, lastUser.F_WxOpenId, nowUser, "接单");
+                    if (itemlast.F_CreateUser != model.F_CreateBy)
+                    {
+                        sendsysmsg(model, nowUser, itemlast.F_CreateUser, (int)itemid, "处理接单");
+                        var lastUser = sysUserAccountBll.GetModel(itemlast.F_CreateUser);
+                        //  if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
+                        //   sendwxmsg(model, lastUser.F_WxOpenId, nowUser, "接单");
+                    }
                 }
                 #endregion
                 #endregion
@@ -1928,7 +2043,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 转派工单
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int clbm = 0, int clid = 0,int overtime = 0, int sms = 0)
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int clbm = 0, int clid = 0, float overtime = 0, int sms = 0)
         {
             string touser = ""; string tousername = "";
             #region 获取接收人
@@ -1982,7 +2097,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 #region 处理工单
                 //工单完结要更新工单的状态
-                model.F_DealBy = touser;
+             //   model.F_DealBy = touser;
                 model.F_State = wostate;
                 //处理内容
                 if (!string.IsNullOrEmpty(cont))