知识库，督办退回

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/WebChart/InfoNewController.cs

@@ -51,6 +51,8 @@ namespace CallCenterApi.Interface.Controllers.WebChart
             string latitude = RequestString.GetQueryString("latitude");
             string longitude = RequestString.GetQueryString("longitude");
             string strpageindex = RequestString.GetQueryString("page");
+
+            int Satisfie = RequestString.GetInt("Satisfie", 0);
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
@@ -101,6 +103,14 @@ namespace CallCenterApi.Interface.Controllers.WebChart
                 }
 
             }
+            if (Satisfie==1)
+            {
+                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)";
+            }
+            else if (Satisfie == 2)
+            {
+                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)";
+            }
             if (deptid > 0)
             {
                 if (DWDeptid.ContainsKey(deptid))

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

@@ -2408,6 +2408,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
 
                     }
+                    
                     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)";
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "DDZG")
                     {
@@ -6877,8 +6878,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int business = RequestString.GetInt("business", 0);
             int Supervisor = RequestString.GetInt("Supervisor", 0);
             int isExamine = RequestString.GetInt("isExamine", 0);
-            
-              string result = HttpUtility.UrlDecode(RequestString.GetQueryString("result"));//办理结果
+          
+            string result = HttpUtility.UrlDecode(RequestString.GetQueryString("result"));//办理结果
 
             string dealstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstarttime"));
             string dealstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstrendtime"));
@@ -6997,6 +6998,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (strstate.Trim() == ((int)EnumWorkState.neworder).ToString())
                             sql += " and F_WorkState in (" + (int)EnumWorkState.neworder + "," + (int)EnumWorkState.audit + ") ";
+                       
                         else
                             sql += " and F_WorkState = '" + strstate.Trim() + "' ";
                     }
@@ -7269,7 +7271,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var configly = configBll.GetModelList(" F_ParamCode='PlayLeaveVoice' ").FirstOrDefault();
             var config = configBll.GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
             var configcs = configBll.GetModelList(" F_ParamCode='CSYJ' ").FirstOrDefault();
-            var reminds = remindBLL.GetModelList(" F_IsDelete=0 and F_Type =1").ToList();
+           // var reminds = remindBLL.GetModelList(" F_IsDelete=0 and F_Type =1").ToList();
             foreach (DataRow dr in dt.Rows)
             {
                 //获取最新交办信息
@@ -7386,16 +7388,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 List<ButtonGroup.button> btns = new List<ButtonGroup.button>();
                 //0督办-待办，1督办-办理中，2督办-超期未完结，3督办-已退回，4督办-已完结
                 btns.Clear();
-                var nrem = reminds.Where(r => r.F_WorkOrderId == dr["F_WorkOrderId"].ToString()).OrderByDescending(o => o.F_Id).FirstOrDefault();
+               
 
                 if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "EJWLDW")
                 {
                     btns = ButtonGroup.GetButtons(dr["F_WorkState"].ToString(), User.F_RoleCode.ToUpper(), dr["F_IsResult"].ToString(), iszbdw, ispd);
                     #region 判断是否存在待督办
-                    var recount = reminds.Where(r => r.F_WorkOrderId == dr["F_WorkOrderId"].ToString()).Count();
+                  
                     var butt = btns.Find(c => c.key == ButtonGroup.turnsee().key);
-                    if (recount > 0 && butt != null)
+                    if ( butt != null)
                         btns.Remove(butt);
+                    var delay = btns.Find(c => c.key == ButtonGroup.delay().key);
+                    if (delay != null)
+                        btns.Remove(delay);
                     #endregion
                 }
                 else
@@ -7418,8 +7423,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                             break;
                         case "1"://督办-办理中 操作为：查看工单、短信催办
+                           
+                           
                             if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "DBGLY" || User.F_RoleCode == "GLY")
-                                btns.Add(ButtonGroup.forceend());
+                            {
+                                if (state ==3)
+                                {
+                                    btns.Add(ButtonGroup.auditreback()); 
+                                }
+                                else
+                                {
+                                    btns.Add(ButtonGroup.forceend());
+                                }
+                            }
+                                
                             break;
                         case "2"://督办-超期未完结 操作为：查看工单、短信催办
                                  //if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "GLY")
@@ -13269,7 +13286,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
 
 
-            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "MTDD")
+            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")
             {
                 string workorderid = RequestString.GetFormString("workorderid");
                 int state = RequestString.GetInt("state", 0);
@@ -13280,9 +13297,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
                 Model.T_Bus_Feedback modelT_Bus_Feedback = new BLL.T_Bus_Feedback().GetModel(rebackid);
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
-
-
                 Model.T_Bus_AssignedInfo_Next modelAssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
+                Model.T_Bus_RemindRecord modelT_Bus_RemindRecord = new BLL.T_Bus_RemindRecord().GetNewModelByWorkOrderID(workorderid);
+
 
                 if (modelT_Bus_WorkOrder != null && modelT_Bus_Feedback != null && modelT_Bus_AssignedInfo != null)
                 {
@@ -13373,6 +13390,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 modelT_Bus_AssignedInfo.F_SureUser = "";
                                 modelT_Bus_AssignedInfo.F_SureTime = null;
                                 assignBLL.Update(modelT_Bus_AssignedInfo);
+
+                                if (modelT_Bus_RemindRecord!=null )
+                                {
+                                    if (modelT_Bus_RemindRecord.F_State ==1)
+                                    {
+                                        modelT_Bus_RemindRecord.F_State = 0;
+                                        remindBLL.Update(modelT_Bus_RemindRecord);
+                                    }
+                                }
                                 #endregion
 
                                 strmsg = "拒绝";