修改催办处理接口及工单列表接口

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

@@ -385,7 +385,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return res;
         }
 
-        #region 20170129 新可催办工单列表
+        #region 20170129 新可催办工单列表，只有管理员能看
         /// <summary>
         /// 
         /// </summary>
@@ -488,7 +488,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         //    var list = new BLL.T_Wo_WorkOrderItem().GetList(" WorkOrderID='" + dr["WorkOrderID"].ToString() + "' and IsDel=0 and Type=2 and ','+ToUser+',' like ',%" + ua.F_UserCode + "%,' ").Tables[0];
                         //    dr["CBCount"] = list.Rows.Count;
                         //}
-                        dt = DbHelperSQL.Query("select * from T_Wo_WorkOrder where createuser in (select u.F_UserCode from[dbo].[T_Sys_UserAccount] u,[dbo].[T_Sys_Department] d where u.F_DeptId = d.F_DeptId and d.F_DeptName = '客服部') and State = 0 " + sql + "union all select* from T_Wo_WorkOrder where createuser in (select u.F_UserCode from[dbo].[T_Sys_UserAccount] u,[dbo].[T_Sys_Department] d where u.F_DeptId=d.F_DeptId and d.F_DeptName='市场部') and Detail<>null" + sql).Tables[0];
+
+                        //dt = DbHelperSQL.Query("select * from T_Wo_WorkOrder where createuser in (select u.F_UserCode from[dbo].[T_Sys_UserAccount] u,[dbo].[T_Sys_Department] d where u.F_DeptId = d.F_DeptId and d.F_DeptName = '客服部') and State = 0 " + sql + "union all select* from T_Wo_WorkOrder where createuser in (select u.F_UserCode from[dbo].[T_Sys_UserAccount] u,[dbo].[T_Sys_Department] d where u.F_DeptId=d.F_DeptId and d.F_DeptName='市场部') and Detail<>null" + sql).Tables[0];
+                        dt = DbHelperSQL.Query("select * from T_Wo_WorkOrder where State = 0 " + sql).Tables[0];
+                        //获取催办总数
+                        dt.Columns.Add("CBCount", typeof(int));
+                        foreach (DataRow dr in dt.Rows)
+                        {
+                            var list = new BLL.T_Wo_WorkOrderItem().GetList(" WorkOrderID='" + dr["WorkOrderID"].ToString() + "' and IsDel=0 and Type=2 and ','+ToUser+',' like ',%" + ua.F_UserCode + "%,' ").Tables[0];
+                            dr["CBCount"] = list.Rows.Count;
+                        }
 
                         var obj = new
                         {
@@ -1144,8 +1153,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             #endregion
 
-                            int n = new BLL.T_Wo_WorkOrder().DealWorkOrder(orderid, isend, cont, clbm, struser, ua.F_UserCode);
-                            if (n > 0)
+                            //只有待处理工单可以处理
+                            //int n = new BLL.T_Wo_WorkOrder().DealWorkOrder(orderid, isend, cont, clbm, struser, ua.F_UserCode);
+                            //if (n > 0)
                             {
                                 Model.T_Wo_WorkOrderItem item = new BLL.T_Wo_WorkOrderItem().GetModelList(" WorkOrderID='" + orderid + "' and Type=1 ").OrderByDescending(p => p.CreateTime).FirstOrDefault();
 
@@ -1157,6 +1167,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 else if (item.IsLast == 1)
                                 {
                                     strmsg = ua.F_UserName + "完结了工单，单号：" + model.WorkOrderID;
+                                    //工单完结要更新工单的状态
+                                    new BLL.T_Wo_WorkOrder().Update(new Model.T_Wo_WorkOrder()
+                                    {
+                                        ID = model.ID,
+                                        State = 1
+                                    });
                                 }
 
                                 #region 消息表