Browse Source

权限按钮,退回

1550076451@qq.com 3 years ago
parent
commit
ecd7375700

+ 16 - 8
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/APPController.cs

@@ -1342,7 +1342,8 @@ namespace CallCenterApi.Interface.Controllers
1342 1342
                             {
1343 1343
                                 if (butt != null)
1344 1344
                                     btns.Remove(butt);
1345
-                                if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
1345
+                                if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "SPZ"
1346
+                                    || User.F_RoleCode == "SPZJZ" || User.F_RoleCode == "DDZG")
1346 1347
                                 {
1347 1348
                                     btns.Add(ButtonGroup.oversee());
1348 1349
                                     btns.Add(ButtonGroup.turnnosee());
@@ -1716,7 +1717,8 @@ namespace CallCenterApi.Interface.Controllers
1716 1717
             string strusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
1717 1718
             Model.T_Sys_UserAccount userModel = userBLL.GetModel(strusercode);
1718 1719
             string sqlld = "  and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 ";
1719
-            if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "ZXLDGLY" && userModel.F_RoleCode != "ZXLDGLYGLY" && userModel.F_RoleCode != "DDZG")
1720
+            if (userModel.F_RoleCode != "GLY"
1721
+&& User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && userModel.F_RoleCode != "ZXLDGLY" && userModel.F_RoleCode != "ZXLDGLYGLY" && userModel.F_RoleCode != "DDZG")
1720 1722
             {
1721 1723
                 sqlld += " and F_CreateUser='" + userModel.F_UserCode + "')";
1722 1724
             }
@@ -1728,14 +1730,16 @@ namespace CallCenterApi.Interface.Controllers
1728 1730
             string sqlthsh = sql + " and F_WorkState = '3' " + sqlld;
1729 1731
             string sqlyssh = sql + " and F_WorkState = '5' " + sqlld;
1730 1732
             string sqlcbdjb = sql + " and F_WorkState = '11' " + sqlld;
1731
-            if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "ZXLDGLY" && userModel.F_RoleCode != "ZXLDGLYGLY" && userModel.F_RoleCode != "DDZG")
1733
+            if (userModel.F_RoleCode != "GLY"
1734
+&& User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && userModel.F_RoleCode != "ZXLDGLY" && userModel.F_RoleCode != "ZXLDGLYGLY" && userModel.F_RoleCode != "DDZG")
1732 1735
             {
1733 1736
                 sqllddcl += " and (F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo WITH(NOLOCK) where F_State = 1 and F_IsDelete = 0 "
1734 1737
                     + "and F_CreateUser = '" + userModel.F_UserCode + "') or (select top 1 F_WorkOrderId from T_Bus_AssignedInfo WITH(NOLOCK) where"
1735 1738
                     + " F_State = 1 and F_IsDelete = 0 and T_Bus_AssignedInfo.F_WorkOrderId = T_Bus_WorkOrder.F_WorkOrderId) is null)";
1736 1739
             }
1737 1740
             string dw = "";
1738
-            if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "DDZG")
1741
+            if (userModel.F_RoleCode != "GLY"
1742
+&& User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && userModel.F_RoleCode != "DDZG")
1739 1743
             {
1740 1744
                 dw += " and F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and "
1741 1745
                 + " ISNULL(F_FeedbackTime, '')='' and F_MainDeptId =" + userModel.F_DeptId + " and F_IsSure in (0,1))";
@@ -1745,7 +1749,8 @@ namespace CallCenterApi.Interface.Controllers
1745 1749
             string dwdbl = sql + " and F_WorkState = '4' " + dw;
1746 1750
 
1747 1751
             string dwthsh = sql + "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_Type = 3 ";
1748
-            if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "DDZG")
1752
+            if (userModel.F_RoleCode != "GLY"
1753
+&& User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && userModel.F_RoleCode != "DDZG")
1749 1754
             {
1750 1755
                 dwthsh += " and F_CreateUser='" + userModel.F_UserCode + "')";
1751 1756
             }
@@ -1755,7 +1760,8 @@ namespace CallCenterApi.Interface.Controllers
1755 1760
             }
1756 1761
 
1757 1762
             string dwyssh = sql + "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_DelayTime WITH(NOLOCK) where  F_IsDelete=0 ";
1758
-            if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "DDZG")
1763
+            if (userModel.F_RoleCode != "GLY"
1764
+&& User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && userModel.F_RoleCode != "DDZG")
1759 1765
             {
1760 1766
                 dwyssh += " and F_CreateUser='" + userModel.F_UserCode + "')";
1761 1767
             }
@@ -1767,14 +1773,16 @@ namespace CallCenterApi.Interface.Controllers
1767 1773
 
1768 1774
             int[] sts = new int[] { (int)EnumWorkState.dealing, (int)EnumWorkState.auditdelay };
1769 1775
             string ejdbl = sql + " and F_WorkState in (" + string.Join(",", sts.Select(p => p.ToString())) + ")";
1770
-            if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "DDZG")
1776
+            if (userModel.F_RoleCode != "GLY"
1777
+&& User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && userModel.F_RoleCode != "DDZG")
1771 1778
             {
1772 1779
                 ejdbl += " and F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo_Next WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and "
1773 1780
                     + " ISNULL(F_FeedbackTime, '')='' and F_MainDeptId =" + userModel.F_DeptId + " and F_IsSure in (0,1))";
1774 1781
             }
1775 1782
 
1776 1783
             string ejybl = sql + "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback_Next WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_Type in (1,2) ";
1777
-            if (userModel.F_RoleCode != "GLY" && userModel.F_RoleCode != "DDZG")
1784
+            if (userModel.F_RoleCode != "GLY"
1785
+&& User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && userModel.F_RoleCode != "DDZG")
1778 1786
             {
1779 1787
                 ejybl += " and F_CreateUser='" + userModel.F_UserCode + "')";
1780 1788
             }

+ 8 - 6
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -33,7 +33,7 @@ namespace CallCenterApi.Interface.Controllers
33 33
         {
34 34
             int zxdcl = 0;
35 35
             string zxdclsql = "";
36
-            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "YSZY" && User.F_RoleCode != "DDZG" && User.F_RoleCode != "MTDD" && User.F_RoleCode != "DMTSH")
36
+            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "YSZY" && User.F_RoleCode != "DDZG" && User.F_RoleCode != "MTDD" && User.F_RoleCode != "DMTSH")
37 37
             {
38 38
                 if (User.F_RoleCode != "ZJZY" && User.F_RoleCode != "ZXHWY")
39 39
                     zxdclsql += " and F_CreateUser='" + User.F_UserCode + "'";
@@ -47,7 +47,8 @@ namespace CallCenterApi.Interface.Controllers
47 47
 
48 48
             int gdbh = 0;
49 49
            string  gdbhsql = " and F_WorkState in (0,10) and F_IsReturn=1";
50
-            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "DDZG")
50
+            if (User.F_RoleCode != "GLY"
51
+&& User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "DDZG")
51 52
             {
52 53
                 gdbhsql += " and F_CreateUser='" + User.F_UserCode + "'";
53 54
             }
@@ -57,7 +58,8 @@ namespace CallCenterApi.Interface.Controllers
57 58
 
58 59
             int ybdhf = 0;
59 60
             string ybdhfsql = "";
60
-            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "YSZY" && User.F_RoleCode != "DDZG" && User.F_RoleCode != "MTDD" && User.F_RoleCode != "DMTSH")
61
+            if (User.F_RoleCode != "GLY"
62
+&& User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "YSZY" && User.F_RoleCode != "DDZG" && User.F_RoleCode != "MTDD" && User.F_RoleCode != "DMTSH")
61 63
             {
62 64
                 if (User.F_RoleCode != "ZJZY" && User.F_RoleCode != "ZXHWY")
63 65
                     ybdhfsql += " and F_CreateUser='" + User.F_UserCode + "'";
@@ -670,7 +672,7 @@ namespace CallCenterApi.Interface.Controllers
670 672
             }
671 673
             #endregion
672 674
             #region 管理员(GLY)
673
-            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
675
+            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ" || User.F_RoleCode == "DDZG")
674 676
             {//管理员
675 677
                 int[] sts = { 0, 12, 1, 2, 3, 4, 10, 5, 6, 7, 8,16 };
676 678
                 string sql = "select F_WorkState as state,count(1) con from T_Bus_WorkOrder where F_IsDelete=0 and F_WorkState !=9 "
@@ -907,7 +909,7 @@ namespace CallCenterApi.Interface.Controllers
907 909
                     }
908 910
                     #endregion
909 911
                     #region 管理员(GLY)
910
-                    if (User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
912
+                    if (User.F_RoleCode == "GLY" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ" || User.F_RoleCode == "DDZG")
911 913
                     {//管理员
912 914
                         int[] sts = { 0, 12, 1, 2, 3, 4, 10, 5, 6, 7, 8 };
913 915
                         string sql = "select F_WorkState as state,count(1) con from T_Bus_WorkOrder WITH(NOLOCK) where F_IsDelete=0 and F_WorkState !=9 "
@@ -1355,7 +1357,7 @@ namespace CallCenterApi.Interface.Controllers
1355 1357
 
1356 1358
             #region 权限设置
1357 1359
             //管理员,坐席班长
1358
-            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "ZXBZ")
1360
+            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "ZXBZ")
1359 1361
             {
1360 1362
                 //
1361 1363
             }

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/DataAnalysisController.cs

@@ -531,8 +531,8 @@ namespace CallCenterApi.Interface.Controllers.report
531 531
                 stime = new DateTime(stime.Year, stime.Month, 1); ;
532 532
             }
533 533
             Dictionary<string, string> paras = new Dictionary<string, string>();
534
-            paras.Add("@sdate", stime.ToString("yyyy-MM-dd"));
535
-            paras.Add("@edate", etime.ToString("yyyy-MM-dd"));
534
+            paras.Add("@sdate", stime.ToString("yyyy-MM-dd HH:mm:ss"));
535
+            paras.Add("@edate", etime.ToString("yyyy-MM-dd HH:mm:ss"));
536 536
             paras.Add("@source", source);
537 537
             var obj = DbHelperSQL.RunProcedure("P_TellReport", paras, "TellReport");
538 538
             if (isdc > 0)

+ 4 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/DeptAssessmentController.cs

@@ -218,8 +218,8 @@ namespace CallCenterApi.Interface.Controllers.report
218 218
             #region 不满意度评价100205
219 219
             var assignedList = assignedInfoBLL.DataTableToList(assignedInfoBLL.GetList($" F_MainDeptId = '{f_DeptId}' and F_IsDelete=0 and F_IsSure in (0,1,2) and  F_State in (0,1)   and  datediff(s,'{start}',F_CreateTime)>0 and datediff(s,'{end}',F_CreateTime)<0  ").Tables[0]).DistinctBy(y => y.F_WorkOrderId);
220 220
             //F_IsSatisfie 1不满意     F_IsReload 0不重办,>0重办次数
221
-            var assignedListsS = assignedList.Where(y => y.F_IsSatisfie == 1 && (y.F_IsReload == 0 || y.F_IsReload == null)).ToList();   //每件扣1分 F_IsReload == 0没有重办
222
-            var assignedListsR = assignedList.Where(y => y.F_IsSatisfie == 1 && y.F_IsReload > 0).ToList();    //每件扣2分 F_IsReload > 0重办次数
221
+            var assignedListsS = assignedList.Where(y => y.F_IsSatisfie >=1 && (y.F_IsReload == 0 || y.F_IsReload == null)).ToList();   //每件扣1分 F_IsReload == 0没有重办
222
+            var assignedListsR = assignedList.Where(y => y.F_IsSatisfie >=1 && y.F_IsReload > 0).ToList();    //每件扣2分 F_IsReload > 0重办次数
223 223
             int assignedCountS = assignedListsS.Count();
224 224
             int satisfieCountR = assignedListsR.Count() * 2;
225 225
             double nosatisfieCount = -(double)(assignedCountS + satisfieCountR);
@@ -596,8 +596,8 @@ namespace CallCenterApi.Interface.Controllers.report
596 596
                 var assigneddeptList = assignedList.Where(y => y.F_MainDeptId == x.F_DeptId);
597 597
                 #region 不满意度评价100205
598 598
                 //F_IsSatisfie 1不满意     F_IsReload 0不重办,>0重办次数
599
-                var assignedListsS = assigneddeptList.Where(y => y.F_IsSatisfie == 1 && (y.F_IsReload == 0 || y.F_IsReload == null)).ToList();   //每件扣1分 F_IsReload == 0没有重办
600
-                var assignedListsR = assigneddeptList.Where(y => y.F_IsSatisfie == 1 && y.F_IsReload > 0).ToList();    //每件扣2分 F_IsReload > 0重办次数
599
+                var assignedListsS = assigneddeptList.Where(y => y.F_IsSatisfie>= 1 && (y.F_IsReload == 0 || y.F_IsReload == null)).ToList();   //每件扣1分 F_IsReload == 0没有重办
600
+                var assignedListsR = assigneddeptList.Where(y => y.F_IsSatisfie>= 1 && y.F_IsReload > 0).ToList();    //每件扣2分 F_IsReload > 0重办次数
601 601
                 int assignedCountS = assignedListsS.Count();
602 602
                 int satisfieCountR = assignedListsR.Count() * 2;
603 603
                 double nosatisfieCount = -(double)(assignedCountS + satisfieCountR);

+ 7 - 7
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

@@ -2145,7 +2145,7 @@ namespace CallCenterApi.Interface.Controllers.report
2145 2145
                 edate = DateTime.Now.Date.ToString("yyyy-MM-dd");
2146 2146
             }
2147 2147
             
2148
-            if (User.F_RoleCode == "GLY")
2148
+            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ")
2149 2149
             {
2150 2150
                 var maindeptid = 0;
2151 2151
                 if (User.F_RoleCode == "WLDW")
@@ -2182,7 +2182,7 @@ namespace CallCenterApi.Interface.Controllers.report
2182 2182
                 edate = DateTime.Now.Date.ToString("yyyy-MM-dd");
2183 2183
             }
2184 2184
             
2185
-            if (User.F_RoleCode != "GLY")
2185
+            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
2186 2186
             {
2187 2187
                 var maindeptid = 0;
2188 2188
                 if (User.F_RoleCode == "WLDW")
@@ -2248,7 +2248,7 @@ namespace CallCenterApi.Interface.Controllers.report
2248 2248
             }
2249 2249
             
2250 2250
             int deptid = 0;
2251
-            if (User.F_RoleCode != "GLY")
2251
+            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
2252 2252
             {
2253 2253
                 if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "EJWLDW")
2254 2254
                 {
@@ -2280,7 +2280,7 @@ namespace CallCenterApi.Interface.Controllers.report
2280 2280
             }
2281 2281
             
2282 2282
             int deptid = 0;
2283
-            if (User.F_RoleCode != "GLY")
2283
+            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
2284 2284
             {
2285 2285
                 if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "EJWLDW")
2286 2286
                 {
@@ -2338,7 +2338,7 @@ namespace CallCenterApi.Interface.Controllers.report
2338 2338
             }
2339 2339
             
2340 2340
             int deptid = 0;
2341
-            if (User.F_RoleCode != "GLY")
2341
+            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
2342 2342
             {
2343 2343
                 if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "EJWLDW")
2344 2344
                 {
@@ -2378,7 +2378,7 @@ namespace CallCenterApi.Interface.Controllers.report
2378 2378
             }
2379 2379
             
2380 2380
             int deptid = 0;
2381
-            if (User.F_RoleCode != "GLY")
2381
+            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
2382 2382
             {
2383 2383
                 if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "EJWLDW")
2384 2384
                 {
@@ -2417,7 +2417,7 @@ namespace CallCenterApi.Interface.Controllers.report
2417 2417
                 edate = DateTime.Now.Date.ToString("yyyy-MM-dd");
2418 2418
             }
2419 2419
             int deptid = 0;
2420
-            if (User.F_RoleCode != "GLY")
2420
+            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
2421 2421
             {
2422 2422
                 if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "EJWLDW")
2423 2423
                 {

File diff suppressed because it is too large
+ 451 - 569
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs


+ 166 - 44
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -217,6 +217,11 @@ namespace CallCenterApi.Interface.Models.Common
217 217
         {
218 218
             return new button(58, "退回审核");
219 219
         }
220
+
221
+        public static button Append()
222
+        {
223
+            return new button(59, "追加回复");
224
+        }
220 225
         /// <summary>
221 226
         /// 审核员退回
222 227
         /// </summary>
@@ -282,23 +287,20 @@ namespace CallCenterApi.Interface.Models.Common
282 287
             //中心领导管理员(ZXLDGLYGLY) 话务主管(ZXBZ) 中心领导(ZXLDGLY) 话务组长(ZXBZ)
283 288
             //导播话务员(DBHWY) 网易新闻(11) 三级网络单位(EJWLDW) 民生播报(MSBB)
284 289
             //督办专员(DBZY) 质检专员(ZJZY)
285
-            //调度主管(DDZG)
290
+            //调度主管(DDZG)审核组SPZ 审核质检组SPZJZ
286 291
             List<button> buttons = new List<button>();
287 292
             buttons.Add(query());
288 293
             switch (state)
289 294
             {
290 295
                 case "0":
291 296
                     //调度专员 质检专员可以进行编辑 zhengbingbing 20191017
292
-                    if (code == "ZXLD" || code == "YSZY" || code == "ZJZY" || code == "GNZY")
297
+                    if (code == "ZXLD" || code == "ZJZY")
293 298
                         buttons.Add(edit());
294 299
                     if (code == "ZXLD" )
295 300
                         buttons.Add(delete());
296
-                    if (code == "GNZY")
297
-                    {
298
-                        buttons.Add(submit());
299
-                    }
301
+                  
300 302
                     //中心话务员 坐席班长 管理员
301
-                    if ( code == "ZXBZ" || code == "GLY" || code == "DDZG")
303
+                    if ( code == "ZXBZ" || code == "SPZ" || code == "SPZJZ" || code == "GLY" || code == "DDZG")
302 304
                     {
303 305
                         buttons.Add(delete());
304 306
                     }
@@ -307,37 +309,22 @@ namespace CallCenterApi.Interface.Models.Common
307 309
                         buttons.Add(submit());
308 310
                         buttons.Add(edit());
309 311
                     }
310
-                    if (code == "MTDD")
311
-                    {
312
-                        buttons.Add(delete());
313
-                        buttons.Add(submit());
314
-                    }
312
+                   
315 313
                     break;
316 314
                 case "1":
317 315
                     //质检专员可以进行编辑 zhengbingbing 20191017
318 316
                     if (code == "ZJZY")
319 317
                         buttons.Add(edit());
320 318
                     //调度专员 中心领导管理员 管理员
321
-                    if (code == "ZXLD" || code == "YSZY" || code == "GLY" || code == "ZXLDGLYGLY" || code == "DDZG" || code == "MTDD")
319
+                    if (code == "ZXLD" || code == "GLY" || code == "ZXLDGLYGLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
322 320
                     {
323
-                        if (issh ==2 && code == "MTDD")
324
-                        {
325
-                        }
326
-                        else
327
-                        {
328
-                          //  buttons.Add(Report());
321
+                      
329 322
                             buttons.Add(edit());
330 323
                             buttons.Add(back());
331
-                            // buttons.Add(assign());
332
-                           // buttons.Add(approval());
333
-                            //20190315提出需求 操作-领导批示改为转督办 (20190327 zhengbingbing)
334
-                            //  buttons.Add(turnsee());
335
-                           // buttons.Add(instruct());
336
-                        }
324
+                       
337 325
                        
338 326
                     }
339
-                    //if (code == "ZXLD" || code == "YSZY")
340
-                    //    buttons.Add(turnsee());
327
+                   
341 328
                     if (code == "ZXHWY")
342 329
                     {//待审核交办时可撤单
343 330
                         buttons.Add(withdraw());
@@ -348,10 +335,10 @@ namespace CallCenterApi.Interface.Models.Common
348 335
                     if (code == "GLY" || code == "WLDW")
349 336
                     {
350 337
                         buttons.Add(receive());
351
-                        //  buttons.Add(reback());
338
+                       
352 339
                     }
353 340
                     //调度专员 中心领导管理员 管理员
354
-                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
341
+                    if (code == "ZXLD" || code == "SPZ" || code == "SPZJZ"  || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" )
355 342
                     {
356 343
                         buttons.Add(takeback());
357 344
                         buttons.Add(edit());
@@ -359,7 +346,7 @@ namespace CallCenterApi.Interface.Models.Common
359 346
                     break;
360 347
                 case "3":
361 348
                     //调度专员 中心领导管理员 管理员
362
-                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
349
+                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
363 350
                     {
364 351
                         buttons.Add(auditreback()); buttons.Add(turnsee());
365 352
                     }
@@ -391,7 +378,7 @@ namespace CallCenterApi.Interface.Models.Common
391 378
                         }
392 379
                     }
393 380
                     //调度专员 中心领导管理员 管理员
394
-                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
381
+                    if (code == "ZXLD" || code == "SPZ" || code == "SPZJZ" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" )
395 382
                     {
396 383
                         buttons.Add(takeback());
397 384
                         buttons.Add(edit());
@@ -420,7 +407,7 @@ namespace CallCenterApi.Interface.Models.Common
420 407
                     break;
421 408
                 case "5":
422 409
                     //调度专员 中心领导管理员 管理员
423
-                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
410
+                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
424 411
                     {
425 412
                      //   buttons.Add(edit());
426 413
                         buttons.Add(auditdelay());
@@ -488,7 +475,7 @@ namespace CallCenterApi.Interface.Models.Common
488 475
                     }
489 476
                     else
490 477
                    {
491
-                        if (code == "ZJZY" || code == "GNZY" || code == "GLY" || code == "ZXLD" || code == "YSZY" || code == "DDZG" || code == "MTDD" || code == "DMTSH")
478
+                        if (code == "ZJZY" || code == "GLY" || code == "ZXLD"  || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
492 479
                         {
493 480
                             buttons.Add(VisitApproved());
494 481
                             buttons.Add(Auditfailed());
@@ -577,7 +564,7 @@ namespace CallCenterApi.Interface.Models.Common
577 564
                         }
578 565
                         else if (isproresult == 3)
579 566
                         {
580
-                            if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "YSZY" || code == "DDZG" || code == "MTDD")
567
+                            if (code == "ZJZY" || code == "GLY" || code == "ZXLD"  || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
581 568
                             {
582 569
                                 //if (user == "省平台")
583 570
                                 //    buttons.Add(visits());
@@ -606,7 +593,7 @@ namespace CallCenterApi.Interface.Models.Common
606 593
                     }
607 594
                     else
608 595
                     {
609
-                        if (code == "ZJZY" || code == "GNZY" || code == "GLY" || code == "ZXLD" || code == "YSZY" || code == "DDZG" || code == "MTDD")
596
+                        if (code == "ZJZY"  || code == "GLY" || code == "ZXLD" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
610 597
                         {
611 598
                             buttons.Add(visit());
612 599
                             buttons.Add(subback());
@@ -632,7 +619,7 @@ namespace CallCenterApi.Interface.Models.Common
632 619
 
633 620
                     }
634 621
                     //调度专员 中心领导管理员 管理员
635
-                    if (code == "ZXLD" || code == "YSZY"   || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
622
+                    if (code == "ZXLD"    || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
636 623
                     {
637 624
                         buttons.Add(edit());
638 625
                         buttons.Add(takeback());
@@ -660,12 +647,12 @@ namespace CallCenterApi.Interface.Models.Common
660 647
                     break;
661 648
                 case "9":
662 649
                     //调度专员 中心领导管理员 管理员
663
-                    if ((code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD" || code == "ZXHWY") && iszb == "1")
650
+                    if ((code == "ZXLD"  || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "ZXHWY" || code == "SPZ" || code == "SPZJZ") && iszb == "1")
664 651
                     {
665 652
 
666 653
                         // buttons.Add(back());
667 654
                     }
668
-                    if (code == "ZXLD" || code == "GNZY" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD" || code == "ZXHWY")
655
+                    if (code == "ZXLD"  || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "ZXHWY" || code == "SPZ" || code == "SPZJZ")
669 656
                     {
670 657
                         buttons.Add(modify());
671 658
                     }
@@ -677,12 +664,12 @@ namespace CallCenterApi.Interface.Models.Common
677 664
                     if (code == "ZXBZ" || code == "GLY" || code == "DDZG")
678 665
                         buttons.Add(audit());
679 666
                     #endregion
680
-                    if (code == "ZXHWY" || code == "ZXBZ" || code == "GLY" || code == "DDZG")
667
+                    if (code == "ZXHWY" || code == "ZXBZ" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
681 668
                         buttons.Add(edit());
682 669
                     break;
683 670
                 case "11":
684 671
                     //调度专员 中心领导管理员 管理员
685
-                    if (code == "ZXLD" || code == "YSZY" || code == "MTDD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
672
+                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
686 673
                     {
687 674
                         buttons.Add(reload()); buttons.Add(reject());
688 675
                     }
@@ -706,7 +693,7 @@ namespace CallCenterApi.Interface.Models.Common
706 693
                     }
707 694
                     break;
708 695
                 case "14":
709
-                    if (code == "ZJZY" || code == "ZXLD" || code == "GLY" || code == "DDZG")
696
+                    if (code == "ZJZY" || code == "ZXLD" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
710 697
                     {
711 698
                         buttons.Add(AuditReturn());
712 699
                         
@@ -716,7 +703,7 @@ namespace CallCenterApi.Interface.Models.Common
716 703
             }
717 704
             //buttons.Add(export());
718 705
             //调度专员 中心领导管理员 管理员
719
-            if (state != "0" && state != "9" && (code == "ZXLD" || code == "YSZY" || code == "MTDD"|| code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"))
706
+            if (state != "0" && state != "9" && (code == "ZXLD"|| code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ"))
720 707
             {
721 708
                
722 709
                 buttons.Add(forceend());
@@ -751,12 +738,12 @@ namespace CallCenterApi.Interface.Models.Common
751 738
                     }
752 739
                     break;
753 740
                 case "1":
754
-                    if (rolecode == "ZXLD" || rolecode == "YSZY" || rolecode == "ZXLDGLY" || rolecode == "ZXLDGLYGLY" || rolecode == "GLY"|| rolecode == "MTDD")
741
+                    if (rolecode == "ZXLD"  || rolecode == "ZXLDGLY" || rolecode == "ZXLDGLYGLY" || rolecode == "GLY" || rolecode == "SPZ" || rolecode == "SPZJZ")
755 742
                         buttons.Add(zsk_audit());
756 743
                     break;
757 744
                 case "2":
758 745
                 case "5":
759
-                    if (rolecode == "ZXHWY" || rolecode == "ZXBZ" || rolecode == "ZXLD" || rolecode == "YSZY" || rolecode == "DBZY" || rolecode == "ZJZY" || rolecode == "GLY")
746
+                    if (rolecode == "ZXHWY" || rolecode == "ZXBZ" || rolecode == "ZXLD"  || rolecode == "DBZY" || rolecode == "ZJZY" || rolecode == "GLY" || rolecode == "SPZ" || rolecode == "SPZJZ")
760 747
                     {
761 748
                         //解决 未解决
762 749
                         buttons.Add(zsk_solved()); buttons.Add(zsk_unsolved());
@@ -784,6 +771,141 @@ namespace CallCenterApi.Interface.Models.Common
784 771
             }
785 772
             return buttons;
786 773
         }
774
+
775
+
776
+
777
+
778
+        /// <summary>
779
+        /// 根据状态和角色代码获取操作按钮
780
+        /// </summary>
781
+        /// <param name="state"></param>
782
+        /// <param name="code"></param>
783
+        /// <param name="iszb"></param>
784
+        /// <returns></returns>
785
+        public static List<button> GetAPPButtons(string state, string code,string  isproresult = "0")
786
+        {
787
+            //审核组SPZ 审核质检组SPZJZ
788
+            List<button> buttons = new List<button>();
789
+            switch (state)
790
+            {
791
+                case "1":
792
+                    //调度专员 中心领导管理员 管理员
793
+                    if ( code == "GLY" || code == "SPZ" || code == "SPZJZ")
794
+                    {
795
+                        buttons.Add(assign());
796
+                    }
797
+                    break;
798
+                case "2":
799
+                    //二级网络单位 管理员     
800
+                    if (code == "GLY" || code == "WLDW")
801
+                    {
802
+                        buttons.Add(receive());
803
+
804
+                    }
805
+                    break;
806
+                case "3":
807
+                    //调度专员 中心领导管理员 管理员
808
+                    if ( code == "SPZ" || code == "SPZJZ")
809
+                    {
810
+                        buttons.Add(auditreback());
811
+                    }
812
+                    break;
813
+                case "4":
814
+                    //二级网络单位 管理员
815
+                    if (code == "WLDW" || code == "DDZG")
816
+                    {
817
+                        buttons.Add(feedback());
818
+                        buttons.Add(delay());
819
+
820
+                    }
821
+                    //调度专员 中心领导管理员 管理员
822
+                    if (code == "ZXLD" || code == "SPZ" || code == "SPZJZ" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG")
823
+                    {
824
+                        buttons.Add(takeback());
825
+                        buttons.Add(edit());
826
+                     
827
+                    }
828
+                    break;
829
+                case "5":
830
+                    //调度专员 中心领导管理员 管理员
831
+                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
832
+                    {
833
+                        buttons.Add(auditdelay());
834
+                    }
835
+                    break;
836
+                case "6":
837
+                    //质检专员(ZJZY)
838
+                    if (isproresult == "2")
839
+                    {
840
+                        if (code == "WLDW")
841
+                        {
842
+                            buttons.Add(Append());
843
+                        }
844
+                    }
845
+                    if (code == "SPZ" || code == "SPZJZ")
846
+                    {
847
+                        buttons.Add(VisitApproved());
848
+                        buttons.Add(Auditfailed());
849
+                        buttons.Add(Audittransfer());
850
+
851
+                    }
852
+                    break;
853
+                 case "7":
854
+                    //调度专员 中心领导管理员 管理员
855
+                    //if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY")
856
+                    if (isproresult == "2")
857
+                    {
858
+                        if (code == "WLDW")
859
+                        {
860
+                            buttons.Add(Append());
861
+                        }
862
+                    }
863
+                    else if (isproresult == "3")
864
+                    {
865
+                        if (code == "SPZ" || code == "SPZJZ")
866
+                        {
867
+                            buttons.Add(visit());
868
+                        }
869
+                    }
870
+                    else
871
+                    {
872
+                        if ( code == "SPZ" || code == "SPZJZ")
873
+                        {
874
+                            buttons.Add(visit());
875
+                        
876
+                        }
877
+                    }
878
+                    break;
879
+                case "8":
880
+                    //二级网络单位 管理员
881
+                    if (code == "WLDW" )
882
+                    {
883
+
884
+                        buttons.Add(feedback());
885
+                        buttons.Add(delay());
886
+                    }
887
+                    break;
888
+                case "11":
889
+                    //调度专员 中心领导管理员 管理员
890
+                    if (code == "SPZ" || code == "SPZJZ")
891
+                    {
892
+                        buttons.Add(reload()); buttons.Add(reject());
893
+                    }
894
+                    break;
895
+                case "14":
896
+                    if ( code == "SPZ" || code == "SPZJZ")
897
+                    {
898
+                        buttons.Add(AuditReturn());
899
+
900
+                    }
901
+
902
+                    break;
903
+            }
904
+            //buttons.Add(export());
905
+            //调度专员 中心领导管理员 管理员
906
+           
907
+            return buttons;
908
+        }
787 909
         #endregion
788 910
     }
789 911
 }

+ 1 - 1
CallCenterApi/CallCenterApi.Model/T_Bus_AssignedInfo.cs

@@ -276,7 +276,7 @@ namespace CallCenterApi.Model
276 276
             get { return _f_nexttime; }
277 277
         }
278 278
         /// <summary>
279
-        /// 是否进行履职:0未执行,1提交履职,2履职成功,3履职失败
279
+        /// 是否退回统计0否1是
280 280
         /// </summary>
281 281
         public int? F_IsPerform
282 282
         {