故障报修

RMYY_CallCenter_Api.Dal/T_Sys_Menu.cs

@@ -103,7 +103,7 @@ namespace RMYY_CallCenter_Api.Dal
             strSql.Append("F_ParentId=@F_ParentId,");
             strSql.Append("F_MenuType=@F_MenuType");
             strSql.Append(" where F_MenuId=@F_MenuId");
-            strSql.Append(" where F_WorkState=@F_WorkState");
+          //  strSql.Append("  and  F_WorkState=@F_WorkState");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_MenuCode", SqlDbType.VarChar,50),
                     new SqlParameter("@F_MenuName", SqlDbType.VarChar,50),

RMYY_CallCenter_Api/Common/WorkOrderButton.cs

@@ -82,6 +82,8 @@ namespace RMYY_CallCenter_Api
         我的提交,
         [Description("orderList")]
         工单列表,
+        [Description("repairWorkOrder")]       
+        报修列表
     }
 
 

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -596,7 +596,7 @@ namespace RMYY_CallCenter_Api.Controllers
             DataTable   datatable = Bll.PagerBll.GetListPager
                                             ("T_FaultRepair_Base ",
                                               "F_WorkOrderId",
-                                              "*,[dbo].[GetUserName](F_Maintenancer) Maintenancer,[dbo].[GetUserName](F_Applicant) Applicant",
+                                              "*,[dbo].[GetUserName](F_Maintenancer) Maintenancer,[dbo].[GetUserName](F_Applicant) Applicant,[dbo].[GetAssistanceState](F_WorkOrderCode) AssistanceState",
                                               sql,
                                               "order by F_WorkOrderId desc",
                                               pagesize,
@@ -606,11 +606,16 @@ namespace RMYY_CallCenter_Api.Controllers
                                             );
             datatable.Columns.Add("GapTime", typeof(string));//执行时限
 
-            datatable.Columns.Add("AssistanceState", typeof(string));//协作工单的状态
+          //  datatable.Columns.Add("AssistanceState", typeof(string));//协作工单的状态
+            datatable.Columns.Add("Buttons", typeof(object));//操作按钮
+
+            datatable.Columns.Add("StateName", typeof(string));// 
+
+           
+
+            //datatable = WorkOrderBase.SetOtherField(datatable, MENUENUM.报修列表);
 
-            datatable.Columns.Add("StateName", typeof(string));//协作工单的状态
 
-            datatable.Columns.Add("Buttons", typeof(object));//操作按钮
             foreach (DataRow dr in datatable.Rows)
             {
                 #region 执行时限 不是已完成的工单 展示这个字段 
@@ -638,28 +643,28 @@ namespace RMYY_CallCenter_Api.Controllers
                 }
                 #endregion
 
-                #region 协作工单的状态
-                if (!string.IsNullOrEmpty(dr["F_InternalWorkOrderCode"].ToString()) || !string.IsNullOrEmpty(dr["F_ExternalWorkOrderCode"].ToString()))
-                {
-                    List<Model.T_FaultRepair_Base> modellist = baseBll.GetModelList("F_WorkOrderCode in " +
-                        "(select col from [dbo].[SplitToNvarchar]('" + dr["F_InternalWorkOrderCode"].ToString() + "',',' )) or F_WorkOrderCode in(select col from [dbo].[SplitToNvarchar]('" + dr["F_ExternalWorkOrderCode"].ToString() + "',',' ) )");
-
-                    if (modellist.Count != 0)  
-                    { 
-                    List<Model.T_FaultRepair_Base> modellistnew = modellist.Where(x => x.F_WorkOrderState < 3).ToList();
-
-                    if (modellistnew != null && modellistnew.Count > 0)
-                    {
-                        dr["AssistanceState"] = "未完成";
-                    }
-                    else
-                    {
-                        dr["AssistanceState"] = "已完成";
-                    }
-                    }
+                //#region 协作工单的状态
+                //if (!string.IsNullOrEmpty(dr["F_InternalWorkOrderCode"].ToString()) || !string.IsNullOrEmpty(dr["F_ExternalWorkOrderCode"].ToString()))
+                //{
+                //    List<Model.T_FaultRepair_Base> modellist = baseBll.GetModelList("F_WorkOrderCode in " +
+                //        "(select col from [dbo].[SplitToNvarchar]('" + dr["F_InternalWorkOrderCode"].ToString() + "',',' )) or F_WorkOrderCode in(select col from [dbo].[SplitToNvarchar]('" + dr["F_ExternalWorkOrderCode"].ToString() + "',',' ) )");
+
+                //    if (modellist.Count != 0)
+                //    {
+                //        List<Model.T_FaultRepair_Base> modellistnew = modellist.Where(x => x.F_WorkOrderState < 3).ToList();
+
+                //        if (modellistnew != null && modellistnew.Count > 0)
+                //        {
+                //            dr["AssistanceState"] = "未完成";
+                //        }
+                //        else
+                //        {
+                //            dr["AssistanceState"] = "已完成";
+                //        }
+                //    }
 
-                }
-                #endregion
+                //}
+                //#endregion
 
                 #region  展示的工单状态
                 if (Convert.ToInt32(dr["F_WorkOrderState"]) ==(int) EnumFaultRepairWorkOrderState.receive || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder)
@@ -676,23 +681,23 @@ namespace RMYY_CallCenter_Api.Controllers
                 }
                 #endregion
 
-                #region 操作按钮
+                //#region 操作按钮
 
-               
-                    var btns = new List<FaultButtonGroup.button>();
+
+                var btns = new List<FaultButtonGroup.button>();
 
                 //创建完工单没有转派到部门的话，只有调度中心可以转派
                 //if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder)
                 //{
                 //    btns.Add(FaultButtonGroup.assign());
-                    
+
                 //}
                 //待查收 -查收 退回
                 if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.receive)
-                    {
-                        btns.Add(FaultButtonGroup.check());
-                        btns.Add(FaultButtonGroup.back());
-                    }
+                {
+                    btns.Add(FaultButtonGroup.check());
+                    btns.Add(FaultButtonGroup.back());
+                }
                 if (dr["F_Maintenancer"].ToString() == User.F_UserCode)
                 {
                     //待完成 -协作 完成
@@ -719,10 +724,10 @@ namespace RMYY_CallCenter_Api.Controllers
 
 
                     }
-                   
+
                 }
                 dr["Buttons"] = btns;
-                #endregion
+                //#endregion
             }
             var obj = new
             {
@@ -893,7 +898,6 @@ namespace RMYY_CallCenter_Api.Controllers
                     )
                 {
                     btns.Add(FaultButtonGroup.solve());
-
                 }
                 //待评价  评价
               else  if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealed)
@@ -1252,6 +1256,20 @@ namespace RMYY_CallCenter_Api.Controllers
 
         }
 
+        //删除工单
+        public ActionResult DeleteWorkOrder(string WorkOrderCode)
+        {
+            Model.T_FaultRepair_Base model = baseBll.GetModel(WorkOrderCode);
+            model.F_IsDelete = 1;
+            if (baseBll.Update(model))
+            {
+                AddOperatorLog("删除了工单", (int)EnumOperatorType.delete, WorkOrderCode);
+                return Success("删除成功");
+            }
+          
+            else
+                return Error("删除失败");
+        }
 
 
         // 返修
@@ -1388,13 +1406,13 @@ namespace RMYY_CallCenter_Api.Controllers
         #endregion
 
 
-        public string GetDeptModel( string deptcode = "")
+        public string GetDeptModel( string deptId = "")
         {
             string sql = " 1=1 ";
           
-            if (!string.IsNullOrWhiteSpace(deptcode))
+            if (!string.IsNullOrWhiteSpace(deptId))
             {
-                sql += " and F_DeptCode='" + deptcode + "'";
+                sql += " and F_DeptId='" + deptId + "'";
             }
             if (string.IsNullOrWhiteSpace(sql))
                 return "";