工单状态

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -485,6 +485,9 @@ namespace RMYY_CallCenter_Api
                     else 
                     strArr = new List<string> { "待提交", "待接单", "待接单", "已接单", "待评价", "已完成", "已完成","已接单","已退回","办理中","待回访" }; break;
                 case MENUENUM.工单列表:
+                    if(type==3000)
+                        strArr = new List<string> { "待提交", "待派单", "待查收", "待完成", "已处理", "异常完结", "已完结", "待完成" };
+                    else
                     strArr = new List<string> { "待提交", "待派工", "待接单", "待完成", "已处理", "异常完成", "已完成", "已接单", "已退回", "办理中", "待回访" }; break;
                 case MENUENUM.报修列表:
                     strArr = new List<string> { "待提交", "-", "待接单", "待完成", "已完成", "已完成", "已完成", "已接单" }; break;

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -1063,80 +1063,9 @@ namespace RMYY_CallCenter_Api.Controllers
                             {
                                 dr["FileUrl"] = GetFileData(dr["F_File"].ToString(), configfj.F_ParamValue);
                             }
-                            if (User.F_RoleCode == "DDZX" || User.F_RoleCode == "GLY")
-                            {
-                                #region  weixiuyuan展示的工单状态
-
-                                if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder)
-                                {
-                                    dr["StateName"] = "待派单";
-                                }
-                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.receive)
-                                {
-                                    dr["StateName"] = "待查收";
-                                }
-                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealing || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.arrive)
-                                {
-                                    dr["StateName"] = "待完成";
-                                }
-                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealed)
-                                {
-                                    dr["StateName"] = "已处理";
-                                }
-                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.exceptionended)
-                                {
-                                    dr["StateName"] = "异常完结";
-                                }
-                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.finish)
-                                {
-                                    dr["StateName"] = "已完结";
-                                }
-
-                                #endregion
-
-                            }
-
-
-                            else if (User.F_RoleCode == "WXY")
-                            {
-                                #region  weixiuyuan展示的工单状态
-                                if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.receive || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder)
-                                {
-                                    dr["StateName"] = "待接单";
-                                }
-                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealing || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.arrive)
-                                {
-                                    dr["StateName"] = "待完成";
-                                }
-                                else
-                                {
-                                    dr["StateName"] = "已完成";
-                                }
-                                #endregion
-                            }
-                            else  //报修人
-                            {
-                                #region  展示的工单状态
-                                if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.neworder || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.receive)
-                                {
-                                    dr["StateName"] = "待接单";
-                                }
-                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealing || Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.arrive)
-                                {
-                                    dr["StateName"] = "已接单";
-                                }
-                                else if (Convert.ToInt32(dr["F_WorkOrderState"]) == (int)EnumFaultRepairWorkOrderState.dealed)
-                                {
-                                    dr["StateName"] = "待评价";
-                                }
-                                else
-                                {
-
-                                    dr["StateName"] = "已完成";
-                                }
-                                #endregion
-                            }
 
+                            dr["StateName"] = GetWorkOrderStateStr(User.F_RoleCode, Convert.ToInt32(dr["F_WorkOrderState"]));
+                         
 
                         }
 
@@ -1192,7 +1121,7 @@ namespace RMYY_CallCenter_Api.Controllers
 
                             foreach (DataRow item in internaldt.Rows)
                             {
-                                if (Convert.ToInt32(item["F_WorkOrderState"]) < 3)
+                                if (Convert.ToInt32(item["F_WorkOrderState"]) < 3 || Convert.ToInt32(item["F_WorkOrderState"])==6)
                                 {
                                     item["StateName"] = "未完成";
                                 }
@@ -1204,7 +1133,7 @@ namespace RMYY_CallCenter_Api.Controllers
                             }
                         }
 
-                        if (externaldt != null && externaldt.Rows.Count > 0)
+                        if (externaldt != null && externaldt.Rows.Count > 0 || Convert.ToInt32(item["F_WorkOrderState"]) == 6)
                         {
                             externaldt.Columns.Add("StateName", typeof(String));
                             externaldt.Columns.Add("Mode", typeof(String));
@@ -1309,8 +1238,41 @@ namespace RMYY_CallCenter_Api.Controllers
         }
 
 
+        public static string GetWorkOrderStateStr(string userrole, int state)
+        {
+            List<int> typeIdArray = null;
+             typeIdArray = new List<int> { -1, 0, 1, 2, 3, 4, 5, 6 };        
+            List<string> strArr = null;
+
+            switch (userrole)
+            {
+                case "DDZX":
+                    strArr = new List<string> { "-", "待派单", "待查收", "待完成", "已处理", "异常完结", "已完结", "待完成" };
+                    break;
+                case "GLY":
+                    strArr = new List<string> { "-", "待派单", "待查收", "待完成", "已处理", "异常完结", "已完结", "待完成" };
+                    break;
+
+                case "WXY":
+                    strArr = new List<string> { "-", "待接单", "待接单", "待完成", "已完成", "已完成", "已完成", "待完成" };
+                    break;              
+                //报修人
+                default:
+                    strArr = new List<string> { "待提交", "待接单", "待接单", "已接单", "待评价", "已完成", "已完成", "已接单" };
+                    break;
+            }
+            int index = typeIdArray.IndexOf(state);
+
+            if (index < 0)
+            {
+                return "";
+            }
 
 
+            return strArr[index];
+
+        }
+
         //转派 ，派给自己的工单 转给同部门的别的人
         //0 是转同事 1 是转组长
         public ActionResult Transfer(string WorkOrderCode, string ToUserCode, int type = 0)