11

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Assessment/DataAssessmentController.cs

@@ -432,6 +432,8 @@ namespace CallCenterApi.Interface.Controllers.Assessment
                 return Error("导出失败");
             }
         }
+
+     
         #endregion
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

@@ -74,7 +74,7 @@ namespace CallCenterApi.Interface.Controllers
                 string rjson = RedisHelper.StringGet("ztree_38new")?.ToString() ?? "";
                 if (!string.IsNullOrEmpty(rjson))
                 {
-                    return Success("加载成功", rjson.ToObject<DataTable>());
+                    return Success("加载成功", rjson);
                 }
             }
            
@@ -88,7 +88,7 @@ namespace CallCenterApi.Interface.Controllers
             List<TreeModelNew> modelList = BindTreeNew(dt, "0", tab2);
             if (pid == "38")
             {
-                RedisHelper.StringSet("ztree_38", modelList.ToJson());
+                RedisHelper.StringSet("ztree_38new", modelList.ToJson());
             }
             if (modelList.Count > 0)
             {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/DataAnalysisController.cs

@@ -474,6 +474,27 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             return Success("成功", obj);
         }
+        ///// <summary>
+        ///// 获取营商分析报表 工单满意度统计
+        ///// </summary>
+        ///// <param name="date"></param>
+        ///// <param name="isdc"></param>
+        ///// <returns></returns>
+        //public ActionResult GetKeyReport(string date, int isdc = 0)
+        //{
+        //    DateTime dttime = DateTime.Now;
+        //    if (!string.IsNullOrEmpty(date))
+        //    {
+        //        if (!DateTime.TryParse(date, out dttime))
+        //        {
+        //            dttime = DateTime.Now;
+        //        }
+        //    }
+        //    Dictionary<string, string> paras = new Dictionary<string, string>();
+        //    paras.Add("@date", dttime.ToString("yyyy-MM-dd"));
+        //    var obj = DbHelperSQL.RunProcedure("P_KeyReport", paras, "KeyReport");
+        //    return Success("成功", obj);
+        //}
 
     }
 }

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

@@ -1034,7 +1034,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += "and F_ToBereply=" + tobereply;
                             sql += " and F_WorkState = '" + strstate.Trim() + "' ";
                         }
-
+                        if (strstate.Trim() == ((int)EnumWorkState.dealed).ToString())
+                        {
+                            sql += "and F_WorkOrderID not in (select F_WorkOrderID from T_Bus_RemindRecord where F_Type=1 and F_IsDelete=0and F_Content != '推诿工单')";
+                        }
                         //sql += " and F_WorkState = '" + strstate.Trim() + "' ";
                     }
                     else
@@ -1587,6 +1590,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     order = "order by a.F_Level desc, a.F_CreateTime desc";
                     sql += " and (F_IsRelease !='" + 3 + "' or " +
                         "F_IsRelease is null) ";
+                    sql += "and F_WorkOrderID not in (select F_WorkOrderID from T_Bus_RemindRecord where F_Type=1 and F_IsDelete=0and F_Content != '推诿工单')";
                     if (strstate.Trim() != "" && strstate != "undefined")
                     {
                         if (strstate.Trim() == ((int)EnumWorkState.neworder).ToString())
@@ -1845,6 +1849,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += " and (F_IsRelease !='" + 3 + "' or " +
                        "F_IsRelease is null) ";
                     sql += " and F_WorkState=" + (int)EnumWorkState.submit;
+                    sql += "and F_WorkOrderID not in (select F_WorkOrderID from T_Bus_RemindRecord where F_Type=1 and F_IsDelete=0and F_Content != '推诿工单')";
                     sql += "and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback b WITH(NOLOCK) where F_State = 1 and F_IsDelete = 0 and F_Type = 3 and F_IsAudit = 1 and F_Id  in (select  MAX(F_Id) from T_Bus_Feedback WITH(NOLOCK) where F_WorkOrderId in (select F_WorkOrderId from T_Bus_Feedback WITH(NOLOCK) where F_WorkOrderId = b.F_WorkOrderId  group by F_WorkOrderId  ) ) ) ";
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "MTDD")
                     {
@@ -6586,6 +6591,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 case "0"://督办-待办
                     sql += "  and F_WorkOrderID in(" + sqlsup + " and F_State =0 )";
+                    sql += "and F_WorkState  !='9'";
                     break;
                 case "1"://督办-办理中
                     sql += "  and F_WorkOrderID in(" + sqlsup + " and F_State =1 ) and F_WorkState !='9' ";
@@ -10232,7 +10238,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //    modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.submit;// 1;//提交领导
                             //}
                             #endregion
-                            modelT_Bus_WorkOrder.F_CreateUser = User.F_UserCode;
+                           // modelT_Bus_WorkOrder.F_CreateUser = User.F_UserCode;
                             modelT_Bus_WorkOrder.F_IsEnabled = 1;
                             modelT_Bus_WorkOrder.F_EnableTime = DateTime.Now;
                             modelT_Bus_WorkOrder.F_IsDelete = 0;