Browse Source

知识库,督办退回

duhongyu 4 years ago
parent
commit
dc712f21db

+ 10 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/WebChart/InfoNewController.cs

51
             string latitude = RequestString.GetQueryString("latitude");
51
             string latitude = RequestString.GetQueryString("latitude");
52
             string longitude = RequestString.GetQueryString("longitude");
52
             string longitude = RequestString.GetQueryString("longitude");
53
             string strpageindex = RequestString.GetQueryString("page");
53
             string strpageindex = RequestString.GetQueryString("page");
54
+
55
+            int Satisfie = RequestString.GetInt("Satisfie", 0);
54
             int pageindex = 1;
56
             int pageindex = 1;
55
             string strpagesize = RequestString.GetQueryString("pagesize");
57
             string strpagesize = RequestString.GetQueryString("pagesize");
56
             int pagesize = 10;
58
             int pagesize = 10;
101
                 }
103
                 }
102
 
104
 
103
             }
105
             }
106
+            if (Satisfie==1)
107
+            {
108
+                sql += "a.F_WorkOrderId in (select  b.F_WorkOrderID from T_Bus_VisitResult b  WITH(NOLOCK) inner join T_Bus_VisitResult c on c.F_Id = b.F_Id and c .F_Id = (select max(t1.F_Id) from T_Bus_VisitResult t1 where t1.F_WorkOrderId = b.F_WorkOrderId)  where b .F_IsSatisfie = 0 and datediff(MONTH ,b.F_CreateTime ,getdate())=0)";
109
+            }
110
+            else if (Satisfie == 2)
111
+            {
112
+                sql += "a.F_WorkOrderId in (select  b.F_WorkOrderID from T_Bus_VisitResult b  WITH(NOLOCK) inner join T_Bus_VisitResult a on a.F_Id = b.F_Id and a .F_Id = (select max(t1.F_Id) from T_Bus_VisitResult t1 where t1.F_WorkOrderId = b.F_WorkOrderId)  where b .F_IsSatisfie = 0 and datediff(MONTH ,b.F_CreateTime ,getdate())=1)";
113
+            }
104
             if (deptid > 0)
114
             if (deptid > 0)
105
             {
115
             {
106
                 if (DWDeptid.ContainsKey(deptid))
116
                 if (DWDeptid.ContainsKey(deptid))

File diff suppressed because it is too large
+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/FunctionsController.cs


File diff suppressed because it is too large
+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/HotspotGlossaryController.cs


File diff suppressed because it is too large
+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/LawGuideController.cs


File diff suppressed because it is too large
+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/NounInterpretationController.cs


File diff suppressed because it is too large
+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/PolicyController.cs


+ 36 - 10
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

2408
 
2408
 
2409
 
2409
 
2410
                     }
2410
                     }
2411
+                    
2411
                     sql += "and F_WorkOrderID  not in (select F_WorkOrderID from T_Bus_RemindRecord WITH(NOLOCK) where F_Type=1 and F_IsDelete=0 and F_State !=2)";
2412
                     sql += "and F_WorkOrderID  not in (select F_WorkOrderID from T_Bus_RemindRecord WITH(NOLOCK) where F_Type=1 and F_IsDelete=0 and F_State !=2)";
2412
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "DDZG")
2413
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "DDZG")
2413
                     {
2414
                     {
6877
             int business = RequestString.GetInt("business", 0);
6878
             int business = RequestString.GetInt("business", 0);
6878
             int Supervisor = RequestString.GetInt("Supervisor", 0);
6879
             int Supervisor = RequestString.GetInt("Supervisor", 0);
6879
             int isExamine = RequestString.GetInt("isExamine", 0);
6880
             int isExamine = RequestString.GetInt("isExamine", 0);
6880
-            
6881
-              string result = HttpUtility.UrlDecode(RequestString.GetQueryString("result"));//办理结果
6881
+          
6882
+            string result = HttpUtility.UrlDecode(RequestString.GetQueryString("result"));//办理结果
6882
 
6883
 
6883
             string dealstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstarttime"));
6884
             string dealstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstarttime"));
6884
             string dealstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstrendtime"));
6885
             string dealstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstrendtime"));
6997
                     {
6998
                     {
6998
                         if (strstate.Trim() == ((int)EnumWorkState.neworder).ToString())
6999
                         if (strstate.Trim() == ((int)EnumWorkState.neworder).ToString())
6999
                             sql += " and F_WorkState in (" + (int)EnumWorkState.neworder + "," + (int)EnumWorkState.audit + ") ";
7000
                             sql += " and F_WorkState in (" + (int)EnumWorkState.neworder + "," + (int)EnumWorkState.audit + ") ";
7001
+                       
7000
                         else
7002
                         else
7001
                             sql += " and F_WorkState = '" + strstate.Trim() + "' ";
7003
                             sql += " and F_WorkState = '" + strstate.Trim() + "' ";
7002
                     }
7004
                     }
7269
             var configly = configBll.GetModelList(" F_ParamCode='PlayLeaveVoice' ").FirstOrDefault();
7271
             var configly = configBll.GetModelList(" F_ParamCode='PlayLeaveVoice' ").FirstOrDefault();
7270
             var config = configBll.GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
7272
             var config = configBll.GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
7271
             var configcs = configBll.GetModelList(" F_ParamCode='CSYJ' ").FirstOrDefault();
7273
             var configcs = configBll.GetModelList(" F_ParamCode='CSYJ' ").FirstOrDefault();
7272
-            var reminds = remindBLL.GetModelList(" F_IsDelete=0 and F_Type =1").ToList();
7274
+           // var reminds = remindBLL.GetModelList(" F_IsDelete=0 and F_Type =1").ToList();
7273
             foreach (DataRow dr in dt.Rows)
7275
             foreach (DataRow dr in dt.Rows)
7274
             {
7276
             {
7275
                 //获取最新交办信息
7277
                 //获取最新交办信息
7386
                 List<ButtonGroup.button> btns = new List<ButtonGroup.button>();
7388
                 List<ButtonGroup.button> btns = new List<ButtonGroup.button>();
7387
                 //0督办-待办,1督办-办理中,2督办-超期未完结,3督办-已退回,4督办-已完结
7389
                 //0督办-待办,1督办-办理中,2督办-超期未完结,3督办-已退回,4督办-已完结
7388
                 btns.Clear();
7390
                 btns.Clear();
7389
-                var nrem = reminds.Where(r => r.F_WorkOrderId == dr["F_WorkOrderId"].ToString()).OrderByDescending(o => o.F_Id).FirstOrDefault();
7391
+               
7390
 
7392
 
7391
                 if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "EJWLDW")
7393
                 if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "EJWLDW")
7392
                 {
7394
                 {
7393
                     btns = ButtonGroup.GetButtons(dr["F_WorkState"].ToString(), User.F_RoleCode.ToUpper(), dr["F_IsResult"].ToString(), iszbdw, ispd);
7395
                     btns = ButtonGroup.GetButtons(dr["F_WorkState"].ToString(), User.F_RoleCode.ToUpper(), dr["F_IsResult"].ToString(), iszbdw, ispd);
7394
                     #region 判断是否存在待督办
7396
                     #region 判断是否存在待督办
7395
-                    var recount = reminds.Where(r => r.F_WorkOrderId == dr["F_WorkOrderId"].ToString()).Count();
7397
+                  
7396
                     var butt = btns.Find(c => c.key == ButtonGroup.turnsee().key);
7398
                     var butt = btns.Find(c => c.key == ButtonGroup.turnsee().key);
7397
-                    if (recount > 0 && butt != null)
7399
+                    if ( butt != null)
7398
                         btns.Remove(butt);
7400
                         btns.Remove(butt);
7401
+                    var delay = btns.Find(c => c.key == ButtonGroup.delay().key);
7402
+                    if (delay != null)
7403
+                        btns.Remove(delay);
7399
                     #endregion
7404
                     #endregion
7400
                 }
7405
                 }
7401
                 else
7406
                 else
7418
 
7423
 
7419
                             break;
7424
                             break;
7420
                         case "1"://督办-办理中 操作为:查看工单、短信催办
7425
                         case "1"://督办-办理中 操作为:查看工单、短信催办
7426
+                           
7427
+                           
7421
                             if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "DBGLY" || User.F_RoleCode == "GLY")
7428
                             if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "DBGLY" || User.F_RoleCode == "GLY")
7422
-                                btns.Add(ButtonGroup.forceend());
7429
+                            {
7430
+                                if (state ==3)
7431
+                                {
7432
+                                    btns.Add(ButtonGroup.auditreback()); 
7433
+                                }
7434
+                                else
7435
+                                {
7436
+                                    btns.Add(ButtonGroup.forceend());
7437
+                                }
7438
+                            }
7439
+                                
7423
                             break;
7440
                             break;
7424
                         case "2"://督办-超期未完结 操作为:查看工单、短信催办
7441
                         case "2"://督办-超期未完结 操作为:查看工单、短信催办
7425
                                  //if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "GLY")
7442
                                  //if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "GLY")
13269
         {
13286
         {
13270
 
13287
 
13271
 
13288
 
13272
-            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "MTDD")
13289
+            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DBZY" || User.F_RoleCode == "DBGLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "MTDD")
13273
             {
13290
             {
13274
                 string workorderid = RequestString.GetFormString("workorderid");
13291
                 string workorderid = RequestString.GetFormString("workorderid");
13275
                 int state = RequestString.GetInt("state", 0);
13292
                 int state = RequestString.GetInt("state", 0);
13280
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
13297
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
13281
                 Model.T_Bus_Feedback modelT_Bus_Feedback = new BLL.T_Bus_Feedback().GetModel(rebackid);
13298
                 Model.T_Bus_Feedback modelT_Bus_Feedback = new BLL.T_Bus_Feedback().GetModel(rebackid);
13282
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
13299
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
13283
-
13284
-
13285
                 Model.T_Bus_AssignedInfo_Next modelAssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
13300
                 Model.T_Bus_AssignedInfo_Next modelAssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
13301
+                Model.T_Bus_RemindRecord modelT_Bus_RemindRecord = new BLL.T_Bus_RemindRecord().GetNewModelByWorkOrderID(workorderid);
13302
+
13286
 
13303
 
13287
                 if (modelT_Bus_WorkOrder != null && modelT_Bus_Feedback != null && modelT_Bus_AssignedInfo != null)
13304
                 if (modelT_Bus_WorkOrder != null && modelT_Bus_Feedback != null && modelT_Bus_AssignedInfo != null)
13288
                 {
13305
                 {
13373
                                 modelT_Bus_AssignedInfo.F_SureUser = "";
13390
                                 modelT_Bus_AssignedInfo.F_SureUser = "";
13374
                                 modelT_Bus_AssignedInfo.F_SureTime = null;
13391
                                 modelT_Bus_AssignedInfo.F_SureTime = null;
13375
                                 assignBLL.Update(modelT_Bus_AssignedInfo);
13392
                                 assignBLL.Update(modelT_Bus_AssignedInfo);
13393
+
13394
+                                if (modelT_Bus_RemindRecord!=null )
13395
+                                {
13396
+                                    if (modelT_Bus_RemindRecord.F_State ==1)
13397
+                                    {
13398
+                                        modelT_Bus_RemindRecord.F_State = 0;
13399
+                                        remindBLL.Update(modelT_Bus_RemindRecord);
13400
+                                    }
13401
+                                }
13376
                                 #endregion
13402
                                 #endregion
13377
 
13403
 
13378
                                 strmsg = "拒绝";
13404
                                 strmsg = "拒绝";