修改新加工单处理效率报表（列表，导出）

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

@@ -12,8 +12,11 @@ namespace CallCenterApi.Interface.Controllers.report
     //[Authority]
     public class BusinessController : BaseController
     {
+        BLL.T_Wo_WorkOrderItem bllWoItem = new BLL.T_Wo_WorkOrderItem();
+
+        #region 工单处理效率
         /// <summary>
-        /// 工单流程执行效率分析
+        /// 工单处理效率
         /// </summary>
         /// <returns></returns>
         public ActionResult GetWorkEfficiency()
@@ -21,95 +24,174 @@ namespace CallCenterApi.Interface.Controllers.report
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
-                string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
+                DataTable dt = new DataTable();
+                string stime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
+                string endtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
+                string dpt = HttpUtility.UrlDecode(RequestString.GetQueryString("dpt"));
+                
+                dt = getData(stime, endtime, dpt);
+                res = Success("成功", dt);
+            }
+            return res;
+        }
 
-                string sql = " IsDel=0 and State=2 ";
+        /// <summary>
+        /// 工单处理效率 - 方法
+        /// </summary>
+        /// <param name="strstarttime"></param>
+        /// <param name="strendtime"></param>
+        /// <param name="dpt"></param>
+        /// <returns></returns>
+        private DataTable getData(string stime, string endtime, string dpt)
+        {
+            DataTable dt = new DataTable();
+            string sql = " IsDel=0 and State=1 ";
 
-                if (strstarttime != null && strstarttime.Trim() != "")
-                {
-                    sql += " and CreateTime>='" + strstarttime + " 00:00:00' ";
-                }
-                if (strendtime != null && strendtime.Trim() != "")
+            if (stime != null && stime.Trim() != "")
+            {
+                sql += " and CreateTime>='" + stime + " 00:00:00' ";
+            }
+            if (endtime != null && endtime.Trim() != "")
+            {
+                sql += " and CreateTime<='" + endtime + " 23:59:59' ";
+            }
+
+            if (string.IsNullOrEmpty(stime) && string.IsNullOrEmpty(endtime))
+            {
+                string strDate = DateTime.Now.ToString("yyyy-MM");
+                sql += " and CONVERT(varchar(7),CreateTime, 23)='" + strDate + "'";
+            }
+            //部门搜索
+            if (dpt != null && dpt.Trim() != "")
+            {
+                sql += $" AND CreateUser IN (SELECT F_UserCode FROM dbo.T_Sys_UserAccount WHERE F_DeptId = {dpt}) ";
+            }
+
+            var list = new BLL.T_Wo_WorkOrder().GetModelList(sql);
+            var datelist = list.Select(p => p.CreateTime.Value.ToString("yyyy-MM-dd")).Distinct();
+
+            dt.Columns.Add("Date", typeof(string));
+            dt.Columns.Add("Count", typeof(int));
+            dt.Columns.Add("TotalTime", typeof(decimal));
+            dt.Columns.Add("AvgTime", typeof(decimal));
+            //dt.Columns.Add("ZPTotalTime", typeof(decimal));
+            //dt.Columns.Add("ZPAvgTime", typeof(decimal));
+            //dt.Columns.Add("JDTotalTime", typeof(decimal));
+            //dt.Columns.Add("JDAvgTime", typeof(decimal));
+            //dt.Columns.Add("CLTotalTime", typeof(decimal));
+            //dt.Columns.Add("CLAvgTime", typeof(decimal));
+            //处理列表(已处理)
+            //var listItem = bllWoItem.GetList(" 1=1 AND Type = 1 ");
+            foreach (var date in datelist)
+            {
+                var everylist = list.Where(p => p.CreateTime.Value.ToString("yyyy-MM-dd") == date);
+
+                string ids = string.Empty;
+                foreach (var l in everylist.Select(p => p.WorkOrderID))
                 {
-                    sql += " and CreateTime<='" + strendtime + " 23:59:59' ";
+                    if (string.IsNullOrEmpty(ids))
+                    {
+                        ids = l;
+                    }
+                    else
+                    {
+                        ids = ids + "','" + l;
+                    }
+
                 }
 
-                if (string.IsNullOrEmpty(strstarttime) && string.IsNullOrEmpty(strendtime))
+                //var itemlist = new BLL.T_Wo_WorkOrderItem().GetModelList(" IsDel=0 and Type=1 and WorkOrderID in ('" + ids + "')");
+                //var TotalTimelist = everylist.Where(p => p.LastDealTime != null).Select(p => new { totaltime = p.LastDealTime.Value.Subtract(p.CreateTime.Value).TotalHours });
+                var TotalTimelist = everylist.Where(p => p.ReturnBakTime != null).Select(p => new { totaltime = p.ReturnBakTime.Value.Subtract(p.CreateTime.Value).TotalHours });
+
+                //var ZPList = everylist.Where(p => p.AppointTime != null).Select(p => new { totaltime = p.AppointTime.Value.Subtract(p.CreateTime.Value).TotalHours });
+                //var JDList = itemlist.Where(p => p.SureTime != null && p.DealTime != null).Select(p => new { totaltime = p.SureTime.Value.Subtract(p.CreateTime.Value).TotalHours });
+                //var CLList = itemlist.Where(p => p.SureTime != null).Select(p => new { totaltime = p.DealTime.Value.Subtract(p.SureTime.Value).TotalHours });
+                DataRow dr = dt.NewRow();
+                dr["Date"] = date;
+                dr["Count"] = everylist.Count();
+                if (TotalTimelist.Count() > 0)
                 {
-                    string strDate = DateTime.Now.ToString("yyyy-MM");
-                    sql += " and CONVERT(varchar(7),CreateTime, 23)='" + strDate + "'";
+                    dr["TotalTime"] = TotalTimelist.Sum(p => p.totaltime).ToString("f2");
+                    dr["AvgTime"] = TotalTimelist.Average(p => p.totaltime).ToString("f2");
                 }
+                //if (ZPList.Count() > 0)
+                //{
+                //    dr["ZPTotalTime"] = ZPList.Sum(p => p.totaltime).ToString("f2");
+                //    dr["ZPAvgTime"] = ZPList.Average(p => p.totaltime).ToString("f2");
+                //}
+                //if (JDList.Count() > 0)
+                //{
+                //    dr["JDTotalTime"] = JDList.Sum(p => p.totaltime).ToString("f2");
+                //    dr["JDAvgTime"] = JDList.Average(p => p.totaltime).ToString("f2");
+                //}
+                //if (CLList.Count() > 0)
+                //{
+                //    dr["CLTotalTime"] = CLList.Sum(p => p.totaltime).ToString("f2");
+                //    dr["CLAvgTime"] = CLList.Average(p => p.totaltime).ToString("f2");
+                //}
+
+                dt.Rows.Add(dr);
+            }
 
-                var list = new BLL.T_Wo_WorkOrder().GetModelList(sql);
-                var datelist = list.Select(p => p.CreateTime.Value.ToString("yyyy-MM-dd")).Distinct();
-
-                DataTable dt = new DataTable();
-                dt.Columns.Add("Date", typeof(string));
-                dt.Columns.Add("Count", typeof(int));
-                dt.Columns.Add("TotalTime", typeof(decimal));
-                dt.Columns.Add("AvgTime", typeof(decimal));
-                //dt.Columns.Add("ZPTotalTime", typeof(decimal));
-                //dt.Columns.Add("ZPAvgTime", typeof(decimal));
-                //dt.Columns.Add("JDTotalTime", typeof(decimal));
-                //dt.Columns.Add("JDAvgTime", typeof(decimal));
-                //dt.Columns.Add("CLTotalTime", typeof(decimal));
-                //dt.Columns.Add("CLAvgTime", typeof(decimal));
+            DataRow drsum = dt.NewRow();
+            drsum[0] = "总计";
 
-                foreach (var date in datelist)
+            for (int i = 1; i < dt.Columns.Count; i++)
+            {
+                decimal ecount = 0;
+                decimal sum = 0;
+                for (int j = 0; j < dt.Rows.Count; j++)
                 {
-                    var everylist = list.Where(p => p.CreateTime.Value.ToString("yyyy-MM-dd") == date);
-
-                    string ids = string.Empty;
-                    foreach (var l in everylist.Select(p => p.WorkOrderID))
+                    if (dt.Rows[j][i] != null)
                     {
-                        if (string.IsNullOrEmpty(ids))
-                        {
-                            ids = l;
-                        }
-                        else
-                        {
-                            ids = ids + "','" + l;
-                        }
+                        ecount = Convert.ToDecimal(dt.Rows[j][i].ToString());
+                        sum += ecount;
                     }
-
-                    var itemlist = new BLL.T_Wo_WorkOrderItem().GetModelList(" IsDel=0 and Type=1 and WorkOrderID in ('" + ids + "')");
-
-                    var TotalTimelist = everylist.Where(p => p.LastDealTime != null).Select(p => new { totaltime = p.LastDealTime.Value.Subtract(p.CreateTime.Value).TotalHours });
-                    //var ZPList = everylist.Where(p => p.AppointTime != null).Select(p => new { totaltime = p.AppointTime.Value.Subtract(p.CreateTime.Value).TotalHours });
-                    //var JDList = itemlist.Where(p => p.SureTime != null && p.DealTime != null).Select(p => new { totaltime = p.SureTime.Value.Subtract(p.CreateTime.Value).TotalHours });
-                    var CLList = itemlist.Where(p => p.SureTime != null).Select(p => new { totaltime = p.DealTime.Value.Subtract(p.SureTime.Value).TotalHours });
-                    DataRow dr = dt.NewRow();
-                    dr["Date"] = date;
-                    dr["Count"] = everylist.Count();
-                    if (TotalTimelist.Count() > 0)
+                }
+                if (dt.Columns.Count - 1 == i)
+                {
+                    if (dt.Rows.Count > 0)
                     {
-                        dr["TotalTime"] = TotalTimelist.Sum(p => p.totaltime).ToString("f2");
-                        dr["AvgTime"] = TotalTimelist.Average(p => p.totaltime).ToString("f2");
+                        drsum[i] = (sum / dt.Rows.Count).ToString("f2");
+                    }
+                    else {
+                        drsum[i] = 0;
                     }
-                    //if (ZPList.Count() > 0)
-                    //{
-                    //    dr["ZPTotalTime"] = ZPList.Sum(p => p.totaltime).ToString("f2");
-                    //    dr["ZPAvgTime"] = ZPList.Average(p => p.totaltime).ToString("f2");
-                    //}
-                    //if (JDList.Count() > 0)
-                    //{
-                    //    dr["JDTotalTime"] = JDList.Sum(p => p.totaltime).ToString("f2");
-                    //    dr["JDAvgTime"] = JDList.Average(p => p.totaltime).ToString("f2");
-                    //}
-                    //if (CLList.Count() > 0)
-                    //{
-                    //    dr["CLTotalTime"] = CLList.Sum(p => p.totaltime).ToString("f2");
-                    //    dr["CLAvgTime"] = CLList.Average(p => p.totaltime).ToString("f2");
-                    //}
-
-                    dt.Rows.Add(dr);
                 }
-                res = Success("成功", dt);
+                else
+                {
+                    drsum[i] = sum;
+                }
             }
+            dt.Rows.Add(drsum);
+            return dt;
+        }
 
+        /// <summary>
+        /// 工单处理效率导出excel
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult ExportExcel(string stime, string endtime, string dpt)
+        {
+            ActionResult res = NoToken("未知错误，请重新登录");
+            if (Request.IsAuthenticated)
+            {
+                //导出dtnew
+                NPOIHelper npoi = new NPOIHelper();
+                DataTable dt = getData(stime, endtime, dpt);
+                if (npoi.ExportToExcel("工单地区数据报表", dt, new string[] { "日期", "工单总量", "工单总用时/时", "工单平均用时/时" }) == "")
+                {
+                    return Success("导出成功");
+                }
+                else
+                {
+                    return Error("导出失败");
+                }
+            }
             return res;
         }
+        #endregion
 
         /// <summary>
         /// 工单部门分布情况
@@ -250,5 +332,7 @@ namespace CallCenterApi.Interface.Controllers.report
 
             return res;
         }
+
+       
     }
 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -642,8 +642,12 @@ namespace CallCenterApi.Interface.Controllers.tel
                                 gdstate = 1;
                         }
                         model.State = gdstate;
-                        if (gdstate == 1)//如果直接为已处理 需要将lastdealuser改为当前坐席
+                        if (gdstate == 1)
+                        {
+                            //如果直接为已处理 需要将lastdealuser改为当前坐席
                             model.LastDealUser = ua.F_UserCode;
+                            model.ReturnBakTime = DateTime.Now;
+                        }
                         model.IsDel = 0;
                         model.IsReturn = 0;
                         model.IsReturnBak = 0;

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

@@ -1022,6 +1022,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     {
                                         ordermodel.LastDealUser = ua.F_UserCode;
                                         ordermodel.State = 1;
+                                        ordermodel.ReturnBakTime = DateTime.Now;
                                     }
                                 }
                                 if(!string.IsNullOrEmpty(customer))
@@ -1777,6 +1778,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 //工单完结要更新工单的状态
                                 model.State = 1;
                                 model.LastDealUser = ua.F_UserCode;
+                                model.ReturnBakTime = DateTime.Now;
                                 model.Clcontent = cont;
                                 //处理工单时，反馈内容可以编辑
                                 //if (Convert.ToDateTime(model.CreateTime) <= Convert.ToDateTime(stop_datetime))

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -221,7 +221,7 @@ namespace CallCenterApi.Model
             get { return _lastdealuser; }
         }
         /// <summary>
-        /// 最后处理时间
+        /// 最后处理时间 -  安图特殊用（工单处理内容编码问题，根据日期判断：时间为空值时UrlDecode，不为空值时HtmlDecode）
         /// </summary>
         public DateTime? LastDealTime
         {
@@ -253,7 +253,7 @@ namespace CallCenterApi.Model
             get { return _isreturnbak; }
         }
         /// <summary>
-        /// 回访时间
+        /// 回访时间 - 处理时间（处理时间被占用）
         /// </summary>
         public DateTime? ReturnBakTime
         {