2222

CallCenterApi/CallCenterApi.BLL/T_Call_CallRecords.cs

@@ -205,6 +205,13 @@ namespace CallCenterApi.BLL
         {
             return dal.UpdateCallback(callId);
         }
+        /// <summary>
+        /// 更新回拨
+        /// </summary>
+        public bool UpdateTransferCall(string callId,string transfercall)
+        {
+            return dal.UpdateTransferCall(callId,  transfercall);
+        }
         #endregion
 
         #region 根据来电号码获取电话记录

CallCenterApi/CallCenterApi.DAL/T_Bus_ToExamine.cs

@@ -50,9 +50,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Bus_ToExamine(");
-            strSql.Append("F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_LimitTime)");
+            strSql.Append("F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_LimitTime,F_Content)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkOrderId,@F_AssignedId,@F_CreatUser,@F_Type,@F_Result,@F_IsDelete,@AuditUser,@F_State,@F_MainDeptId,@F_LimitTime)");
+            strSql.Append("@F_WorkOrderId,@F_AssignedId,@F_CreatUser,@F_Type,@F_Result,@F_IsDelete,@AuditUser,@F_State,@F_MainDeptId,@F_LimitTime,@F_Content)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,50),
@@ -64,7 +64,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@AuditUser", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_MainDeptId", SqlDbType.NVarChar,500),
                     new SqlParameter("@F_State", SqlDbType.Int,4) ,
-             new SqlParameter("@F_LimitTime", SqlDbType.Int,4)};
+             new SqlParameter("@F_LimitTime", SqlDbType.Int,4),
+             new SqlParameter("@F_Content", SqlDbType.NVarChar,-1)};
             parameters[0].Value = model.F_WorkOrderId;
             parameters[1].Value = model.F_AssignedId;
             parameters[2].Value = model.F_CreatUser;
@@ -75,6 +76,7 @@ namespace CallCenterApi.DAL
             parameters[7].Value = model.F_MainDeptId;
             parameters[8].Value = model.F_State;
             parameters[9].Value = model.F_LimitTime;
+            parameters[10].Value = model.F_Content;
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -101,6 +103,7 @@ namespace CallCenterApi.DAL
             strSql.Append("F_State=@F_State,");
             strSql.Append("F_MainDeptId=@F_MainDeptId,");
             strSql.Append("F_LimitTime=@F_LimitTime,");
+            strSql.Append("F_Content=@F_Content,");
             strSql.Append("F_IsDelete=@F_IsDelete");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
@@ -113,6 +116,7 @@ namespace CallCenterApi.DAL
                          new SqlParameter("@F_State", SqlDbType.Int,4),
                           new SqlParameter("@F_MainDeptId", SqlDbType.NVarChar,500),
                            new SqlParameter("@F_LimitTime", SqlDbType.Int,4),
+                            new SqlParameter("@F_Content", SqlDbType.NVarChar,-1),
                     new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkOrderId;
@@ -124,8 +128,9 @@ namespace CallCenterApi.DAL
             parameters[6].Value = model.F_State;
             parameters[7].Value = model.F_MainDeptId;
             parameters[8].Value = model.F_LimitTime;
-            parameters[9].Value = model.F_IsDelete;
-            parameters[10].Value = model.F_ID;
+            parameters[9].Value = model.F_Content;
+            parameters[10].Value = model.F_IsDelete;
+            parameters[11].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -189,7 +194,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_LimitTime,F_MainDeptId from T_Bus_ToExamine ");
+            strSql.Append("select  top 1 F_ID,F_WorkOrderId,F_AssignedId,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_LimitTime,F_MainDeptId,F_Content from T_Bus_ToExamine ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -286,6 +291,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_MainDeptId = row["F_MainDeptId"].ToString();
                 }
+                if (row["F_Content"] != null)
+                {
+                    model.F_Content = row["F_Content"].ToString();
+                }
                 
             }
             return model;
@@ -297,7 +306,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_WorkOrderId,F_AssignedId,F_LimitTime,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId ");
+            strSql.Append("select F_ID,F_WorkOrderId,F_AssignedId,F_LimitTime,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_Content ");
             strSql.Append(" FROM T_Bus_ToExamine ");
             if (strWhere.Trim() != "")
             {
@@ -317,7 +326,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,F_WorkOrderId,F_AssignedId,F_LimitTime,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId ");
+            strSql.Append(" F_ID,F_WorkOrderId,F_AssignedId,F_LimitTime,F_CreatUser,F_Type,F_Result,F_IsDelete,AuditUser,F_State,F_MainDeptId,F_Content ");
             strSql.Append(" FROM T_Bus_ToExamine ");
             if (strWhere.Trim() != "")
             {

CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -737,6 +737,10 @@ namespace CallCenterApi.DAL
                 {
                     model.Callback = int.Parse(row["Callback"].ToString());
                 }
+                if (row["Business"] != null && row["Business"].ToString() != "")
+                {
+                    model.Business = int.Parse(row["Business"].ToString());
+                }
                 
             }
             return model;
@@ -973,7 +977,31 @@ namespace CallCenterApi.DAL
                 }
             }
         }
+        /// <summary>
+        /// 更新是否回拨
+        /// </summary>
+        public bool UpdateTransferCall(string p_CallId, string transfercall)
+        {
+            lock (DAL.T_Call_CallRecords.Global_Lock)
+            {
+                StringBuilder strSql = new StringBuilder();
+                strSql.Append("update T_Call_CallRecords SET TransferCall='"+ transfercall+"'");
+                strSql.Append(" where CallId=@CallId");
+                SqlParameter[] parameters = {
+                    new SqlParameter("@CallId", SqlDbType.VarChar,50)};
+                parameters[0].Value = p_CallId;
 
+                int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+                if (rows > 0)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
         #endregion
 
         #region 更新来电录音开始信息

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/APPController.cs

@@ -348,6 +348,61 @@ namespace CallCenterApi.Interface.Controllers
 
             
         }
+        public ActionResult SendCode(string mobile,string workorderid)
+        {
+            if (string.IsNullOrEmpty(workorderid))
+                return Error("请选择工单");
+            var model = new BLL.T_Bus_WorkOrder().GetModel(workorderid);
+            if (model == null)
+                return Error("工单不存在");
+            if (!string.IsNullOrEmpty(model .F_CusPhone ))
+            {
+                if (model.F_CusPhone.Trim().Length > 11)
+                    model.F_CusPhone = model.F_CusPhone.Substring(1, 11);
+            }
+            if (string.IsNullOrEmpty(mobile))
+            {
+                return Error("请输入将要发送的号码");
+            }
+            if (model.F_CusPhone != mobile)
+                return Error("手机号错误");
+            int codes = new Random().Next(1000, 9999);
+            // string msg = codes.ToString ();
+            // bool n = SMSController.AddSmS(0, msg, "你的验证码是"+ codes+".十分钟有效.", mobile, "168411", "");
+
+            string mag = "[\"" + codes.ToString() + "\"]";
+            string v = SmsNewController.AddSmS(0, "你的验证码是" + codes + ".十分钟有效.", mobile, "681240638956277760", mag,
+          "");
+            if (v == "")
+            {
+                return Success("发送成功");
+            }
+            else
+                return Error("发送失败");
+
+        }
+        public ActionResult Verification (string phone ,string code)
+        {
+            if (string.IsNullOrEmpty(phone))
+                return Error("请输入手机号码");
+            string msgcount = "你的验证码是" + code + ".十分钟有效.";
+            if (string.IsNullOrEmpty(code))
+                return Error("请输入验证码");
+            var sms = new BLL.T_SMS_RecvSMS().GetModelList("Content='" + msgcount + "' and CallerNum='" + phone + "'order by RecvTime desc");
+            if (sms != null && sms.Count > 0)
+            {
+                var modelSms = sms.First();
+                if ((DateTime.Now - modelSms.RecvTime).Minutes > 10)
+                {
+                    return Error("验证码已失效");
+                }
+                else
+                    return Success("验证成功");
+            }
+            else
+                return Error("请输入正确验证码");
+              
+        }
         /// <summary>
         /// 添加工单信息
         /// </summary>
@@ -370,8 +425,8 @@ namespace CallCenterApi.Interface.Controllers
                 string files = RequestString.GetFormString("files");
                 int sourcearea = RequestString.GetInt("sourcearea", 0);
                 string sourceaddress = RequestString.GetFormString("sourceaddress");
-             
-                string keys = RequestString.GetFormString("keys");
+            string code = RequestString.GetFormString("code");
+            string keys = RequestString.GetFormString("keys");
                 string splituser = RequestString.GetFormString("splituser");
                 int type = RequestString.GetInt("type", 0);
                
@@ -380,8 +435,23 @@ namespace CallCenterApi.Interface.Controllers
                 int business = RequestString.GetInt("business", 0); ;//
                 int township = RequestString.GetInt("township", 0);
                 int village = RequestString.GetInt("village", 0);
-              
-                Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new Model.T_Bus_WorkOrder();
+            if (string.IsNullOrEmpty(cusphone))
+                return Error("请输入手机号码");
+            string msgcount = "您的验证码是" + code + "，10分钟内有效。";
+            if (string.IsNullOrEmpty(code))
+                return Error("请输入验证码");
+            var sms = new BLL.T_SMS_RecvSMS().GetModelList("Content='" + msgcount + "' and CallerNum='" + cusphone + "'order by RecvTime desc");
+            if (sms != null && sms.Count > 0)
+            {
+                var modelSms = sms.First();
+                if ((DateTime.Now - modelSms.RecvTime).Minutes > 10)
+                {
+                    return Error("验证码已失效");
+                }
+            }
+            else
+                return Error("请输入正确验证码");
+            Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new Model.T_Bus_WorkOrder();
                 using (TransactionScope trans = new TransactionScope(TransactionScopeOption.Required, new TimeSpan(0, 10, 0)))
                 {
                     #region 保存工单信息
@@ -971,6 +1041,32 @@ namespace CallCenterApi.Interface.Controllers
                 string strSql = string.Format(@"INSERT INTO PublicComment ( [WorkOrderId], [strStm_Src_Dsc], [strWrkOrder_Cst_Ssf_Cd], [strUdt_Psn_ID], [strSsf_Cst_Ass_CntDsc], [strRltv_InsID], [strInpt_Inst_Nm], [strHpCnt], [CreateTime],[str_type]) 
                    values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}') ;select @@IDENTITY ", model.F_WorkOrderId, strStm_Src_Dsc, Satisfaction, "", content, "", "", "", DateTime.Now, 3);
                 object objres = DbHelperSQL.GetSingle(strSql);
+                if (Satisfaction == "非常满意" || Satisfaction == "满意" || Satisfaction == "基本满意")
+                {
+                    if (model != null)
+                    {
+                        Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
+                        keyValuePairs.Add("F_WorkState", 9);
+                        keyValuePairs.Add("F_IsSatisfie", 1);
+                        keyValuePairs.Add("F_IsClosed", 1);
+                        keyValuePairs.Add("F_CloseUser", "");
+                        keyValuePairs.Add("F_CloseTime", DateTime.Now);
+                        keyValuePairs.Add("F_FinalOpinion", "市民评议满意自动结案");
+                        keyValuePairs.Add("F_IsStandard", 1);
+                        keyValuePairs.Add("F_StandardIDS", "");
+                        keyValuePairs.Add("F_ToBereply", 0);
+                        new BLL.T_Bus_WorkOrder().UpdateWorkOrder(model.F_Id, keyValuePairs);
+                        Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                        oper.F_WorkOrderId = model.F_WorkOrderId;
+                        // oper.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
+                        oper.F_State = model.F_WorkState;
+                        oper.F_Message = "市民网站评议满意，自动结案";
+                        oper.F_CreateUser = "jianhang";
+                        oper.F_CreateTime = DateTime.Now;
+                        oper.F_IsDelete = 0;
+                        operBLL.Add(oper);
+                    }
+                }
                 return Success("评议成功");
             }
             else

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Sms/SmsNewController.cs

@@ -131,7 +131,7 @@ namespace CallCenterApi.Interface.Controllers.Sms
                                         // oper.F_AssignedId = modelT_Bus_AssignedInfo.F_Id;
                                         oper.F_State = model.F_WorkState;
                                         oper.F_Message = "市民短信评议基本满意，自动结案";
-                                        oper.F_CreateUser = = "短信评议";
+                                        oper.F_CreateUser = "短信评议";
                                         oper.F_CreateTime = DateTime.Now;
                                         oper.F_IsDelete = 0;
                                         operBLL.Add(oper);
@@ -419,7 +419,7 @@ namespace CallCenterApi.Interface.Controllers.Sms
                     Model.T_SMS_RecvSMS dModel = new Model.T_SMS_RecvSMS();
                     dModel.CallerNum = mobiles.Trim();
                     dModel.Content = Content.Trim();
-                    dModel.RecvModemIMEI = "";
+                    dModel.RecvModemIMEI = templateCode;
                     dModel.F_Name = workorderid;
                     dModel.State = 0;
                     dModel.F_UserID = userId;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SysConfigController.cs

@@ -12,7 +12,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
-    //[Authority]
+    [Authority]
     public class SysConfigController : BaseController
     {
         private BLL.T_Sys_SystemConfig sysConfigBLL = new BLL.T_Sys_SystemConfig();
@@ -296,10 +296,10 @@ namespace CallCenterApi.Interface.Controllers
             Model.T_Sys_SeatPermissionConfig model = new Model.T_Sys_SeatPermissionConfig();
             BLL.T_Sys_SeatPermissionConfig bll = new BLL.T_Sys_SeatPermissionConfig();
             model = bll.GetModel();
-            int maxSeat = int.Parse(model.F_MaxSeat.ToString());
-            string securityKey = model.F_SecurityKey;
+            int maxSeat = 100;
+            string securityKey = "4691-FE75-9091-1085-5103-92ED-E342-1EBD";
             string passHash = model.F_PassHash; //对密码进行加密
-            string saltValue = model.F_SaltValue;
+            string saltValue = "CvVmREt4XbO9qt/LRxow+0tZOUM2WkRYZIJJx6Ok1EkJWMTmuVE3NnMEgoW7x/vvfY3fBS8C3o4x+qjkpE9oUNgFADzSodJ9XuJYEOFM4UB/63iYDPG0g9yBUmWhX0J4N6laYUH+l3PWcRqpD/UxLpqzQYwc/RTisnxWiccMIgOakzc3+1AzJRiBnoysZxdn2yITEuOO375RbO+LYSetfYukwh03RQLGo5RNCLq53ALlwQtrUqeA7DdVKS5Bd0m4p53NQz0tU1uGbvbHHauxpoUMjjqD+afDcIW2wfx84YOXq+J1ordgsFTNamFcCd0pfFYRsMqIvkqrgE5gzm7MjQ==";
             string passHashNew = SaltAndHashHelper.GetHashSha256(maxSeat + securityKey, saltValue);
             return Success(passHashNew);
         }
@@ -330,6 +330,9 @@ namespace CallCenterApi.Interface.Controllers
                 return false;
             }
         }
+         
+
+
 
         #endregion
 

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

@@ -1526,6 +1526,7 @@ DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), new TimeSpan(0, 5, 0));
             int[] hwc = new int[days.Length]; int[] jcc = new int[days.Length];
             for (int i = 0; i < days.Length; i++)
             {
+               
                 var drs = dthw.Select("day='" + days[i] + "'");
                 int hw = 0;int jt = 0;
                 if (drs.Length > 0)
@@ -1567,6 +1568,7 @@ DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), new TimeSpan(0, 5, 0));
             }
             foreach (DataRow it in dthw.Rows)
             {
+               
                if (t >0)
                 {
                     float v= Int32.Parse(it["count"].ToString());
@@ -1880,8 +1882,10 @@ DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), new TimeSpan(0, 5, 0));
             string sql = $"  select a.F_AreaName Name,a.F_Code Code,(select COUNT(1) from T_Bus_WorkOrder   where F_Township = a.F_AreaId  " + where + "   ) count from dbo.T_Sys_AreaChildren a where F_PrentId  in("+ key + ") and F_State = 0   order by F_AreaId asc  ";
             DataTable dthw = DbHelperSQL.Query(sql).Tables[0];
             List<AreaChildrenCount> list = new List<AreaChildrenCount>();
+         
             foreach (DataRow dr in dthw.Rows )
             {
+             
                 AreaChildrenCount areaChildrenCount = new AreaChildrenCount();
                 int type = 0;
                 if (dr["Code"].ToString() == "1")

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -251,7 +251,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
 
         [Authority]
         //添加知识库
-        public ActionResult AddInfo(string title, string con, string pid, int issub)
+        public ActionResult AddInfo(string title, string con, string pid, int issub=0)
         {
             Model.T_RepositoryInformation dModel = new Model.T_RepositoryInformation();
             if (string.IsNullOrEmpty(title))

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

@@ -635,5 +635,47 @@ namespace CallCenterApi.Interface.Controllers.report
             var obj = DbHelperSQL.RunProcedure("P_YSDuration", paras, "YSDuration");
             return Success("成功", obj);
         }
+
+
+        /// <summary>
+        /// 获取营商报表
+        /// </summary>
+        /// <param name="date"></param>
+        /// <param name="isdc"></param>
+        /// <returns></returns>
+        public ActionResult GetBusiness(string sdate, string edate, int isdc = 0)
+        {
+            DateTime stime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); ;
+            DateTime etime = DateTime.Now;
+
+            if (!string.IsNullOrEmpty(sdate))
+            {
+                stime = DateTime.Parse(sdate);
+            }
+            if (!string.IsNullOrEmpty(edate))
+            {
+                etime = DateTime.Parse(edate);
+            }
+            Dictionary<string, string> paras = new Dictionary<string, string>();
+            paras.Add("@sdate", stime.ToString("yyyy-MM-dd"));
+            paras.Add("@edate", etime.ToString("yyyy-MM-dd"));
+            var obj = DbHelperSQL.RunProcedure("P_DeptBusiness", paras, "DeptBusiness");
+            if (isdc >0)
+             {
+                string[] cols = { "承办总量", "承办办结率", "直办总量","直办办结量",
+                    "直办办结率","转办总量","转办办结量","转办办结率","正常回复","已办未果","超期回复","待审信件","正在办理","超期未果","重置转发","驳回记录","关联件数","评议量","评议满意量","评议不满意量","评议满意率","回访量","回访满意量","回访不满意量","回访满意率"};
+                NPOIHelper npoi = new NPOIHelper();
+                if (npoi.ExportToExcel("营商统计工作报表", obj.Tables[0], cols) == "")
+                {
+                    return Success("导出成功");
+                }
+                else
+                {
+                    return Error("导出失败");
+                }
+            }
+            else 
+            return Success("成功", obj);
+        }
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/DaysTalkTimeController.cs

@@ -184,6 +184,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 int calloutcount = drsout.Length;
                 int callwoutcount = drswout.Length;
                 string thsc = gettimes(dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' "), 0);
+               
                 string hrsc = gettimes(drsin, 0);
                 string hcsc = gettimes(drsout, 0);
                 string zlsc = gettimes(drswout, 1);

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/TotalTelController.cs

@@ -92,7 +92,7 @@ namespace CallCenterApi.Interface.Controllers.report
 
             DateTime beginTime;
             DateTime endTime;
-            string sql = "", sqll = "";
+            string sql = "";
 
             int days = DateTime.DaysInMonth(DateTime.Now.Year, DateTime.Now.Month);
             if (stime != null && stime != "")
@@ -108,11 +108,13 @@ 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";
-            sqll += " and DATEDIFF(d,F_LeaveTime,'" + beginTime.ToString("yyyy-MM-dd HH:mm:ss") + "')<=0";
-            sqll += " and DATEDIFF(d,F_LeaveTime,'" + endTime.ToString("yyyy-MM-dd HH:mm:ss") + "')>=0";
+            //  sqll += " and DATEDIFF(d,F_LeaveTime,'" + beginTime.ToString("yyyy-MM-dd HH:mm:ss") + "')<=0";
+            //   sqll += " and DATEDIFF(d,F_LeaveTime,'" + endTime.ToString("yyyy-MM-dd HH:mm:ss") + "')>=0";
 
-            DataTable dt = new BLL.T_Call_CallRecords().GetList("1=1 " + sql).Tables[0];
-            //DataTable dtly = new BLL.T_Call_LeaveRecord().GetList("1=1" + sqll).Tables[0];
+            var  dt = new BLL.T_Call_CallRecords().GetModelList("1=1  " + sql);
+
+
+            
             int tcallincount = 0;
             int tcalloutcount = 0;
             int tcallinjtcount = 0;
@@ -124,20 +126,32 @@ namespace CallCenterApi.Interface.Controllers.report
             for (DateTime t = beginTime; t <= endTime; t = t.AddDays(1))
             {
                 string key = t.ToString("yyyy.MM.dd");
-                int callincount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=0").Length;
-                int calloutcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=1").Length;
-                int callinjtcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=0 and CallState=1 ").Length;
-                int callinhcjtcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=1 and CallState=1 ").Length;
-
-
-
-                //int lycount = dtly.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and DealType=4 ").Length; ;
-                //int lycount = dtly.Select("F_LeaveTime >='" + t.ToString() + "' and F_LeaveTime<'" + t.AddDays(1).ToString() + "' ").Length; ;
-                int srcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and DealType=1 ").Length;
-                int wjtcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallState=0 and CallType=0 and isnull(usercode,'')<>'' ").Length;
-                //int fqcount = callincount - callinjtcount - lycount - srcount;//- wjtcount;
-                int fqcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallState=0 and isnull(usercode,'')='' ").Length;
-                string thsc = gettimes(dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=0 and CallState=1 "));
+                int callincount = dt.Where(x => x.BeginTime.Value.ToString("yyyy.MM.dd") ==key  && x.CallType == 0).Count();
+
+                //int callincount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=0").Length;
+                int calloutcount = dt.Where(x => x.BeginTime.Value.ToString("yyyy.MM.dd") == key && x.CallType == 1).Count();
+                //int calloutcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=1").Length;
+                int callinjtcount = dt.Where(x => x.BeginTime.Value.ToString("yyyy.MM.dd") == key && x.CallType == 0&&
+              x. CallState == 1).Count();
+                // int callinjtcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=0 and CallState=1 ").Length;
+                int callinhcjtcount = dt.Where(x => x.BeginTime.Value.ToString("yyyy.MM.dd") == key && x.CallType == 1 &&
+              x.CallState == 1).Count();
+                //int callinhcjtcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=1 and CallState=1 ").Length;
+
+                int srcount = dt.Where(x => x.BeginTime.Value.ToString("yyyy.MM.dd") == key && x.DealType == 1).Count();
+                // int srcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and DealType=1 ").Length;
+                int wjtcount = dt.Where(x => x.BeginTime.Value.ToString("yyyy.MM.dd") == key && x.DealType == 1
+                && (x.UserCode == "" || x.UserCode == null)).Count();
+                //  int wjtcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallState=0 and CallType=0 and isnull(usercode,'')<>'' ").Length;
+
+                int fqcount = dt.Where(x => x.BeginTime.Value.ToString("yyyy.MM.dd") == key && x.CallState == 0
+              && (x.UserCode == "" || x.UserCode == null)).Count();
+                // int fqcount = dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallState=0 and isnull(usercode,'')='' ").Length;
+
+                int thsc =dt.Where(x => x.BeginTime.Value.ToString("yyyy.MM.dd") == key && x.CallType == 0
+              && x.CallState==1&&x.TalkLongTime !=null ).Sum (x=>x.TalkLongTime.Value  );
+              //  string thsc = gettimes(dt.Select("begintime >='" + t.ToString() + "' and begintime<'" + t.AddDays(1).ToString() + "' and CallType=0 and CallState=1 "));
+                
 
                 tcallincount = tcallincount + callincount;
                 tcalloutcount = tcalloutcount + calloutcount;
@@ -146,7 +160,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 //tlycount = tlycount + lycount;
                 tsrcount = tsrcount + srcount;
                 tfqcount = tfqcount + fqcount;
-                tthsc = tthsc + double.Parse(thsc);
+                tthsc = tthsc + thsc;
 
                 DataRow drNew = dtNew.NewRow();
 
@@ -159,8 +173,8 @@ namespace CallCenterApi.Interface.Controllers.report
                 drNew["主动放弃次数"] = fqcount;
                 drNew["电话骚扰次数"] = srcount;
                 drNew["正常呼出接听次数"] = callinhcjtcount;
-                if ((callincount + calloutcount) > 0 && double.Parse(thsc) > 0)
-                    drNew["平均呼入时间"] = DateTimeConvert.parseTimeSeconds((int)(double.Parse(thsc) / callinjtcount), 0);
+                if ((callincount + calloutcount) > 0 && thsc > 0)
+                    drNew["平均呼入时间"] = DateTimeConvert.parseTimeSeconds((int)(thsc / callinjtcount), 0);
                 else
                     drNew["平均呼入时间"] = "0";
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -32,7 +32,9 @@ namespace CallCenterApi.Interface.Controllers.tel
             string group = HttpUtility.UrlDecode(RequestString.GetQueryString("group"));
             int callback = RequestString.GetInt("callback", 0);
             int waitTime = RequestString.GetInt("waitTime", -1);
-            
+            int morewaitTime = RequestString.GetInt("morewaitTime", -1);
+            int lesswaitTime = RequestString.GetInt("lesswaitTime", -1);
+            int myd = RequestString.GetInt("myd", -1);
             int type = RequestString.GetInt("type", 0);
             int islike = RequestString.GetInt("islike", 1);
             int notconnected = RequestString.GetInt("notconnected", 0);
@@ -41,7 +43,7 @@ namespace CallCenterApi.Interface.Controllers.tel
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
-
+            int Business = RequestString.GetInt("Business", -1);
             //if (roleid != 0)
             //{
             //    if (roleid == 1)
@@ -49,6 +51,13 @@ namespace CallCenterApi.Interface.Controllers.tel
             //        sql += " and UserCode='" + User.F_WorkNumber + "' ";
             //    }
             //}
+            if (Business>-1)
+            {
+                if (Business == 0)
+                    sql += "and Business is null";
+                else
+                    sql += "and Business=1";
+            }
             if (type != 0)
             {
                 sql += " and F_CallInType = '" + type + "' ";
@@ -102,7 +111,19 @@ namespace CallCenterApi.Interface.Controllers.tel
             }
             if (waitTime>-1)
             {
-                sql += "and  (DATEDIFF (SECOND ,TalkStartTime,BeginTime)='"+ waitTime + "'  or ((DATEDIFF (SECOND ,TalkStartTime,EndTime)='"+ waitTime + "' and TalkStartTime is null )    ))";
+                sql += "and  (DATEDIFF (SECOND ,BeginTime,TalkStartTime)='" + waitTime + "'  or ((DATEDIFF (SECOND ,TalkStartTime,EndTime)='"+ waitTime + "' and TalkStartTime is null )    ))";
+            }
+            if (morewaitTime > -1)
+            {
+                sql += "and  (DATEDIFF (SECOND ,BeginTime,TalkStartTime)>'" + morewaitTime + "'  or ((DATEDIFF (SECOND ,TalkStartTime,EndTime)>'" + morewaitTime + "' and TalkStartTime is null )    ))";
+            }
+            if (lesswaitTime  > -1)
+            {
+                sql += "and  (DATEDIFF (SECOND ,BeginTime,TalkStartTime)<'" + lesswaitTime + "'  or ((DATEDIFF (SECOND ,TalkStartTime,EndTime)<'" + lesswaitTime + "' and TalkStartTime is null )    ))";
+            }
+            if (myd>-1)
+            {
+                sql += "and MYD='" + myd + "' and CallState=1";
             }
             if (callstate.Trim() != "")
             {
@@ -272,6 +293,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                             }
 
                             string lujing = path.Substring(path.IndexOf(':') + 1).Replace('\\', '/');
+                           
                             string wlpath = ym + lujing;
 
                             dr["FilePath"] = wlpath;
@@ -317,7 +339,22 @@ namespace CallCenterApi.Interface.Controllers.tel
 
 
         }
+        //获取最新通话记录
+        public ActionResult GetCallRecords(string callid)
+        {
+           
+            var call = new BLL.T_Call_CallRecords().GetModelByCallId (callid);
+
+            if (call!=null )
+            {
+                return Success("获取成功", call);
+            }
+            else
+            {
+                return Error("获取失败");
+            }
 
+        }
 
         //获取通话记录列表
         public ActionResult GetNotconnectedList(string phone="")
@@ -545,6 +582,25 @@ namespace CallCenterApi.Interface.Controllers.tel
                 return Success("更新失败");
             }
         }
+
+        /// <summary>
+        /// 更新转接电话
+        /// </summary>
+        /// <returns></returns>
+        [Authority]
+        public ActionResult UpdateTransferCall(string callid,string transfercall)
+        {
+
+            var b = new BLL.T_Call_CallRecords().UpdateTransferCall(callid, transfercall);
+            if (b)
+            {
+                return Success("更新成功");
+            }
+            else
+            {
+                return Success("更新失败");
+            }
+        }
         /// <summary>
         /// 更新回拨
         /// </summary>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -3,6 +3,7 @@ using CallCenterApi.Common;
 using CallCenterApi.DB;
 using CallCenterApi.Interface.App_Start;
 using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Controllers.Sms;
 using CallCenterApi.Model;
 using CallCenterAPI.WechatSDK;
 using CallCenterAPI.WechatSDK.Models;
@@ -131,11 +132,139 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 model.F_CreateTime = DateTime.Now;
                 new BLL.T_Sys_Users().Add(model);
             }
+            return Success("成功", model);
+        }
+        /// <summary>
+        /// 发送短信验证码
+        /// </summary>
+        /// <param name="mobile"></param>
+        /// <returns></returns>
+        public ActionResult SendCode(string mobile)
+        {
 
+            int codes = new Random().Next(1000, 9999);
+            string mag = "[\"" + codes.ToString() + "\"]";
+            string v = SmsNewController.AddSmS(0, "您的验证码是" + codes + "，10分钟内有效。", mobile, "681240638956277760", mag,
+          "");
+            if (v == "")
+            {
+                return Error("发送成功");
+            }
+            else
+            {
+                return Error("发送失败");
+            }
+        }
+        /// <summary>
+        /// 修改微信用户信息
+        /// </summary>
+        /// <param name="login"></param>
+        /// <returns></returns>
+        public ActionResult EditUserInfo(WxLoginDto wld,string code,string mobile)
+        {
+            wld.RedirectUrl = RequestString.GetUrlReferrer();
+
+            if (string.IsNullOrEmpty(wld.OpenId))
+            {
+                var temp = WxHelper.GetUserInfo(wld);
+                if (string.IsNullOrWhiteSpace(temp.OpenId))
+                {
+                    return Redirect("请求", temp.RedirectUrl);
+                }
+                wld.OpenId = temp.OpenId;
+                wld.UserInfo = temp.UserInfo;
+            }
+            if (string.IsNullOrEmpty(mobile))
+                return Error("请输入手机号码");
+            string msgcount = "您的验证码是" + code + "，10分钟内有效。";
+            if (string.IsNullOrEmpty(code))
+                return Error("请输入验证码");
+            var sms = new BLL.T_SMS_RecvSMS().GetModelList("Content='" + msgcount + "' and CallerNum='" + mobile + "'order by RecvTime desc");
+            if (sms != null && sms.Count > 0)
+            {
+                var modelSms = sms.First();
+                if ((DateTime.Now - modelSms.RecvTime).Minutes > 10)
+                {
+                    return Error("验证码已失效");
+                }
+            }
+            else
+                return Error("请输入正确验证码");
+
+
+
+            var model = new BLL.T_Sys_Users().GetModel(wld.OpenId);
+            if (model == null)
+            {
+                model = new Model.T_Sys_Users();
+                model.F_OpenId = wld.OpenId;
+                model.F_Name = wld.UserInfo.nickname;
+                model.F_ImgUrl = wld.UserInfo.headimgurl;
+                model.F_Province = wld.UserInfo.province;
+                model.F_City = wld.UserInfo.city;
+                model.F_Telphone = mobile;
+                model.F_County = wld.UserInfo.country;
+                model.F_Type = (int)EnumUserType.wechat;//1;
+                model.F_CreateTime = DateTime.Now;
+                new BLL.T_Sys_Users().Add(model);
+            }
+            else
+            {
+                model.F_Telphone = mobile;
+                new BLL.T_Sys_Users().Update (model);
+            }
             return Success("成功", wld.UserInfo);
         }
 
         /// <summary>
+        /// 解除微信用户信息
+        /// </summary>
+        /// <param name="login"></param>
+        /// <returns></returns>
+        public ActionResult RelieveUserInfo(WxLoginDto wld, string code, string mobile)
+        {
+            wld.RedirectUrl = RequestString.GetUrlReferrer();
+            if (string.IsNullOrEmpty(mobile))
+                return Error("请输入手机号码");
+            string msgcount = "您的验证码是" + code + "，10分钟内有效。";
+            if (string.IsNullOrEmpty(code))
+                return Error("请输入验证码");
+            var sms = new BLL.T_SMS_RecvSMS().GetModelList("Content='" + msgcount + "' and CallerNum='" + mobile + "'order by RecvTime desc");
+            if (sms != null && sms.Count > 0)
+            {
+                var modelSms = sms.First();
+                if ((DateTime.Now - modelSms.RecvTime).Minutes > 10)
+                {
+                    return Error("验证码已失效");
+                }
+            }
+            else
+                return Error("请输入正确验证码");
+            if (string.IsNullOrEmpty(wld.OpenId))
+            {
+                var temp = WxHelper.GetUserInfo(wld);
+                if (string.IsNullOrWhiteSpace(temp.OpenId))
+                {
+                    return Redirect("请求", temp.RedirectUrl);
+                }
+                wld.OpenId = temp.OpenId;
+                wld.UserInfo = temp.UserInfo;
+            }
+            var model = new BLL.T_Sys_Users().GetModel(wld.OpenId);
+            if (model != null)
+            {
+
+                model.F_Telphone = "";
+                new BLL.T_Sys_Users().Update(model);
+            }
+            else
+            {
+                return Error("该用户不存在");
+            }
+            return Success("解除成功", wld.UserInfo);
+        }
+
+        /// <summary>
         /// 获取政务网用户
         /// </summary>
         /// <returns></returns>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/APPSController.cs

@@ -3125,6 +3125,59 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return Content(obj.ToJson().Replace("state", "C-Response-Desc").Replace("message", "C-API-Status").Replace("returnList", "C-Response-Body").Replace("code", "C-Response-Code"));
 
         }
+
+        public ActionResult Reminder()
+        {
+            string strSql = "select count(1) from T_Call_CallRecords where DATEDIFF (DAY ,BeginTime ,GETDATE ())=0 ";
+
+            object objres = DbHelperSQL.GetSingle(strSql);
+            var model = new BLL.T_SMS_RecvSMS().GetModelList("DATEDIFF (DAY ,RecvTime ,GETDATE ())=0 and RecvModemIMEI='701484974439813120' order by RecvTime desc ");
+            if (model!=null && model.Count >0)
+            {
+                int t = int.Parse(objres.ToString());
+                int count =int .Parse ( model.First().RecvModemIMEI)+1000;
+                if (t > count)
+                {
+                    string mag = "[\"超"+ count + "\"]";
+                    var userlist = new BLL.T_Sys_UserAccount().GetModelList(" F_DeleteFlag =0 and F_RoleId in (1, 4, 11)");
+                    if (userlist != null && userlist.Count > 0)
+                    {
+                        foreach (var it in userlist)
+                        {
+                            if (!string.IsNullOrEmpty(it.F_Mobile))
+                            {
+                                string v = SmsNewController.AddSmS(0, "当前务已超"+ count + "。请关注", it.F_Mobile, "701484974439813120", mag, "1000");
+                            }
+                        }
+
+                    }
+                }
+
+            }
+            else
+            {
+                if (int.Parse(objres.ToString()) > 1000)
+                {
+              
+                    string mag = "[\"超1000"  + "\"]";
+                    var userlist = new BLL.T_Sys_UserAccount().GetModelList(" F_DeleteFlag =0 and F_RoleId in (1, 4, 11)");
+                    if (userlist!=null && userlist.Count >0)
+                    {
+                        foreach (var it in userlist)
+                        {
+                            if (!string.IsNullOrEmpty(it.F_Mobile ))
+                            {
+                                string v = SmsNewController.AddSmS(0, "当前务已超1000。请关注", it.F_Mobile, "701484974439813120", mag, "1000");
+                            }
+                        }
+                        
+                    }
+                  
+                }
+            }
+            return Success("");
+
+        }
         public ActionResult zmhd10002()
         {
          

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/EnumWorkState.cs

@@ -46,6 +46,6 @@ namespace CallCenterApi.Interface.Models.Common
 
         [Description("重办驳回")]
         rejload =13,
-       
+      
     }
 }

CallCenterApi/CallCenterApi.Model/T_Bus_ToExamine.cs

@@ -88,6 +88,7 @@ namespace CallCenterApi.Model
             set;get;
         }
         public int? F_LimitTime { set; get; }
+        public string F_Content { set; get; }
         #endregion Model
 
     }

CallCenterApi/CallCenterApi.Model/T_Call_CallRecords.cs

@@ -555,6 +555,7 @@ namespace CallCenterApi.Model
         public string PhoneType { set; get; }
 
         public int? Callback { set; get; }
+        public int? Business { set; get; }
         #endregion Model
 
     }

CallCenterCommon/CallCenter.QuartzService/TrafficReminder.cs

@@ -0,0 +1,32 @@
+using CallCenter.Utility;
+using CallCenterApi.DB;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenter.QuartzService
+{
+    class TrafficReminder : QuartzJob
+    {
+        public TrafficReminder()
+        {
+            CronExpression = "0 0/5 * * * ?";
+            DoWork += Reminder;
+        }
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Reminder(object sender, EventArgs e)
+        {
+          
+
+          
+           
+
+        }
+   }
+}

CallCenterCommon/CallCenter.QuartzService/ZhengWuDuiJie.cs

@@ -59,7 +59,7 @@ namespace CallCenter.QuartzService
         private void submit_dept_crnt_status(object sender, EventArgs e)
 
         {
-
+            var Dataurl = HttpMethods.HttpPost("http://docking.zwfw.anyang.gov.cn:9998/APPS/Reminder");
             string token = GetToken();
            
             paras paras = new paras();
@@ -110,48 +110,11 @@ namespace CallCenter.QuartzService
 
             paras.TDY_TELRATE = TDY_TELRATE;
 
-            //Dictionary<string, object> values = new Dictionary<string, object>();
-            //values.Add("access_token", token);
-            //values.Add("paras", paras);
-            //var jsonParam = JsonConvert.SerializeObject(values);
-            //序列化参数
+          
             string jsonParam = "access_token=" + token + "&paras=" + paras.ToJson();
            var responseString = HttpMethods.HttpPost("http://59.227.104.19:8000/share/submit_dept_crnt_status", jsonParam);
 
-            //Push jo =JsonConvert.DeserializeObject<Push>(responseString);
-            // if (jo .code =="0")
-            //{
-            //    string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
-            //       values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", "", jsonParam, DateTime.Now, jo.code, jo.message , "实时服务信息上报接口", "", "");
-            //    object objres = DbHelperSQL.GetSingle(strSql);
-            //}
-            // else
-            //{
-            //    string error = "";
-            //    if (jo .body .errorObjs  !=null && jo.body.errorObjs.Length >0)
-            //    {
-            //        foreach (var it in jo.body.errorObjs)
-            //        {
-            //            if (!string .IsNullOrEmpty (it.resturl ))
-            //            {
-            //                error += " 推送接口名称:" + it.resturl;
-            //            }
-            //            if (!string.IsNullOrEmpty(it.resturl))
-            //            {
-            //                error += " 推送标识:" + it.errorid;
-            //            }
-            //            if (!string.IsNullOrEmpty(it.resturl))
-            //            {
-            //                error += " 推送失败原因:" + it.errormsg;
-            //            }
-            //        }
-            //    }
-            //        string strSql = string.Format(@"INSERT INTO T_Sys_PushMsg ( [WorkOrderId], [Conent], [CreatTime], [Code], [Message], [Title], [ErrorObjs], [Remarks]) 
-            //       values   ('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}') ;select @@IDENTITY ", "", jsonParam, DateTime.Now, jo.code, jo.message, "实时服务信息上报接口", error, "");
-            //    object objres = DbHelperSQL.GetSingle(strSql);
-
-                //}
-
+           
         }
    
         private string GetToken()

CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -573,18 +573,21 @@ namespace CallCenter.Utility
                     str = dr["Oncedissatisfied"].ToString();
                     break;
                 case 16:
-                    str = dr["dissatisfied"].ToString();
+                    str = dr["twocedissatisfied"].ToString();
                     break;
                 case 17:
-                    str = dr["satisfiedrate"].ToString();
+                    str = dr["dissatisfied"].ToString();
                     break;
                 case 18:
-                    str = dr["satisfiedscore"].ToString();
+                    str = dr["satisfiedrate"].ToString();
                     break;
                 case 19:
-                    str = dr["total"].ToString();
+                    str = dr["satisfiedscore"].ToString();
                     break;
                 case 20:
+                    str = dr["total"].ToString();
+                    break;
+                case 21:
                     str = index.ToString();
                     break;
 
@@ -603,9 +606,14 @@ namespace CallCenter.Utility
             public int Oncapacity { set; get; }//接通量
             public int seatsCount { set; get; }
             public string seats { set; get; }
+            public int newIncomingCount { set; get; }//呼入量
+            public int newOncapacity { set; get; }//接通量
+            public string newseats { set; get; }
+            public int newseatsCount { set; get; }
+           
         }
         /// <summary>
-        /// 督办数据报表导出
+        /// 数据报表导出
         /// </summary>
         /// <param name="ds"></param>
         /// <returns></returns>
@@ -636,8 +644,9 @@ namespace CallCenter.Utility
                 sheet.AddMergedRegion(new CellRangeAddress(0, 0, 0, 4));
                 
                 
-                string[] cols = {"时间段","来电量","接听量（呼入已接通）",
-                "坐席个数","坐席姓名" };
+                string[] cols = {"时间段","来电总量","接听总量（呼入已接通）","12345来电量","12345接听量（呼入已接通）",
+                "12345坐席个数","12345坐席姓名" ,
+                "专家坐席个数","专家坐席姓名" };
                 IRow irow4 = sheet.CreateRow(1);
                 int icolIndex = 0;
                 foreach (string dc in cols)
@@ -660,26 +669,50 @@ namespace CallCenter.Utility
                     cell.SetCellValue(dr.time );
                     cell.CellStyle = cellStylebt;
                     ICell cel2 = irow.CreateCell(1);
-                    cel2.SetCellValue(dr.IncomingCount );
+                    cel2.SetCellValue(dr.newIncomingCount );
                     cel2.CellStyle = cellStylebt;
                     ICell cel3 = irow.CreateCell(2);
-                    cel3.SetCellValue(dr.Oncapacity );
+                    cel3.SetCellValue(dr.newOncapacity  );
                     cel3.CellStyle = cellStylebt;
+
+                    ICell cel5 = irow.CreateCell(3);
+                    cel5.SetCellValue(dr.IncomingCount);
+                    cel5.CellStyle = cellStylebt;
+                    ICell cel6 = irow.CreateCell(4);
+                    cel6.SetCellValue(dr.Oncapacity);
+                    cel6.CellStyle = cellStylebt;
                     if (dr.time=="共计")
                     {
-                        ICell cel4 = irow.CreateCell(3);
+                        ICell cel4 = irow.CreateCell(5);
                         cel4.SetCellValue("");
                         cel4.CellStyle = cellStylebt;
                     }
                     else
                     {
-                        ICell cel4 = irow.CreateCell(3);
+                        ICell cel4 = irow.CreateCell(5);
                         cel4.SetCellValue(dr.seatsCount);
                         cel4.CellStyle = cellStylebt;
                     }
-                    ICell cel5 = irow.CreateCell(4);
-                    cel5.SetCellValue(dr.seats );
-                    cel5.CellStyle = cellStylebt;
+                    ICell cel8 = irow.CreateCell(6);
+                    cel8.SetCellValue(dr.seats );
+                    cel8.CellStyle = cellStylebt;
+
+                    if (dr.time == "共计")
+                    {
+                        ICell cel9 = irow.CreateCell(7);
+                        cel9.SetCellValue("");
+                        cel9.CellStyle = cellStylebt;
+                    }
+                    else
+                    {
+                        ICell cel9 = irow.CreateCell(7);
+                        cel9.SetCellValue(dr.newseatsCount);
+                        cel9.CellStyle = cellStylebt;
+                    }
+                    ICell cel0 = irow.CreateCell(8);
+                    cel0.SetCellValue(dr.newseats);
+                    cel0.CellStyle = cellStylebt;
+
                     irow.Height = 50*15;
                     iRowIndex++;
                 }
@@ -760,7 +793,7 @@ namespace CallCenter.Utility
                 string[] cols = {"序号","联动单位","承办件",
                 "承办率","得分(5分)","超期件","按时反馈率","得分(20分)",
                 "未果件","办结率","得分(10分)","退单件","有效回复率",
-                "得分(15分)","群众评议总数","一次不满意件","不满意件","满意率","得分(50分)","总分","排名"};
+                "得分(15分)","群众评议总数","一次不满意件","二次不满意件","不满意件","满意率","得分(50分)","总分","排名"};
                 IRow irow4 = sheet.CreateRow(4);
                 int icolIndex = 0;
                 foreach (string dc in cols)
@@ -778,7 +811,7 @@ namespace CallCenter.Utility
                     index++;
                     int iCellIndex = 0;
                     IRow irow = sheet.CreateRow(iRowIndex );
-                    for (int i = 0; i < 21; i++)
+                    for (int i = 0; i < 22; i++)
                     {
                         ICell cell = irow.CreateCell(iCellIndex);
                         cell.SetCellValue(GetCellValue(dr, index,i ));
@@ -811,7 +844,7 @@ namespace CallCenter.Utility
                     index++;
                     int iCellIndex = 0;
                     IRow irow = sheet.CreateRow(iRowIndex);
-                    for (int i = 0; i < 21; i++)
+                    for (int i = 0; i < 22; i++)
                     {
                         ICell cell = irow.CreateCell(iCellIndex);
                         cell.SetCellValue(GetCellValue(dr, index,i ));
@@ -843,7 +876,7 @@ namespace CallCenter.Utility
                     index++;
                     int iCellIndex = 0;
                     IRow irow = sheet.CreateRow(iRowIndex);
-                    for (int i = 0; i < 21; i++)
+                    for (int i = 0; i < 22; i++)
                     {
                         ICell cell = irow.CreateCell(iCellIndex);
                         cell.SetCellValue(GetCellValue(dr, index,i ));
@@ -875,7 +908,7 @@ namespace CallCenter.Utility
                     index++;
                     int iCellIndex = 0;
                     IRow irow = sheet.CreateRow(iRowIndex);
-                    for (int i = 0; i < 21; i++)
+                    for (int i = 0; i < 22; i++)
                     {
                         ICell cell = irow.CreateCell(iCellIndex);
                         cell.SetCellValue(GetCellValue(dr, index,i ));