mod:公共协作完成按钮判断

RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -266,7 +266,7 @@ namespace RMYY_CallCenter_Api
             }
 
             // 获取对应字段名
-            string typeFieldName = "", stateFieldName = "", gapTimeFieldName = "", endTimeFieldName = "";
+            string typeFieldName = "", stateFieldName = "", gapTimeFieldName = "", endTimeFieldName = "", assistanceStateFieldName = "";
 
             for (int i = 0; i < dt.Columns.Count; i++)
             {
@@ -301,6 +301,13 @@ namespace RMYY_CallCenter_Api
                                 endTimeFieldName = dt.Columns[i].ColumnName;
                             }
                         }; break;
+                    case "AssistanceState":
+                        {
+                            if (assistanceStateFieldName == "")
+                            {
+                                assistanceStateFieldName = dt.Columns[i].ColumnName;
+                            }
+                        }; break;
                     default: break;
                 }
             }
@@ -325,7 +332,15 @@ namespace RMYY_CallCenter_Api
                 {
                     thisTypeId = int.Parse(dr[typeFieldName].ToString());
                 }
-                var allButtons = WorkOrderButton.GetButtons(menuName, thisTypeId, int.Parse(dr[stateFieldName].ToString()), roleId);
+
+                int assistanceState = 1;
+                if (assistanceStateFieldName != "" && dr[assistanceStateFieldName].ToString() == "未完成")
+                {
+                    assistanceState = 0;
+                }
+                
+
+                var allButtons = WorkOrderButton.GetButtons(menuName, thisTypeId, int.Parse(dr[stateFieldName].ToString()), roleId, assistanceState);
 
                 //TODO: 特殊逻辑处理
 
@@ -349,7 +364,7 @@ namespace RMYY_CallCenter_Api
                         }
                     }
 
-                    if (dr["GapTime"] != "-")
+                    if (dr["GapTime"].ToString() != "-")
                     {
                         TimeSpan ts = deadline.Subtract(thisDate);
                         double tss = double.Parse(Math.Round(ts.TotalSeconds, 0).ToString());

RMYY_CallCenter_Api/Common/WorkOrderButton.cs

@@ -13,7 +13,7 @@ namespace RMYY_CallCenter_Api
         private static string _buttonCacheKey = "ButtonCacheKey_";
         private static Bll.T_Sys_Menu menuBLL = new Bll.T_Sys_Menu();
 
-        public static List<Button> GetButtons(MENUENUM menuName, int type, int status, int roleId = 0)
+        public static List<Button> GetButtons(MENUENUM menuName, int type, int status, int roleId = 0, int assistanceState = 0)
         {
             var desc = menuName.GetType().GetMember(menuName.ToString())[0].GetCustomAttributes(typeof(DescriptionAttribute), false);
             if (desc == null || desc.Length != 1)
@@ -28,7 +28,9 @@ namespace RMYY_CallCenter_Api
                 return buttonList;
             }
 
-            buttonList = buttons.Where(p => p.type == type && (p.status.IndexOf(status) >= 0 || p.status.Count == 0)).ToList();
+            List<string> filterButtons = GetAssistanceFilterButtons(type);
+
+            buttonList = buttons.Where(p => p.type == type && (p.status.IndexOf(status) >= 0 || p.status.Count == 0) && (assistanceState == 1 || (assistanceState == 0 && !filterButtons.Contains(p.key)))).ToList();
 
             // 获取角色对应的按钮
             List<string> roleButtons = null;
@@ -102,8 +104,23 @@ namespace RMYY_CallCenter_Api
             return returnList;
         }
 
+
+        private static List<string> GetAssistanceFilterButtons(int type)
+        {
+            List<string> returnList = new List<string>();
+            switch (type)
+            {
+                case 3000: returnList = new List<string> { "wancheng", "" }; break;
+            }
+
+            return returnList;
+        }
+
     }
 
+
+ 
+
     /// <summary>
     /// 列表菜单，需要和T_Sys_Menu保持一致
     /// </summary>