报表调整

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

@@ -102,13 +102,14 @@ namespace CallCenterApi.Interface.Controllers.report
         #region 外呼任务报表导出Excel
         public ActionResult GetReportExpt(string TaskID, string quesid, string countryid, string sdate, string edate)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
-            string TaskName = HttpUtility.UrlDecode(RequestString.GetQueryString("taskname"));
+            #region 新建输出表
             DataTable dtnew = new DataTable();
             dtnew.Columns.Add("wenti");
             dtnew.Columns.Add("xuanxiang");
             dtnew.Columns.Add("shuliang");
             dtnew.Columns.Add("bili");
+            #endregion
+
             #region 根据问题id获取问题的查询条件
             string sqlques = "F_QuestionId IN (select ta.F_QuestionId from  T_Ask_PagerItems ta where ta.F_PagerId=(select F_PagerID from T_Call_OutTask where isnull(F_TaskID,'')='" + TaskID + "') ) and F_Type!=1";
             if (!string.IsNullOrWhiteSpace(quesid))

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

@@ -256,7 +256,7 @@ namespace CallCenterApi.Interface.Controllers.report
             sql += " and DATEDIFF(d,BeginTime,'" + beginTime.ToString("yyyy-MM-dd HH:mm:ss") + "')<=0";
             sql += " and DATEDIFF(d,BeginTime,'" + endTime.ToString("yyyy-MM-dd HH:mm:ss") + "')>=0";
 
-            DataTable dt = new BLL.T_Call_CallRecords().GetList("1=1 and BusinessType=0 and calltype=0" + sql).Tables[0]; //BusinessType=0代表ivr中选择了转人工,calltype=1代表呼入
+            DataTable dt = new BLL.T_Call_CallRecords().GetList("1=1 and calltype=0" + sql).Tables[0]; //BusinessType=0代表ivr中选择了转人工,calltype=1代表呼入
 
 
 

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

@@ -250,7 +250,9 @@ namespace CallCenterApi.Interface.Controllers.report
             }
 
             DataTable dt = new DataTable();
-            string sql = "SELECT  *,(SELECT sum(TalkLongTime)  FROM T_Call_CallRecords where  UserId=T_Sys_UserAccount.F_Userid " + sqltimeCallRecords + ") as counts from T_Sys_UserAccount where F_RoleId in(1,28,29) order by counts desc ";
+            string sql = "SELECT  *,(SELECT sum(TalkLongTime)  FROM T_Call_CallRecords where  UserId=T_Sys_UserAccount.F_Userid " + sqltimeCallRecords + ") as counts from T_Sys_UserAccount order by counts desc ";
+            //zhengbingbing 20150508
+            //string sql = "SELECT  *,(SELECT sum(TalkLongTime)  FROM T_Call_CallRecords where  UserId=T_Sys_UserAccount.F_Userid " + sqltimeCallRecords + ") as counts from T_Sys_UserAccount where F_RoleId in(1,28,29) order by counts desc ";
             dt = DbHelperSQL.Query(sql).Tables[0];
             for (int i = 0; i < dt.Rows.Count; i++)
             {

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

@@ -18,8 +18,8 @@ namespace CallCenterApi.Interface.Controllers.report
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             
-                String[] str = { "部门", "坐席", "坐席工号", "呼入电话数", "坐席接通量", "呼损量"
-                        ,"接通率","呼损率","平均排队时间","接听通话次数","通话分钟数","通话秒数"
+                String[] str = { "部门", "坐席", "坐席工号", "呼入量", "呼入接通量", "呼损量"
+                        ,"接通率","呼损率","平均排队时间","总通话次数","通话分钟数","通话秒数"
                         ,"平均接听通话秒数","平均振铃秒数","呼入占有率","用户评价","坐席登录次数"
                         ,"登录时长分钟数","工作时长分钟数","平均每天工作时长（小时）","平均操作分钟数"
                         ,"置忙次数","休息时长分钟数","平均每天休息时长（小时）"
@@ -414,13 +414,13 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc1 = new DataColumn("部门");
             DataColumn dc2 = new DataColumn("坐席");
             DataColumn dc3 = new DataColumn("坐席工号");
-            DataColumn dc4 = new DataColumn("呼入电话数");
-            DataColumn dc5 = new DataColumn("坐席接通量");
+            DataColumn dc4 = new DataColumn("呼入量");
+            DataColumn dc5 = new DataColumn("呼入接通量");
             DataColumn dc6 = new DataColumn("呼损量");
             DataColumn dc7 = new DataColumn("接通率");
             DataColumn dc8 = new DataColumn("呼损率");
             DataColumn dc9 = new DataColumn("平均排队时间");
-            DataColumn dc10 = new DataColumn("接听通话次数");
+            DataColumn dc10 = new DataColumn("总通话次数");
             DataColumn dc11 = new DataColumn("通话分钟数");
             DataColumn dc12 = new DataColumn("通话秒数");
             DataColumn dc13 = new DataColumn("平均接听通话秒数");
@@ -507,13 +507,13 @@ namespace CallCenterApi.Interface.Controllers.report
             double itrunkpjpd = 0.00;//平均排队
             #endregion
             DataTable dtdpt = null;
-            if (dpt != null && dpt.Trim() != "")
+            if (dpt != null && dpt.Trim() != "" && dpt.Trim() != "-1" && dpt.Trim() != "null")
             {
-                dtdpt = DbHelperSQL.Query("select F_DeptId,F_DeptName,F_Remark from  T_Sys_Department where F_ParentId!=0 and F_DeptId=" + dpt).Tables[0];
+                dtdpt = DbHelperSQL.Query("select F_DeptId,F_DeptName,F_Remark from  T_Sys_Department where F_DeptId=" + dpt).Tables[0];// F_ParentId!=0 and
             }
             else
             {
-                dtdpt = DbHelperSQL.Query("select F_DeptId,F_DeptName,F_Remark from  T_Sys_Department where F_ParentId!=0").Tables[0];
+                dtdpt = DbHelperSQL.Query("select F_DeptId,F_DeptName,F_Remark from  T_Sys_Department where 1=1 ").Tables[0];//F_ParentId!=0
             }
             if (dtdpt != null && dtdpt.Rows.Count > 0)
             {
@@ -586,8 +586,8 @@ namespace CallCenterApi.Interface.Controllers.report
                                     itrunkhsl = 0.00;
                                     itrunkpjpd = 0.00;
                                 }
-                                drNew["呼入电话数"] = itrunkct;
-                                drNew["坐席接通量"] = itrunkjj;
+                                drNew["呼入量"] = itrunkct;
+                                drNew["呼入接通量"] = itrunkjj;
                                 drNew["呼损量"] = itrunkhs;
                                 drNew["接通率"] = (itrunkjtl * 100).ToString("0.00") + "%";
                                 drNew["呼损率"] = (itrunkhsl * 100).ToString("0.00") + "%";
@@ -634,7 +634,7 @@ namespace CallCenterApi.Interface.Controllers.report
                                     izlms = 0;
                                 }
                             }
-                            drNew["接听通话次数"] = ijtcs.ToString();
+                            drNew["总通话次数"] = ijtcs.ToString();
                             drNew["通话分钟数"] = (ithms / 60).ToString();
                             drNew["通话秒数"] = ithms.ToString();
 

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

@@ -491,7 +491,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult AddWorkOrder(string callid, int khid, string source, string file
             , string customer, string custel, string country, string address, string inqtime, string inquser
-           , string detail, string cont, string answer, string remark, int infotypeid, int unitid, int clbm, int clid)
+           , string detail, string cont, string answer, string remark, int infotypeid = 0, int unitid = 0, int clbm = 0, int clid = 0)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
@@ -506,6 +506,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                         model.WorkOrderID = DateTime.Now.ToString("yyyyMMddHHmmssmsfff");//工单编号
                         model.CallID = callid;
                         model.CustomerID = khid;
+                        model.CustomerTel = custel;
                         #region 息县工单
                         if (!string.IsNullOrWhiteSpace(customer))
                             model.Customer = customer;

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

@@ -305,7 +305,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string orderid = RequestString.GetQueryString("orderid");
                 if (!string.IsNullOrEmpty(orderid))
                 {
-                    string sql = "select *,dbo.GetUserName(CreateUser) as CreateUserName from T_Wo_WorkOrder where WorkOrderID ='" + orderid + "'";
+                    string sql = "select *,dbo.GetUserName(CreateUser) as CreateUserName,dbo.GetCountry(County) CountryName from T_Wo_WorkOrder where WorkOrderID ='" + orderid + "'";
                     string sqlitem = "select *,dbo.GetUserName(CreateUser) as CreateUserName from T_Wo_WorkOrderItem where Type=3 and IsDel=0 and WorkOrderID ='" + orderid + "'";
 
                     var data = DbHelperSQL.Query(sql).Tables[0];
@@ -727,10 +727,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         public ActionResult AddWorkOrder(
-            string callid,int khid,string source,string file
+            string callid,string source,string file, string custel
             , string customer,string country, string address, string inqtime, string inquser
-           , string detail, string cont, string answer, string remark 
-            , int infotypeid, int unitid,int clbm, int clid,string wjid)
+           , string detail, string cont, string answer, string remark, string wjid
+            ,int khid=0, int infotypeid=0, int unitid=0,int clbm = 0, int clid = 0)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
@@ -746,10 +746,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         model.WorkOrderID = DateTime.Now.ToString("yyyyMMddHHmmssmsfff");//工单编号
                         model.CallID = callid;
                         model.CustomerID = khid;
-                        
                         #region 息县工单
                         if (!string.IsNullOrWhiteSpace(customer))
                             model.Customer = customer;
+                        if (!string.IsNullOrWhiteSpace(custel))
+                            model.CustomerTel = custel;
                         if (!string.IsNullOrWhiteSpace(inqtime))
                             model.Inqtime = DateTime.Parse(inqtime);
                         if (!string.IsNullOrWhiteSpace(inquser))