Merge branch 'master' of http://192.168.1.222:3000/duhongyu/GongYi_API

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

@@ -1984,7 +1984,7 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             if (isExport)
             {
-                var cols = new string[] { "名称", "受理数量", "处理量", "延期量", "重办量", "结案量", "办理率", "办结率" };
+                var cols = new string[] { "名称", "受理数量", "处理量", "延期量", "重办量", "结案量","催办量", "办理率", "办结率" };
                 new NPOIHelper().ExportToExcel($"工单报表{sdate}-{edate}", obj.Tables[0], cols);
                 return Success("导出excel");
             }

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

@@ -1983,7 +1983,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             DataTable dt = new DataTable();
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
-
+            //int userId = 689;
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
 
             string sql = " and F_IsDelete=0";
@@ -2593,7 +2593,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     else if (Int32.Parse(strtab) == 13)
                     {//工单催办
-                        btns.Add(ButtonGroup.Reminder());
+                        if (userModel.F_RoleCode.ToUpper() == "DDZG" || userModel.F_RoleCode.ToUpper() == "GLY")
+                        {
+                            btns.Add(ButtonGroup.Reminder());
+                        }
+                        else
+                        {
+                            btns = ButtonGroup.GetButtons(dr["F_WorkState"].ToString(), userModel.F_RoleCode.ToUpper(), dr["F_IsResult"].ToString(), iszbdw, ispd);
+                            btns.Add(ButtonGroup.Reminder());
+                        }
                     }
                     btns.Add(ButtonGroup.query());
                 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -276,6 +276,7 @@ namespace CallCenterApi.Interface.Models.Common
                     {
                        // buttons.Add(approval());
                         buttons.Add(takeback());
+                        buttons.Add(Reminder());
                    //     buttons.Add(turnsee()); //buttons.Add(oversee());
                    //     buttons.Add(supervision());
                     }
@@ -324,8 +325,9 @@ namespace CallCenterApi.Interface.Models.Common
                     {
                       //  buttons.Add(approval());
                         buttons.Add(takeback());
-                     //   buttons.Add(turnsee()); //buttons.Add(oversee());
-                     //   buttons.Add(supervision());
+                        buttons.Add(Reminder());
+                        //   buttons.Add(turnsee()); //buttons.Add(oversee());
+                        //   buttons.Add(supervision());
                     }
                     //质检专员
                    // if (code == "ZJZY")