Ver Código Fonte

知识库导出,营商管理

duhongyu 4 anos atrás
pai
commit
337c6657e3
19 arquivos alterados com 253 adições e 173 exclusões
  1. 4 1
      CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs
  2. 2 0
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj
  3. 1 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs
  4. 7 7
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs
  5. 1 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs
  6. 5 5
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/WebChart/InfoNewController.cs
  7. 1 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/FunctionsController.cs
  8. 1 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/HotspotGlossaryController.cs
  9. 1 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/LawGuideController.cs
  10. 1 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/NounInterpretationController.cs
  11. 1 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/PolicyController.cs
  12. 2 2
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/ProfessorController.cs
  13. 1 1
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/AddressBookController.cs
  14. 4 2
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs
  15. 24 0
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/YSReportController.cs
  16. 175 126
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs
  17. 3 3
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs
  18. 18 18
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs
  19. 1 1
      CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

+ 4 - 1
CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

@@ -947,7 +947,10 @@ namespace CallCenterApi.DAL
947 947
                 {
948 948
                     model.F_IsMedia = int.Parse(row["F_IsMedia"].ToString());
949 949
                 }
950
-                
950
+                if (row["F_IsExamine"] != null && row["F_IsExamine"].ToString() != "")
951
+                {
952
+                    model.F_IsExamine  = int.Parse(row["F_IsExamine"].ToString());
953
+                }
951 954
             }
952 955
             return model;
953 956
         }

+ 2 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -208,6 +208,7 @@
208 208
     <Compile Include="Controllers\Quality\IndexCategoryController.cs" />
209 209
     <Compile Include="Controllers\Quality\QCManageController.cs" />
210 210
     <Compile Include="Controllers\Quality\QCResultController.cs" />
211
+    <Compile Include="Controllers\report\YSReportController.cs" />
211 212
     <Compile Include="Controllers\Sms\SmsNewController.cs" />
212 213
     <Compile Include="Controllers\WebChart\InfoController.cs" />
213 214
     <Compile Include="Controllers\information\InternalMessagesController.cs" />
@@ -349,6 +350,7 @@
349 350
     <Folder Include="Views\Functions\" />
350 351
     <Folder Include="Views\NounInterpretation\" />
351 352
     <Folder Include="Views\QCResult\" />
353
+    <Folder Include="Views\YSReport\" />
352 354
   </ItemGroup>
353 355
   <ItemGroup>
354 356
     <ProjectReference Include="..\..\..\CallCenterCommon\CallCenter.QuartzService\CallCenter.QuartzService.csproj">

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -31,7 +31,7 @@ namespace CallCenterApi.Interface.Controllers
31 31
             {
32 32
                 sql += " and F_DeptName like '%" + deptname.Trim() + "%'";
33 33
             }
34
-            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "ZXLD"|| User.F_RoleCode == "MTDD" || User.F_RoleCode == "ZXHWY"
34
+            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "YSZY" || User.F_RoleCode == "MTDD" || User.F_RoleCode == "ZXHWY"
35 35
                 || User.F_RoleCode == "DBZY")
36 36
             {
37 37
                

+ 7 - 7
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 != "DDZG" && User.F_RoleCode != "MTDD")
36
+            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "YSZY" && User.F_RoleCode != "DDZG" && User.F_RoleCode != "MTDD")
37 37
             {
38 38
                 if (User.F_RoleCode != "ZJZY" && User.F_RoleCode != "ZXHWY")
39 39
                     zxdclsql += " and F_CreateUser='" + User.F_UserCode + "'";
@@ -57,7 +57,7 @@ namespace CallCenterApi.Interface.Controllers
57 57
 
58 58
             int ybdhf = 0;
59 59
             string ybdhfsql = "";
60
-            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "DDZG" && User.F_RoleCode != "MTDD")
60
+            if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "YSZY" && User.F_RoleCode != "DDZG" && User.F_RoleCode != "MTDD")
61 61
             {
62 62
                 if (User.F_RoleCode != "ZJZY" && User.F_RoleCode != "ZXHWY")
63 63
                     ybdhfsql += " and F_CreateUser='" + User.F_UserCode + "'";
@@ -65,7 +65,7 @@ namespace CallCenterApi.Interface.Controllers
65 65
             }
66 66
             ybdhfsql += "and F_ToBereply=1";
67 67
             ybdhfsql += " and F_WorkState = '6' ";
68
-            ybdhfsql += "and F_WorkOrderID not in (select F_WorkOrderID from T_Bus_RemindRecord where F_Type=1 and F_IsDelete=0and F_Content != '推诿工单' and F_State!=2)";
68
+            ybdhfsql += "and F_WorkOrderID not in (select F_WorkOrderID from T_Bus_RemindRecord where F_Type=1 and F_IsDelete=0and  (F_Content != '推诿工单' or F_Content is null  ) and F_State!=2)";
69 69
             string sqlybdhf = "SELECT count(1) from T_Bus_WorkOrder where F_IsDelete=0 " + ybdhfsql;
70 70
             ybdhf = Int32.Parse(DbHelperSQL.Query(sqlybdhf).Tables[0].Rows[0][0].ToString());
71 71
 
@@ -565,7 +565,7 @@ namespace CallCenterApi.Interface.Controllers
565 565
             //}
566 566
             #endregion
567 567
             #region 调度专员(ZXLD) 中心领导(ZXLDGLY) 中心领导管理员(ZXLDGLYGLY) 调度主管(DDZG)
568
-            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "MTDD" || User.F_RoleCode == "ZXLDGLY" || User.F_RoleCode == "ZXLDGLYGLY" )
568
+            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "YSZY" || User.F_RoleCode == "MTDD" || User.F_RoleCode == "ZXLDGLY" || User.F_RoleCode == "ZXLDGLYGLY" )
569 569
             {//调度专员(ZXLD) 中心领导(ZXLDGLY) 中心领导管理员(ZXLDGLYGLY)
570 570
                 int[] sts = { 1, 3, 5 };
571 571
 
@@ -808,7 +808,7 @@ namespace CallCenterApi.Interface.Controllers
808 808
                     }
809 809
                     #endregion
810 810
                     #region 调度专员(ZXLD) 中心领导(ZXLDGLY) 中心领导管理员(ZXLDGLYGLY)
811
-                    if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "MTDD" || User.F_RoleCode == "ZXLDGLY" || User.F_RoleCode == "ZXLDGLYGLY")
811
+                    if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "YSZY" || User.F_RoleCode == "MTDD" || User.F_RoleCode == "ZXLDGLY" || User.F_RoleCode == "ZXLDGLYGLY")
812 812
                     {//调度专员(ZXLD) 中心领导(ZXLDGLY) 中心领导管理员(ZXLDGLYGLY)
813 813
                         int[] sts = { 1, 3, 5 };
814 814
 
@@ -1120,7 +1120,7 @@ namespace CallCenterApi.Interface.Controllers
1120 1120
                     + " where F_State=1 and F_IsDelete=0 and ISNULL(F_FeedbackTime, '')='' and  F_DeptId = '" + User.F_DeptId + "' ";
1121 1121
             }
1122 1122
 
1123
-            if (User.F_RoleCode == "ZXLD"|| User.F_RoleCode == "MTDD")
1123
+            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "YSZY" || User.F_RoleCode == "MTDD")
1124 1124
             {
1125 1125
                 sql += " and  F_CreateUser = '" + User.F_UserCode + "' ";
1126 1126
             }
@@ -1142,7 +1142,7 @@ namespace CallCenterApi.Interface.Controllers
1142 1142
                     + " where F_State=1 and F_IsDelete=0 and F_LimitTime<getdate() and ISNULL(F_FeedbackTime, '')='' and  F_DeptId = '" + User.F_DeptId + "' ";
1143 1143
             }
1144 1144
 
1145
-            if (User.F_RoleCode == "ZXLD"|| User.F_RoleCode == "MTDD" )
1145
+            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "YSZY" || User.F_RoleCode == "MTDD" )
1146 1146
             {
1147 1147
                 sqltimeout += " and  F_CreateUser = '" + User.F_UserCode + "' ";
1148 1148
             }

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -44,7 +44,7 @@ namespace CallCenterApi.Interface.Controllers
44 44
                 {
45 45
                     sql += " and F_DeptId=" + Id;
46 46
                 }
47
-                if (User.F_RoleCode == "GLY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY"|| User.F_RoleCode == "MTDD")
47
+                if (User.F_RoleCode == "GLY" || User.F_RoleCode == "YSZY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY"|| User.F_RoleCode == "MTDD")
48 48
                 {
49 49
                 }
50 50
                 else

+ 5 - 5
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/WebChart/InfoNewController.cs

@@ -242,10 +242,10 @@ namespace CallCenterApi.Interface.Controllers.WebChart
242 242
             int recordCount = 0;
243 243
             dt = BLL.PagerBLL.GetListPager(
244 244
                 "T_Bus_WorkOrder a WITH(NOLOCK)"+ value,
245
-                "F_WorkOrderId",
245
+                "a.F_WorkOrderId",
246 246
                 cols,
247 247
                 sql,
248
-                "ORDER BY F_CreateTime DESC",
248
+                "ORDER BY a.F_CreateTime DESC",
249 249
                 pagesize,
250 250
                 pageindex,
251 251
                 true,
@@ -304,7 +304,7 @@ namespace CallCenterApi.Interface.Controllers.WebChart
304 304
             }
305 305
             if (type >0)
306 306
             {
307
-                sql += "and datediff(hh,(select F_CreateTime   from T_Bus_AssignedInfo  where F_Id = V.F_AssignedId )  ,v.F_CreateTime)> 4";
307
+                sql += "and datediff(hh,(select F_CreateTime   from T_Bus_AssignedInfo   where F_Id = V.F_AssignedId )  ,v.F_CreateTime)> 4";
308 308
             }
309 309
             sql += "and datediff(MONTH ,a.F_CreateTime ,getdate())=0 ";
310 310
             string value = " INNER JOIN T_Bus_Feedback V on a .F_WorkOrderId =V.F_WorkOrderId and V.F_Type =3";
@@ -312,10 +312,10 @@ namespace CallCenterApi.Interface.Controllers.WebChart
312 312
             int recordCount = 0;
313 313
             dt = BLL.PagerBLL.GetListPager(
314 314
                 "T_Bus_WorkOrder a WITH(NOLOCK)" + value,
315
-                "F_WorkOrderId",
315
+                "a.F_WorkOrderId",
316 316
                 cols,
317 317
                 sql,
318
-                "ORDER BY F_CreateTime DESC",
318
+                "ORDER BY a.F_CreateTime DESC",
319 319
                 pagesize,
320 320
                 pageindex,
321 321
                 true,

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/FunctionsController.cs


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/HotspotGlossaryController.cs


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/LawGuideController.cs


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/NounInterpretationController.cs


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/PolicyController.cs


+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/ProfessorController.cs

@@ -74,8 +74,8 @@ namespace CallCenterApi.Interface.Controllers.Wiki
74 74
 
75 75
             if (isdc > 0)
76 76
             {
77
-                string cols = "(case when a.F_Id <100 then RIGHT ('00'+CONVERT (varchar(10),a.F_Id),3)   else  CONVERT(varchar(10), a.F_Id) end) as 序号,F_HangYe as 所属行业 ,F_DanWei as 专家单位,F_XingMing as 专家姓名,F_KeShi as 科室,zhiwu as 职务,F_ShouJi as 手机号码,F_DianHua as 办公电话,F_FaBuShiJian as 发布日期,F_FaBuRen as 发布人,F_FaBuDanWei as 上报单位,F_BiaoShiBianMa as 标识编码";
78
-                var dtdc = DbHelperSQL.Query(" select " + cols + " from T_Wiki_Professor with(nolock) where 1=1 " + sql).Tables[0];
77
+                string cols = "(case when a.F_Id <100 then RIGHT ('00'+CONVERT (varchar(10),a.F_Id),3)   else  CONVERT(varchar(10), a.F_Id) end) as 序号,F_HangYe as 所属行业 ,F_DanWei as 专家单位,F_XingMing as 专家姓名,F_KeShi as 科室,F_ZhiWu as 职务,F_ShouJi as 手机号码,F_DianHua as 办公电话,F_FaBuShiJian as 发布日期,F_FaBuRen as 发布人,F_FaBuDanWei as 上报单位,F_BiaoShiBianMa as 标识编码";
78
+                var dtdc = DbHelperSQL.Query(" select " + cols + " from T_Wiki_Professor a with(nolock) where 1=1 " + sql).Tables[0];
79 79
                 var msg = new NPOIHelper().ExportToExcel("政策专家", dtdc);
80 80
                 if (msg == "")
81 81
                 {

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/AddressBookController.cs

@@ -46,7 +46,7 @@ namespace CallCenterApi.Interface.Controllers.customer
46 46
             {
47 47
                 pagesize = Convert.ToInt32(strpagesize);
48 48
             }
49
-            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY"|| User.F_RoleCode == "MTDD")
49
+            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY"|| User.F_RoleCode == "MTDD" || User.F_RoleCode == "YSZY")
50 50
             {
51 51
             }
52 52
             else

+ 4 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

@@ -363,7 +363,7 @@ namespace CallCenterApi.Interface.Controllers.report
363 363
             }
364 364
             return Success("成功", obj);
365 365
         }
366
-        public ActionResult GetUserAccountAssessment(DateTime? start, DateTime? end, bool isExport = false,string source="")
366
+        public ActionResult GetUserAccountAssessment(DateTime? start, DateTime? end, bool isExport = false,string source="",string  name="")
367 367
         {
368 368
             StringBuilder sb1 = new StringBuilder();
369 369
             StringBuilder sb2 = new StringBuilder();
@@ -380,6 +380,8 @@ namespace CallCenterApi.Interface.Controllers.report
380 380
             paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd HH:mm:ss"));
381 381
             paras.Add("@edate", end.Value.ToString("yyyy-MM-dd HH:mm:ss"));
382 382
             paras.Add("@source", source);
383
+            paras.Add("@name", name);
384
+            
383 385
             var obj = DbHelperSQL.RunProcedure("P_UserAssessmentReport_1", paras, "UserAssessmentReport");
384 386
             if (isExport)
385 387
             {
@@ -742,7 +744,7 @@ namespace CallCenterApi.Interface.Controllers.report
742 744
             paras.Add("@sdate", starttime);
743 745
             paras.Add("@edate", endtime);
744 746
             var obj1 = DbHelperSQL.RunProcedure("P_DBReportform", paras, "DBReportform").Tables[0];
745
-            string sqlarea = "  select COUNT(DISTINCT A .F_WorkOrderId) from T_Bus_RemindRecord A INNER JOIN  T_Bus_WorkOrder V ON V.F_WorkOrderId = A.F_WorkOrderId AND A .F_Type = 1 AND(Supervisor = '' OR Supervisor IS NULL)   AND V.F_IsDelete = 0  ";
747
+            string sqlarea = "  select COUNT(1) from T_Bus_WorkOrder where F_WorkOrderID in(select F_WorkOrderID from T_Bus_RemindRecord where F_Type=1 and F_IsDelete=0 and (F_IsExamine !='1' or F_IsExamine is null) and F_State =0) and F_WorkState  !='9'";
746 748
             DataTable dttype = DbHelperSQL.Query(sqlarea).Tables[0];
747 749
             var obj = new
748 750
             {

+ 24 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/YSReportController.cs

@@ -0,0 +1,24 @@
1
+using CallCenter.Utility;
2
+using CallCenter.Utility.Linq;
3
+
4
+using CallCenter.Utility.Time;
5
+using CallCenterApi.Common;
6
+using CallCenterApi.DB;
7
+using CallCenterApi.Interface.Controllers.Base;
8
+using CallCenterApi.Interface.Models.Dto;
9
+using CallCenterApi.Model;
10
+using System;
11
+using System.Collections.Generic;
12
+using System.Data;
13
+using System.Linq;
14
+using System.Text;
15
+using System.Web;
16
+using System.Web.Mvc;
17
+namespace CallCenterApi.Interface.Controllers.report
18
+{
19
+    [Authority]
20
+    public class YSReportController : BaseController
21
+    {
22
+       
23
+    }
24
+}

Diferenças do arquivo suprimidas por serem muito extensas
+ 175 - 126
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs


+ 3 - 3
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -33,7 +33,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
33 33
         //[Authority]
34 34
         public ActionResult AddWorkOrderNew()
35 35
         {
36
-            if (User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXBZ"
36
+            if (User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "YSZY" || User.F_RoleCode == "ZXBZ"
37 37
                 || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY"
38 38
                 || User.F_RoleCode == "ZJZY" || User.F_RoleCode == "DBZY"
39 39
                 || User.F_RoleCode == "11" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG"
@@ -356,7 +356,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
356 356
         //[Authority]
357 357
         public ActionResult EditWorkOrderNew()
358 358
         {
359
-            if (User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXBZ" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "MTDD")
359
+            if (User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "YSZY" || User.F_RoleCode == "ZXBZ" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "MTDD")
360 360
             {
361 361
                 string workorderid = RequestString.GetFormString("workorderid");
362 362
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
@@ -521,7 +521,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
521 521
         //[Authority]
522 522
         public ActionResult AssignWorkOrderNewNew()
523 523
         {
524
-            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "DBZY" || User.F_RoleCode == "MTDD")
524
+            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "YSZY" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "DBZY" || User.F_RoleCode == "MTDD")
525 525
             {
526 526
                 string workorderid = RequestString.GetFormString("workorderid");
527 527
                 int state = RequestString.GetInt("state", 0);

+ 18 - 18
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -243,7 +243,7 @@ namespace CallCenterApi.Interface.Models.Common
243 243
             {
244 244
                 case "0":
245 245
                     //调度专员 质检专员可以进行编辑 zhengbingbing 20191017
246
-                    if (code == "ZXLD" || code == "ZJZY")
246
+                    if (code == "ZXLD" || code == "YSZY" || code == "ZJZY")
247 247
                         buttons.Add(edit());
248 248
 
249 249
                     //中心话务员 坐席班长 管理员
@@ -263,7 +263,7 @@ namespace CallCenterApi.Interface.Models.Common
263 263
                     if (code == "ZJZY")
264 264
                         buttons.Add(edit());
265 265
                     //调度专员 中心领导管理员 管理员
266
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
266
+                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
267 267
                     {
268 268
 
269 269
                         buttons.Add(edit());
@@ -273,7 +273,7 @@ namespace CallCenterApi.Interface.Models.Common
273 273
                         // buttons.Add(turnsee());
274 274
                         buttons.Add(instruct());
275 275
                     }
276
-                    if (code == "ZXLD")
276
+                    if (code == "ZXLD" || code == "YSZY")
277 277
                         buttons.Add(turnsee());
278 278
                     if (code == "ZXHWY")
279 279
                     {//待审核交办时可撤单
@@ -288,7 +288,7 @@ namespace CallCenterApi.Interface.Models.Common
288 288
                         //  buttons.Add(reback());
289 289
                     }
290 290
                     //调度专员 中心领导管理员 管理员
291
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
291
+                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
292 292
                     {
293 293
                         buttons.Add(takeback());
294 294
                         buttons.Add(edit());
@@ -296,7 +296,7 @@ namespace CallCenterApi.Interface.Models.Common
296 296
                     break;
297 297
                 case "3":
298 298
                     //调度专员 中心领导管理员 管理员
299
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
299
+                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
300 300
                     {
301 301
                         buttons.Add(auditreback()); buttons.Add(turnsee());
302 302
                     }
@@ -324,10 +324,10 @@ namespace CallCenterApi.Interface.Models.Common
324 324
                         }
325 325
                     }
326 326
                     //调度专员 中心领导管理员 管理员
327
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
327
+                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
328 328
                     {
329 329
                         buttons.Add(takeback());
330
-                        buttons.Add(edit());
330
+                       // buttons.Add(edit());
331 331
                         // buttons.Add(turnsee()); //buttons.Add(oversee());
332 332
                         //   buttons.Add(supervision());
333 333
                     }
@@ -352,7 +352,7 @@ namespace CallCenterApi.Interface.Models.Common
352 352
                     break;
353 353
                 case "5":
354 354
                     //调度专员 中心领导管理员 管理员
355
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
355
+                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
356 356
                     {
357 357
                         buttons.Add(edit());
358 358
                         buttons.Add(auditdelay());
@@ -391,7 +391,7 @@ namespace CallCenterApi.Interface.Models.Common
391 391
                         }
392 392
                         else if (isproresult == 3)
393 393
                         {
394
-                            if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "DDZG" || code == "MTDD")
394
+                            if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "YSZY" || code == "DDZG" || code == "MTDD")
395 395
                             {
396 396
                                 buttons.Add(visit());
397 397
                                 //  buttons.Add(modify());
@@ -414,7 +414,7 @@ namespace CallCenterApi.Interface.Models.Common
414 414
                     }
415 415
                     else
416 416
                     {
417
-                        if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "DDZG" || code == "MTDD")
417
+                        if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "YSZY" || code == "DDZG" || code == "MTDD")
418 418
                         {
419 419
                             buttons.Add(visit());
420 420
                             buttons.Add(subback());
@@ -449,7 +449,7 @@ namespace CallCenterApi.Interface.Models.Common
449 449
 
450 450
                     }
451 451
                     //调度专员 中心领导管理员 管理员
452
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
452
+                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
453 453
                     {
454 454
                         buttons.Add(edit());
455 455
                         buttons.Add(takeback());
@@ -477,12 +477,12 @@ namespace CallCenterApi.Interface.Models.Common
477 477
                     break;
478 478
                 case "9":
479 479
                     //调度专员 中心领导管理员 管理员
480
-                    if ((code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD" || code == "ZXHWY") && iszb == "1")
480
+                    if ((code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD" || code == "ZXHWY") && iszb == "1")
481 481
                     {
482 482
 
483 483
                         // buttons.Add(back());
484 484
                     }
485
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD" || code == "ZXHWY")
485
+                    if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD" || code == "ZXHWY")
486 486
                     {
487 487
                         buttons.Add(modify());
488 488
                     }
@@ -499,7 +499,7 @@ namespace CallCenterApi.Interface.Models.Common
499 499
                     break;
500 500
                 case "11":
501 501
                     //调度专员 中心领导管理员 管理员
502
-                    if (code == "ZXLD" || code == "MTDD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
502
+                    if (code == "ZXLD" || code == "YSZY" || code == "MTDD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
503 503
                     {
504 504
                         buttons.Add(reload()); buttons.Add(reject());
505 505
                     }
@@ -517,7 +517,7 @@ namespace CallCenterApi.Interface.Models.Common
517 517
                         buttons.Add(subreload());
518 518
                         buttons.Add(end());
519 519
                     }
520
-                    else if (code == "ZXLD" || code == "MTDD")
520
+                    else if (code == "ZXLD" || code == "YSZY" || code == "MTDD")
521 521
                     {
522 522
                         buttons.Add(subreload());
523 523
                     }
@@ -525,7 +525,7 @@ namespace CallCenterApi.Interface.Models.Common
525 525
             }
526 526
             //buttons.Add(export());
527 527
             //调度专员 中心领导管理员 管理员
528
-            if (state != "0" && state != "9" && (code == "ZXLD" || code == "MTDD"|| code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"))
528
+            if (state != "0" && state != "9" && (code == "ZXLD" || code == "YSZY" || code == "MTDD"|| code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG"))
529 529
             {
530 530
                 buttons.Add(forceend());
531 531
             }
@@ -559,12 +559,12 @@ namespace CallCenterApi.Interface.Models.Common
559 559
                     }
560 560
                     break;
561 561
                 case "1":
562
-                    if (rolecode == "ZXLD" || rolecode == "ZXLDGLY" || rolecode == "ZXLDGLYGLY" || rolecode == "GLY"|| rolecode == "MTDD")
562
+                    if (rolecode == "ZXLD" || rolecode == "YSZY" || rolecode == "ZXLDGLY" || rolecode == "ZXLDGLYGLY" || rolecode == "GLY"|| rolecode == "MTDD")
563 563
                         buttons.Add(zsk_audit());
564 564
                     break;
565 565
                 case "2":
566 566
                 case "5":
567
-                    if (rolecode == "ZXHWY" || rolecode == "ZXBZ" || rolecode == "ZXLD" || rolecode == "DBZY" || rolecode == "ZJZY" || rolecode == "GLY")
567
+                    if (rolecode == "ZXHWY" || rolecode == "ZXBZ" || rolecode == "ZXLD" || rolecode == "YSZY" || rolecode == "DBZY" || rolecode == "ZJZY" || rolecode == "GLY")
568 568
                     {
569 569
                         //解决 未解决
570 570
                         buttons.Add(zsk_solved()); buttons.Add(zsk_unsolved());

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

@@ -703,7 +703,7 @@ namespace CallCenterApi.Model
703 703
         /// <summary>
704 704
         /// 0未审核1已审核2回访审核
705 705
         /// </summary>
706
-        public int F_IsExamine { set; get; }
706
+        public int? F_IsExamine { set; get; }
707 707
         /// <summary>
708 708
         /// 交办审核时间
709 709
         /// </summary>