政务对接

CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -128,6 +128,7 @@
     <Compile Include="T_Sms_SmsModel.cs" />
     <Compile Include="T_Sys_Accessories.cs" />
     <Compile Include="T_Sys_Achievements.cs" />
+    <Compile Include="T_Sys_Affairs.cs" />
     <Compile Include="T_Sys_Area.cs" />
     <Compile Include="T_Sys_Class.cs" />
     <Compile Include="T_Sys_Department.cs" />

CallCenterApi/CallCenterApi.BLL/T_Bus_Feedback_Next.cs

@@ -61,7 +61,13 @@ namespace CallCenterApi.BLL
 
             return dal.GetModel(F_Id);
         }
-
+        /// <summary>
+        /// 根据工单编号得到一个最新对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Bus_Feedback_Next GetNewModelByWorkOrderID(string F_WorkOrderId)
+        {
+            return dal.GetNewModelByWorkOrderID(F_WorkOrderId);
+        }
         /// <summary>
         /// 获得数据列表
         /// </summary>

CallCenterApi/CallCenterApi.BLL/T_Sys_Affairs.cs

@@ -0,0 +1,164 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.BLL
+{
+    /// <summary>
+    /// T_Sys_Affairs
+    /// </summary>
+    public partial class T_Sys_Affairs
+    {
+        private readonly CallCenterApi.DAL.T_Sys_Affairs dal = new CallCenterApi.DAL.T_Sys_Affairs();
+        public T_Sys_Affairs()
+        { }
+        #region  BasicMethod
+
+        /// <summary>
+        /// 得到最大ID
+        /// </summary>
+        public int GetMaxId()
+        {
+            return dal.GetMaxId();
+        }
+
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_ID)
+        {
+            return dal.Exists(F_ID);
+        }
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_Sys_Affairs model)
+        {
+            return dal.Add(model);
+        }
+
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(CallCenterApi.Model.T_Sys_Affairs model)
+        {
+            return dal.Update(model);
+        }
+
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_ID)
+        {
+
+            return dal.Delete(F_ID);
+        }
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool DeleteList(string F_IDlist)
+        {
+            return dal.DeleteList(F_IDlist);
+        }
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Sys_Affairs GetModel(int F_ID)
+        {
+
+            return dal.GetModel(F_ID);
+        }
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Sys_Affairs GetModel(string F_WorkOrderId)
+        {
+            return dal.GetModel(F_WorkOrderId);
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            return dal.GetList(strWhere);
+        }
+        /// <summary>
+        /// 获得前几行数据
+        /// </summary>
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        {
+            return dal.GetList(Top, strWhere, filedOrder);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_Sys_Affairs> GetModelList(string strWhere)
+        {
+            DataSet ds = dal.GetList(strWhere);
+            return DataTableToList(ds.Tables[0]);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_Sys_Affairs> DataTableToList(DataTable dt)
+        {
+            List<CallCenterApi.Model.T_Sys_Affairs> modelList = new List<CallCenterApi.Model.T_Sys_Affairs>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                CallCenterApi.Model.T_Sys_Affairs model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = dal.DataRowToModel(dt.Rows[n]);
+                    if (model != null)
+                    {
+                        modelList.Add(model);
+                    }
+                }
+            }
+            return modelList;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetAllList()
+        {
+            return GetList("");
+        }
+
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public int GetRecordCount(string strWhere)
+        {
+            return dal.GetRecordCount(strWhere);
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+        {
+            return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        //public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+        //{
+        //return dal.GetList(PageSize,PageIndex,strWhere);
+        //}
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}

CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -128,6 +128,7 @@
     <Compile Include="T_Sms_SmsModel.cs" />
     <Compile Include="T_Sys_Accessories.cs" />
     <Compile Include="T_Sys_Achievements.cs" />
+    <Compile Include="T_Sys_Affairs.cs" />
     <Compile Include="T_Sys_Area.cs" />
     <Compile Include="T_Sys_Class.cs" />
     <Compile Include="T_Sys_Department.cs" />

CallCenterApi/CallCenterApi.DAL/T_Bus_Feedback_Next.cs

@@ -269,7 +269,31 @@ namespace CallCenterApi.DAL
             }
         }
 
+        /// <summary>
+        /// 根据工单编号得到一个最新对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Bus_Feedback_Next GetNewModelByWorkOrderID(string F_WorkOrderId)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 * from T_Bus_Feedback_Next ");
+            strSql.Append(" where F_WorkOrderId=@F_WorkOrderId and F_IsDelete=0");
+            strSql.Append(" order by F_Id desc");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,50)
+            };
+            parameters[0].Value = F_WorkOrderId;
 
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]); ;
+            }
+            else
+            {
+                return null;
+            }
+        }
         /// <summary>
         /// 得到一个对象实体
         /// </summary>

CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -733,6 +733,11 @@ namespace CallCenterApi.DAL
                 {
                     model.PhoneType = row["PhoneType"].ToString();
                 }
+                if (row["Callback"] != null && row["Callback"].ToString() != "")
+                {
+                    model.Callback = int.Parse(row["Callback"].ToString());
+                }
+                
             }
             return model;
         }

CallCenterApi/CallCenterApi.DAL/T_Sys_Affairs.cs

@@ -0,0 +1,415 @@
+using CallCenterApi.DB;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.DAL
+{
+    /// <summary>
+    /// 数据访问类:T_Sys_Affairs
+    /// </summary>
+    public partial class T_Sys_Affairs
+    {
+        public T_Sys_Affairs()
+        { }
+        #region  BasicMethod
+
+        /// <summary>
+        /// 得到最大ID
+        /// </summary>
+        public int GetMaxId()
+        {
+            return DbHelperSQL.GetMaxID("F_ID", "T_Sys_Affairs");
+        }
+
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_ID)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) from T_Sys_Affairs");
+            strSql.Append(" where F_ID=@F_ID");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_ID;
+
+            return DbHelperSQL.Exists(strSql.ToString(), parameters);
+        }
+
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_Sys_Affairs model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("insert into T_Sys_Affairs(");
+            strSql.Append("F_WorkOrderId,TROWGUID,CASE_SERIAL,TSIGNTIME_BF,TBACKTIME_BF,SEND_TIME,SEND_CONTENT,CASE_TIME,TFDBACKTIME_BF,FILES,CreateTime)");
+            strSql.Append(" values (");
+            strSql.Append("@F_WorkOrderId,@TROWGUID,@CASE_SERIAL,@TSIGNTIME_BF,@TBACKTIME_BF,@SEND_TIME,@SEND_CONTENT,@CASE_TIME,@TFDBACKTIME_BF,@FILES,@CreateTime)");
+            strSql.Append(";select @@IDENTITY");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,100),
+                    new SqlParameter("@TROWGUID", SqlDbType.NVarChar,500),
+                    new SqlParameter("@CASE_SERIAL", SqlDbType.NVarChar,500),
+                    new SqlParameter("@TSIGNTIME_BF", SqlDbType.NVarChar,500),
+                    new SqlParameter("@TBACKTIME_BF", SqlDbType.NVarChar,500),
+                    new SqlParameter("@SEND_TIME", SqlDbType.NVarChar,500),
+                    new SqlParameter("@SEND_CONTENT", SqlDbType.NVarChar,500),
+                    new SqlParameter("@CASE_TIME", SqlDbType.NVarChar,500),
+                    new SqlParameter("@TFDBACKTIME_BF", SqlDbType.NVarChar,500),
+                    new SqlParameter("@FILES", SqlDbType.NVarChar,50),
+                    new SqlParameter("@CreateTime", SqlDbType.DateTime)};
+            parameters[0].Value = model.F_WorkOrderId;
+            parameters[1].Value = model.TROWGUID;
+            parameters[2].Value = model.CASE_SERIAL;
+            parameters[3].Value = model.TSIGNTIME_BF;
+            parameters[4].Value = model.TBACKTIME_BF;
+            parameters[5].Value = model.SEND_TIME;
+            parameters[6].Value = model.SEND_CONTENT;
+            parameters[7].Value = model.CASE_TIME;
+            parameters[8].Value = model.TFDBACKTIME_BF;
+            parameters[9].Value = model.FILES;
+            parameters[10].Value = model.CreateTime;
+
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(CallCenterApi.Model.T_Sys_Affairs model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("update T_Sys_Affairs set ");
+            strSql.Append("F_WorkOrderId=@F_WorkOrderId,");
+            strSql.Append("TROWGUID=@TROWGUID,");
+            strSql.Append("CASE_SERIAL=@CASE_SERIAL,");
+            strSql.Append("TSIGNTIME_BF=@TSIGNTIME_BF,");
+            strSql.Append("TBACKTIME_BF=@TBACKTIME_BF,");
+            strSql.Append("SEND_TIME=@SEND_TIME,");
+            strSql.Append("SEND_CONTENT=@SEND_CONTENT,");
+            strSql.Append("CASE_TIME=@CASE_TIME,");
+            strSql.Append("TFDBACKTIME_BF=@TFDBACKTIME_BF,");
+            strSql.Append("FILES=@FILES,");
+            strSql.Append("CreateTime=@CreateTime");
+            strSql.Append(" where F_ID=@F_ID");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,100),
+                    new SqlParameter("@TROWGUID", SqlDbType.NVarChar,500),
+                    new SqlParameter("@CASE_SERIAL", SqlDbType.NVarChar,500),
+                    new SqlParameter("@TSIGNTIME_BF", SqlDbType.NVarChar,500),
+                    new SqlParameter("@TBACKTIME_BF", SqlDbType.NVarChar,500),
+                    new SqlParameter("@SEND_TIME", SqlDbType.NVarChar,500),
+                    new SqlParameter("@SEND_CONTENT", SqlDbType.NVarChar,500),
+                    new SqlParameter("@CASE_TIME", SqlDbType.NVarChar,500),
+                    new SqlParameter("@TFDBACKTIME_BF", SqlDbType.NVarChar,500),
+                    new SqlParameter("@FILES", SqlDbType.NVarChar,50),
+                    new SqlParameter("@CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)};
+            parameters[0].Value = model.F_WorkOrderId;
+            parameters[1].Value = model.TROWGUID;
+            parameters[2].Value = model.CASE_SERIAL;
+            parameters[3].Value = model.TSIGNTIME_BF;
+            parameters[4].Value = model.TBACKTIME_BF;
+            parameters[5].Value = model.SEND_TIME;
+            parameters[6].Value = model.SEND_CONTENT;
+            parameters[7].Value = model.CASE_TIME;
+            parameters[8].Value = model.TFDBACKTIME_BF;
+            parameters[9].Value = model.FILES;
+            parameters[10].Value = model.CreateTime;
+            parameters[11].Value = model.F_ID;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_ID)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete from T_Sys_Affairs ");
+            strSql.Append(" where F_ID=@F_ID");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_ID;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        /// <summary>
+        /// 批量删除数据
+        /// </summary>
+        public bool DeleteList(string F_IDlist)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete from T_Sys_Affairs ");
+            strSql.Append(" where F_ID in (" + F_IDlist + ")  ");
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Sys_Affairs GetModel(int F_ID)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_ID,F_WorkOrderId,TROWGUID,CASE_SERIAL,TSIGNTIME_BF,TBACKTIME_BF,SEND_TIME,SEND_CONTENT,CASE_TIME,TFDBACKTIME_BF,FILES,CreateTime from T_Sys_Affairs ");
+            strSql.Append(" where F_ID=@F_ID");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_ID", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_ID;
+
+            CallCenterApi.Model.T_Sys_Affairs model = new CallCenterApi.Model.T_Sys_Affairs();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Sys_Affairs GetModel(string F_WorkOrderId)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 * from T_Sys_Affairs WITH(NOLOCK) ");
+            strSql.Append(" where F_WorkOrderId=@F_WorkOrderId");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_WorkOrderId", SqlDbType.NVarChar,100)
+            };
+            parameters[0].Value = F_WorkOrderId;
+
+            CallCenterApi.Model.T_Sys_Affairs model = new CallCenterApi.Model.T_Sys_Affairs();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Sys_Affairs DataRowToModel(DataRow row)
+        {
+            CallCenterApi.Model.T_Sys_Affairs model = new CallCenterApi.Model.T_Sys_Affairs();
+            if (row != null)
+            {
+                if (row["F_ID"] != null && row["F_ID"].ToString() != "")
+                {
+                    model.F_ID = int.Parse(row["F_ID"].ToString());
+                }
+                if (row["F_WorkOrderId"] != null)
+                {
+                    model.F_WorkOrderId = row["F_WorkOrderId"].ToString();
+                }
+                if (row["TROWGUID"] != null)
+                {
+                    model.TROWGUID = row["TROWGUID"].ToString();
+                }
+                if (row["CASE_SERIAL"] != null)
+                {
+                    model.CASE_SERIAL = row["CASE_SERIAL"].ToString();
+                }
+                if (row["TSIGNTIME_BF"] != null)
+                {
+                    model.TSIGNTIME_BF = row["TSIGNTIME_BF"].ToString();
+                }
+                if (row["TBACKTIME_BF"] != null)
+                {
+                    model.TBACKTIME_BF = row["TBACKTIME_BF"].ToString();
+                }
+                if (row["SEND_TIME"] != null)
+                {
+                    model.SEND_TIME = row["SEND_TIME"].ToString();
+                }
+                if (row["SEND_CONTENT"] != null)
+                {
+                    model.SEND_CONTENT = row["SEND_CONTENT"].ToString();
+                }
+                if (row["CASE_TIME"] != null)
+                {
+                    model.CASE_TIME = row["CASE_TIME"].ToString();
+                }
+                if (row["TFDBACKTIME_BF"] != null)
+                {
+                    model.TFDBACKTIME_BF = row["TFDBACKTIME_BF"].ToString();
+                }
+                if (row["FILES"] != null)
+                {
+                    model.FILES = row["FILES"].ToString();
+                }
+                if (row["CreateTime"] != null && row["CreateTime"].ToString() != "")
+                {
+                    model.CreateTime = DateTime.Parse(row["CreateTime"].ToString());
+                }
+            }
+            return model;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select F_ID,F_WorkOrderId,TROWGUID,CASE_SERIAL,TSIGNTIME_BF,TBACKTIME_BF,SEND_TIME,SEND_CONTENT,CASE_TIME,TFDBACKTIME_BF,FILES,CreateTime ");
+            strSql.Append(" FROM T_Sys_Affairs ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /// <summary>
+        /// 获得前几行数据
+        /// </summary>
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select ");
+            if (Top > 0)
+            {
+                strSql.Append(" top " + Top.ToString());
+            }
+            strSql.Append(" F_ID,F_WorkOrderId,TROWGUID,CASE_SERIAL,TSIGNTIME_BF,TBACKTIME_BF,SEND_TIME,SEND_CONTENT,CASE_TIME,TFDBACKTIME_BF,FILES,CreateTime ");
+            strSql.Append(" FROM T_Sys_Affairs ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            strSql.Append(" order by " + filedOrder);
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /// <summary>
+        /// 获取记录总数
+        /// </summary>
+        public int GetRecordCount(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) FROM T_Sys_Affairs ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            object obj = DbHelperSQL.GetSingle(strSql.ToString());
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("SELECT * FROM ( ");
+            strSql.Append(" SELECT ROW_NUMBER() OVER (");
+            if (!string.IsNullOrEmpty(orderby.Trim()))
+            {
+                strSql.Append("order by T." + orderby);
+            }
+            else
+            {
+                strSql.Append("order by T.F_ID desc");
+            }
+            strSql.Append(")AS Row, T.*  from T_Sys_Affairs T ");
+            if (!string.IsNullOrEmpty(strWhere.Trim()))
+            {
+                strSql.Append(" WHERE " + strWhere);
+            }
+            strSql.Append(" ) TT");
+            strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex);
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /*
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+		{
+			SqlParameter[] parameters = {
+					new SqlParameter("@tblName", SqlDbType.VarChar, 255),
+					new SqlParameter("@fldName", SqlDbType.VarChar, 255),
+					new SqlParameter("@PageSize", SqlDbType.Int),
+					new SqlParameter("@PageIndex", SqlDbType.Int),
+					new SqlParameter("@IsReCount", SqlDbType.Bit),
+					new SqlParameter("@OrderType", SqlDbType.Bit),
+					new SqlParameter("@strWhere", SqlDbType.VarChar,1000),
+					};
+			parameters[0].Value = "T_Sys_Affairs";
+			parameters[1].Value = "F_ID";
+			parameters[2].Value = PageSize;
+			parameters[3].Value = PageIndex;
+			parameters[4].Value = 0;
+			parameters[5].Value = 0;
+			parameters[6].Value = strWhere;	
+			return CallCenterApi.RunProcedure("UP_GetRecordByPage",parameters,"ds");
+		}*/
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -276,6 +276,7 @@
     <Compile Include="Controllers\Wiki\NounInterpretationController.cs" />
     <Compile Include="Controllers\Wiki\PolicyController.cs" />
     <Compile Include="Controllers\Wiki\ProfessorController.cs" />
+    <Compile Include="Controllers\workorder\AffairsController.cs" />
     <Compile Include="Controllers\workorder\APPSController.cs" />
     <Compile Include="Controllers\workorder\AYWorkOrderController.cs" />
     <Compile Include="Controllers\workorder\NoticeCriticismController.cs" />
@@ -283,7 +284,6 @@
     <Compile Include="Controllers\workorder\WorkOrderController.cs" />
     <Compile Include="Controllers\workorder\WorkOrderNewController.cs" />
     <Compile Include="Controllers\workorder\WOVisitRecordsController.cs" />
-    <Compile Include="Controllers\workorder\ZhengWuController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
@@ -354,6 +354,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Views\Affairs\" />
     <Folder Include="Views\Functions\" />
     <Folder Include="Views\NounInterpretation\" />
     <Folder Include="Views\QCResult\" />

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Sms/SMSController.cs

@@ -229,7 +229,24 @@ namespace CallCenterApi.Interface.Controllers
                 return Error ("获取失败");
             }
         }
+        /// <summary>
+        /// 发送市长信箱短信
+        /// </summary>
+        /// <param name="phone"></param>
+        /// <param name="WorkOrderId"></param>
+        /// <returns></returns>
+        public ActionResult SendMailbox(string phone)
+        {
 
+            string count = "市长信箱留言网址：https://zwfw.anyang.gov.cn/#/mayor_mail";
+            string mag = "";
+            bool n = AddSmS(0, mag, count, phone, "272044", "", "");
+            if (n)
+                return Success("发送成功");
+            else
+                return Error("发送失败");
+           
+        }
 
         #region 接收短信
         [Authority]

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/FunctionsController.cs

@@ -65,11 +65,11 @@ namespace CallCenterApi.Interface.Controllers.Wiki
 
             if (stime.Trim() != "" && stime != "undefined")
             {
-                sql += " and F_FaBuShiJian >= '" + stime + " 00:00:00" + "' ";
+                sql += " and F_FaBuShiJian >= '" + stime  + "' ";
             }
             if (etime.Trim() != "" && etime != "undefined")
             {
-                sql += " and F_FaBuShiJian <= '" + etime + " 23:59:59" + "' ";
+                sql += " and F_FaBuShiJian <= '" + etime + "' ";
             }
             if (key > 0)
             {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/HotspotGlossaryController.cs

@@ -67,11 +67,11 @@ namespace CallCenterApi.Interface.Controllers.Wiki
 
             if (stime.Trim() != "" && stime != "undefined")
             {
-                sql += " and F_FaBuShiJian >= '" + stime + " 00:00:00" + "' ";
+                sql += " and F_FaBuShiJian >= '" + stime  + "' ";
             }
             if (etime.Trim() != "" && etime != "undefined")
             {
-                sql += " and F_FaBuShiJian <= '" + etime + " 23:59:59" + "' ";
+                sql += " and F_FaBuShiJian <= '" + etime  + "' ";
             }
 
             if (key > 0)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/LawGuideController.cs

@@ -67,11 +67,11 @@ namespace CallCenterApi.Interface.Controllers.Wiki
 
             if (stime.Trim() != "" && stime != "undefined")
             {
-                sql += " and F_FaBuShiJian >= '" + stime + " 00:00:00" + "' ";
+                sql += " and F_FaBuShiJian >= '" + stime + "' ";
             }
             if (etime.Trim() != "" && etime != "undefined")
             {
-                sql += " and F_FaBuShiJian <= '" + etime + " 23:59:59" + "' ";
+                sql += " and F_FaBuShiJian <= '" + etime + "' ";
             }
 
             if (key>0)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/PolicyController.cs

@@ -66,11 +66,11 @@ namespace CallCenterApi.Interface.Controllers.Wiki
 
             if (stime.Trim() != "" && stime != "undefined")
             {
-                sql += " and F_FaBuShiJian >= '" + stime + " 00:00:00" + "' ";
+                sql += " and F_FaBuShiJian >= '" + stime + "' ";
             }
             if (etime.Trim() != "" && etime != "undefined")
             {
-                sql += " and F_FaBuShiJian <= '" + etime + " 23:59:59" + "' ";
+                sql += " and F_FaBuShiJian <= '" + etime + "' ";
             }
             if (key > 0)
             {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/ProfessorController.cs

@@ -58,11 +58,11 @@ namespace CallCenterApi.Interface.Controllers.Wiki
 
             if (stime.Trim() != "" && stime != "undefined")
             {
-                sql += " and F_FaBuShiJian >= '" + stime + " 00:00:00" + "' ";
+                sql += " and F_FaBuShiJian >= '" + stime  + "' ";
             }
             if (etime.Trim() != "" && etime != "undefined")
             {
-                sql += " and F_FaBuShiJian <= '" + etime + " 23:59:59" + "' ";
+                sql += " and F_FaBuShiJian <= '" + etime  + "' ";
             }
 
             if (!string.IsNullOrEmpty(keyvalue))

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -56,7 +56,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             }
             if (isdc>0)
             {
-                var dtdc = DbHelperSQL.Query("select F_CustomerName 联系人姓名,F_Mobile 联系人电话,F_Email 邮箱,F_Address 地址,(select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and F_CusPhone=a.F_Mobile) as 工单数量 (select count(1) from dbo.T_Call_CallRecords where CallType=0  and CallNumber=a.F_Mobile ) as 来电数量"
+                var dtdc = DbHelperSQL.Query("select F_CustomerName 联系人姓名,F_Mobile 联系人电话,F_Email 邮箱,F_Address 地址,(select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and F_CusPhone=a.F_Mobile) as 工单数量 ,(select count(1) from dbo.T_Call_CallRecords where CallType=0  and CallNumber=a.F_Mobile ) as 来电数量"
                  + " from T_Cus_CustomerBase a WITH(NOLOCK) where 1=1 " + sql ).Tables[0];
                 var msg = new NPOIHelper().ExportToExcel("市民资料", dtdc);
                 if (msg == "")

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

@@ -1339,11 +1339,20 @@ namespace CallCenterApi.Interface.Controllers.report
                     MergerHot.MergerHotSource mergerHotSources = new MergerHot.MergerHotSource();
                     mergerHotSources.Data  = dt.ToString("MM月dd日");
                     mergerHotSources.MergerHot = new List<MergerHot.MergerHots>();
-                    for (int i = 0; i < source.Count + 2; i++)
+                    for (int i = 0; i < source.Count + 3; i++)
                     {
                         if (i < source.Count)
                         {
+                            
                             MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
+                            if (source[i].F_Value == "12345")
+                            {
+                                mergerHot.sort = source.Count;
+                            }
+                            else
+                            {
+                                mergerHot.sort = i-1;
+                            }
                                 mergerHot.Source  = source[i ].F_Value ;
                                 mergerHot.Call = CallRecords.Where(x => x.BeginTime
                                 .Value.Day   ==dt .Day && x.PhoneType == source[i].F_Value).Count();
@@ -1372,6 +1381,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         {
                             MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
                             mergerHot.Source = "当日小计";
+                            mergerHot.sort = source.Count + 1;
                             mergerHot.Call = CallRecords.Where(x => x.BeginTime
                             .Value.Day == dt.Day).Count();
                             mergerHot.Connect = CallRecords.Where(x => x.BeginTime
@@ -1396,6 +1406,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         {
                             MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
                             mergerHot.Source = "累计";
+                            mergerHot.sort = source.Count+2;
                             mergerHot.Call = CallRecords.Where(x => x.BeginTime 
                             .Value.Date  >=starttime  .Value.Date && x.BeginTime
                             .Value.Date <= dt.Date ).Count();
@@ -1420,7 +1431,36 @@ namespace CallCenterApi.Interface.Controllers.report
                             }
                             mergerHotSources.MergerHot.Add(mergerHot);
                         }
+                        else if (i == source.Count+2)
+                        {
+                            MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
+                            mergerHot.Source = "归并热线小计";
+                            mergerHot.sort = source.Count-1;
+                            mergerHot.Call = CallRecords.Where(x => x.BeginTime
+                            .Value.Day == dt.Day&&x.PhoneType !="12345").Count();
+                            mergerHot.Connect = CallRecords.Where(x => x.BeginTime
+                            .Value.Day == dt.Day && x.CallState == 1 && x.PhoneType != "12345").Count();
+                            mergerHot.Notconnected = CallRecords.Where(x => x.BeginTime
+                          .Value.Day == dt.Day && x.CallState == 0 && x.UserCode != ""
+                         && x.UserCode != null && x.PhoneType != "12345").Count();
+                            mergerHot.voluntarily = CallRecords.Where(x => x.BeginTime
+                          .Value.Day == dt.Day && x.CallState == 0 && (x.UserCode == ""
+                         || x.UserCode == null) && x.PhoneType != "12345").Count();
+                            mergerHot.callback = CallRecords.Where(x => x.BeginTime
+                         .Value.Day == dt.Day &&x .PhoneType != "12345" && x.Callback == 1).Count();
+                          
+                            if (mergerHot.Call > 0)
+                            {
+                                mergerHot.rate = string.Format("{0:f2}%", (float)mergerHot.Connect / (float)mergerHot.Call * 100);
+                            }
+                            else
+                            {
+                                mergerHot.rate = "100%";
+                            }
+                            mergerHotSources.MergerHot.Add(mergerHot);
+                        }
                     }
+                    mergerHotSources.MergerHot= mergerHotSources.MergerHot.OrderBy(x => x.sort).ToList ();
                     MergerHotSource.Add(mergerHotSources);
                 }
             }
@@ -1443,6 +1483,7 @@ namespace CallCenterApi.Interface.Controllers.report
                      || x.UserCode == null)).Count();
                         if (source[i].F_Value=="12345")
                         {
+                            mergerHot.sort = source.Count ;
                             if (mergerHot.Call > 0)
                             {
                                 mergerHot.rate = string.Format("{0:f2}%", (float)mergerHot.Connect / (float)mergerHot.Call * 100);
@@ -1452,6 +1493,10 @@ namespace CallCenterApi.Interface.Controllers.report
                                 mergerHot.rate = "100%";
                             }
                         }
+                        else
+                        {
+                            mergerHot.sort =i -1;
+                        }
                        
                         mergerHotSources.MergerHot.Add(mergerHot);
 
@@ -1460,6 +1505,7 @@ namespace CallCenterApi.Interface.Controllers.report
                     {
                         MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
                         mergerHot.Source ="当日小计";
+                        mergerHot.sort = source.Count + 1;
                         mergerHot.Call = CallRecords.Count();
                         mergerHot.Connect = CallRecords.Where(x =>x.CallState == 1).Count();
                         mergerHot.Notconnected = CallRecords.Where(x =>  x.CallState == 0 &&   x.UserCode != ""
@@ -1476,7 +1522,31 @@ namespace CallCenterApi.Interface.Controllers.report
                         }
                         mergerHotSources.MergerHot.Add(mergerHot);
                     }
+                    else if (i == source.Count+1)
+                    {
+                        MergerHot.MergerHots mergerHot = new MergerHot.MergerHots();
+                        mergerHot.Source = "归并热线小计";
+                        mergerHot.sort = source.Count - 1;
+                        mergerHot.Call = CallRecords.Where(x =>  x.PhoneType != "12345").Count();
+                        mergerHot.Connect = CallRecords.Where(x =>  x.PhoneType != "12345").Count();
+                        mergerHot.Notconnected = CallRecords.Where(x =>x.CallState == 0 && x.UserCode != ""
+                     && x.UserCode != null && x.PhoneType != "12345").Count();
+                        mergerHot.voluntarily = CallRecords.Where(x =>   x.CallState == 0 && (x.UserCode == ""
+                     || x.UserCode == null && x.PhoneType != "12345")).Count();
+                        mergerHot.callback = CallRecords.Where(x => x.PhoneType != "12345" && x.Callback == 1).Count();
+
+                        if (mergerHot.Call > 0)
+                        {
+                            mergerHot.rate = string.Format("{0:f2}%", (float)mergerHot.Connect / (float)mergerHot.Call * 100);
+                        }
+                        else
+                        {
+                            mergerHot.rate = "100%";
+                        }
+                        mergerHotSources.MergerHot.Add(mergerHot);
+                    }
                 }
+                mergerHotSources.MergerHot = mergerHotSources.MergerHot.OrderBy(x => x.sort).ToList();
                 MergerHotSource.Add(mergerHotSources);
             }
             if (isExport)

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

@@ -1960,7 +1960,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 string count = "您反映的事项已受理并转交相关部门处理，感谢您拨打市长热线！";
                 bool n = SMSController.AddSmS(133, "", count, modelT_Bus_WorkOrder.F_CusPhone, "146926", "");
-
+                Task.Run(() =>
+                {
+                    case_info(modelT_Bus_WorkOrder.F_WorkOrderId, "case_info");
+                }).ContinueWith(p => {
+                    System.Diagnostics.Debug.WriteLine(DateTime.Now);
+                });
                 trans.Complete();
             }
             var obj = new
@@ -3913,232 +3918,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return Content(obj.ToJson());
         }
         #region 政务对接
-        public class submit_case_info
-        {
-            public List<jsonList> jsonList { set; get; }
-        }
-        public class jsonList
-        {
-            /// <summary>
-            /// "工单编号",
-            /// </summary>
-            public string CASE_SERIAL { set; get; }
-            /// <summary>
-            /// "行政区划代码",
-            /// </summary>
-            public string AREA_CODE { set; get; }//"",
-                                                 /// <summary>
-                                                 /// "工单唯一标识",
-                                                 /// </summary>
-            public string CASE_ID { set; get; }//
-            /// <summary>
-            /// 诉求人姓名
-            /// </summary>
-            public string APPLICANT_NAME { set; get; }//"",
-            /// <summary>
-            /// 诉求人性别
-            /// </summary>
-            public string APPLICANT_SEX { set; get; }//"",
-                                                     /// <summary>
-                                                     /// 诉求人年龄
-                                                     /// </summary>
-            public string APPLICANT_AGE { set; get; }//"",
-                                                     /// <summary>
-                                                     /// 诉求人联系电话
-                                                     /// </summary>
-            public string APPLICAN_NUMBER { set; get; }//"",
-            /// <summary>
-            /// 诉求时间
-            /// </summary>
-            public string APPLICAN_TIME { set; get; }//"",
-            /// <summary>
-            /// 话务员姓名
-            /// </summary>
-            public string HWY_NAME { set; get; }//"",
-                                                /// <summary>
-                                                /// 话务员工号
-                                                /// </summary>
-            public string HWY_LOGINID { set; get; }//"",
-            /// <summary>
-            /// 登记时间
-            /// </summary>
-            public string CASE_TIME { set; get; }//"",
-            /// <summary>
-            /// 服务工单标题
-            /// </summary>
-            public string CASE_TITLE { set; get; }//"",
-            /// <summary>
-            /// 服务工单内容
-            /// </summary>
-            public string CASE_CONTENT { set; get; }//"",
-            /// <summary>
-            /// 诉求渠道
-            /// </summary>
-            public string CASE_SOURCE { set; get; }//"",
-            /// <summary>
-            /// 诉求类型
-            /// </summary>
-            public string CASE_TYPE { set; get; }//"",
-            /// <summary>
-            /// 诉求归口
-            /// </summary>
-            public string CASE_ACCORD { set; get; }//"",
-                                                   /// <summary>
-                                                   /// 诉求人信息是否公开
-                                                   /// </summary>
-            public string CASE_ISPUBLIC { set; get; }//"",
-                                                     /// <summary>
-                                                     /// 是否回访
-                                                     /// </summary>
-            public string CASE_ISVISIT { set; get; }//"",
-                                                    /// <summary>
-                                                    /// 紧急程度
-                                                    /// </summary>
-            public string CASE_ISURGENT { set; get; }//"",
-                                                     /// <summary>
-                                                     /// 经纬度
-                                                     /// </summary>
-            public string CASE_LNGLAT { set; get; }//"",
-                                                   /// <summary>
-                                                   /// 诉求情感
-                                                   /// </summary>
-            public string CASE_EMOTION { set; get; }//"",
-                                                    /// <summary>
-                                                    /// 诉求详细地址
-                                                    /// </summary>
-            public string CASE_ADDRESS { set; get; }//""
-        }
-        /// <summary>
-        /// 服务工单受理
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void case_info(T_Bus_WorkOrder model)
-        {
-            submit_case_info paras = new submit_case_info();
-            paras.jsonList = new List<jsonList>();
-            jsonList jsonList = new jsonList();
-            jsonList.CASE_SERIAL = model.F_WorkOrderId;
-            jsonList.AREA_CODE = DbHelperSQL.GetSingle(" select dbo.GetAreaCode('" + model.F_SourceArea + "')").ToString();
-            jsonList.CASE_ID = model.F_Id.ToString();
-            jsonList.APPLICANT_NAME = model.F_CusName.ToString();
-            if (model.F_CusSex == "0")
-                jsonList.APPLICANT_SEX = "1";
-            else if (model.F_CusSex == "1")
-                jsonList.APPLICANT_SEX = "2";
-            else
-                jsonList.APPLICANT_SEX = "3";
-            jsonList.APPLICANT_AGE = "";//没有
-            jsonList.APPLICAN_NUMBER = model.F_CusPhone;
-            jsonList.APPLICAN_TIME = model.F_CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");//没有
-            jsonList.HWY_NAME = DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_CreateUser + "')").ToString();
-            jsonList.HWY_LOGINID = model.F_CreateUser;
-            jsonList.CASE_TIME = model.F_CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
-            jsonList.CASE_TITLE = model.F_ComTitle;
-            jsonList.CASE_CONTENT = model.F_ComContent;
-            if (model.F_InfoSource == 1)
-                jsonList.CASE_SOURCE = "DH";
-            else if (model.F_InfoSource == 2527)
-                jsonList.CASE_SOURCE = "AP";
-            else if (model.F_InfoSource == 5)
-                jsonList.CASE_SOURCE = "WX";
-            else if (model.F_InfoSource == 3)
-                jsonList.CASE_SOURCE = "WB";
-            else
-                jsonList.CASE_SOURCE = "QT";//缺失
-            if (model.F_InfoType == 9)
-                jsonList.CASE_TYPE = "10";
-            else if (model.F_InfoType == 12)
-                jsonList.CASE_SOURCE = "15";
-            else if (model.F_InfoType == 11)
-                jsonList.CASE_SOURCE = "20";
-            else if (model.F_InfoType == 89)
-                jsonList.CASE_SOURCE = "25";
-            else if (model.F_InfoType == 10)
-                jsonList.CASE_SOURCE = "30";
-            else if (model.F_InfoType == 13)
-                jsonList.CASE_SOURCE = "35";
-            else
-                jsonList.CASE_SOURCE = "40";
-            jsonList.CASE_ACCORD = DbHelperSQL.GetSingle(" select dbo.GetDicRemark('" + model.F_Key + "')").ToString();
-            jsonList.CASE_ISPUBLIC = model.F_IsOpen.ToString();
-            if (model.F_IsResult == 0)
-                jsonList.CASE_ISPUBLIC = "1";
-            else
-                jsonList.CASE_ISPUBLIC = "0";
-            if (model.F_Level == 2)
-            {
-                jsonList.CASE_ISURGENT = "20";
-            }
-            else
-            {
-                jsonList.CASE_ISURGENT = "30";
-            }
-            jsonList.CASE_LNGLAT = "lat<" + model.F_Latitude + ">,lng<" + model.F_Longitude + ">";
-            jsonList.CASE_EMOTION = "";
-            jsonList.CASE_ADDRESS = model.F_SourceAddress;
-            //序列化参数
-            var jsonParam = JsonConvert.SerializeObject(paras);
-            var responseString = HttpMethods.HttpPost("submit_case_info", jsonParam, "application/json;charset=UTF-8");
-            Push jo = JsonConvert.DeserializeObject<Push>(responseString);
-            if (jo.code == "1")
-            {
-
-                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, "实时服务信息上报接口", "", "推送成功数：" + jo.body.successCount + " 推送总数：" + jo.body.totalCount);
-                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.caseserial))
-                        {
-                            error += " 推送工单号:" + it.caseserial;
-                        }
-                        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, "推送成功数：" + jo.body.successCount + " 推送总数：" + jo.body.totalCount);
-                object objres = DbHelperSQL.GetSingle(strSql);
+        string url = "http://172.16.0.10/Affairs/";
+        //  string url = "http://localhost:63660/Affairs/";
 
-            }
-        }
-        public class Push
+        public void case_info(string workorderid, string parameter)
         {
-            public string code { set; get; }
-            public string message { set; get; }
-
-            public body body { set; get; }
-        }
-        public class body
-        {
-            public errorObjs[] errorObjs { set; get; }
-            public string successCount { set; get; }
-            public string totalCount { set; get; }
-        }
-        public class errorObjs
-        {
-            public string resturl { set; get; }
-            public string errorid { set; get; }
-            public string errormsg { set; get; }
-            public string caseserial { set; get; }
+            WebClient web = new WebClient();
+            web.Encoding = Encoding.UTF8;
+            string Dataurl = web.DownloadString(url + parameter + "?workorderid=" + workorderid);
         }
+
         #endregion
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -24,8 +24,11 @@ namespace CallCenterApi.Interface
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
 
             _worker = new QuartzWorker();
-            var satisfactionClose = new SatisfactionClose();
-            _worker.AddWork(satisfactionClose);
+          //  var satisfactionClose = new SatisfactionClose();
+          //  _worker.AddWork(satisfactionClose);
+           // _worker.Start();
+            var ZhengWuDuiJie = new ZhengWuDuiJie();
+            _worker.AddWork(ZhengWuDuiJie);
             _worker.Start();
         }
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -171,6 +171,30 @@ namespace CallCenterApi.Interface.Models.Common
         {
             return new button(43, "审核拒绝");
         }
+        public static button Signfor()
+        {
+            return new button(44, "签收");
+        }
+        public static button Sendback()
+        {
+            return new button(45, "退回");
+        }
+        public static button delayback()
+        {
+            return new button(46, "退回申请延时");
+        }
+        public static button visits()
+        {
+            return new button(47, "省平台结案");
+        }
+        public static button ejdelay()
+        {
+            return new button(48, "省平台申请延时");
+        }
+        public static button Report()
+        {
+            return new button(49, "上报");
+        }
         /// <summary>
         /// 审核员退回
         /// </summary>
@@ -230,7 +254,7 @@ namespace CallCenterApi.Interface.Models.Common
         /// <param name="iszb"></param>
         /// <returns></returns>
         public static List<button> GetButtons(string state, string code, string iszb="", string iszbdw="",string ispd=""
-            ,int isproresult=0)
+            ,int isproresult=0,string user="")
         {
             //中心话务员(ZXHWY) 二级网络单位(WLDW) 管理员(GLY) 坐席班长(ZXBZ) 调度专员(ZXLD)
             //中心领导管理员(ZXLDGLYGLY) 话务主管(ZXBZ) 中心领导(ZXLDGLY) 话务组长(ZXBZ)
@@ -245,7 +269,7 @@ namespace CallCenterApi.Interface.Models.Common
                     //调度专员 质检专员可以进行编辑 zhengbingbing 20191017
                     if (code == "ZXLD" || code == "YSZY" || code == "ZJZY")
                         buttons.Add(edit());
-
+                   
                     //中心话务员 坐席班长 管理员
                     if (code == "ZXHWY" || code == "ZXBZ" || code == "GLY" || code == "DDZG")
                     {
@@ -265,7 +289,7 @@ namespace CallCenterApi.Interface.Models.Common
                     //调度专员 中心领导管理员 管理员
                     if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
                     {
-
+                        buttons.Add(Report());
                         buttons.Add(edit());
                         buttons.Add(back());// buttons.Add(assign());
                         //buttons.Add(approval());
@@ -308,6 +332,10 @@ namespace CallCenterApi.Interface.Models.Common
                         buttons.Add(feedback()); buttons.Add(reback());
                         if (iszbdw == "1" || code == "GLY" || code == "DDZG")
                         {
+                            
+                                if (user =="省平台")
+                                buttons.Add(ejdelay());
+                            else 
                             buttons.Add(delay());
                             if (ispd == "0" || ispd == "")
                             {
@@ -354,7 +382,7 @@ namespace CallCenterApi.Interface.Models.Common
                     //调度专员 中心领导管理员 管理员
                     if (code == "ZXLD" || code == "YSZY" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "MTDD")
                     {
-                        buttons.Add(edit());
+                     //   buttons.Add(edit());
                         buttons.Add(auditdelay());
                     }
                     //三级网络单位
@@ -393,12 +421,18 @@ namespace CallCenterApi.Interface.Models.Common
                         {
                             if (code == "ZJZY" || code == "GLY" || code == "ZXLD" || code == "YSZY" || code == "DDZG" || code == "MTDD")
                             {
+                                if (user=="省平台")
+                                    buttons.Add(visits());
+                                else
                                 buttons.Add(visit());
                                 //  buttons.Add(modify());
                             }
                             if (code == "ZXHWY")
                             {
-                                buttons.Add(visit());
+                                if (user == "省平台")
+                                    buttons.Add(visits());
+                                else
+                                    buttons.Add(visit());
                             }
                         }
                         //调度专员 中心领导管理员 管理员
@@ -442,7 +476,11 @@ namespace CallCenterApi.Interface.Models.Common
                     if (code == "WLDW" || code == "GLY" || code == "DDZG")
                     {
 
-                        buttons.Add(feedback()); buttons.Add(delay());
+                        buttons.Add(feedback());
+                        if (user == "省平台")
+                            buttons.Add(ejdelay());
+                        else
+                            buttons.Add(delay());
                         buttons.Add(split());
 
                         buttons.Add(reback());

CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -92,6 +92,7 @@
     <Compile Include="T_Repository_Operation.cs" />
     <Compile Include="T_SMS_Receive.cs" />
     <Compile Include="T_Sys_Achievements.cs" />
+    <Compile Include="T_Sys_Affairs.cs" />
     <Compile Include="T_Sys_Class.cs" />
     <Compile Include="T_Msg_Chat.cs" />
     <Compile Include="T_Msg_Chat_Map.cs" />

CallCenterApi/CallCenterApi.Model/T_Bus_Supervision.cs

@@ -41,7 +41,7 @@ namespace CallCenterApi.Model
             get { return _f_id; }
         }
         /// <summary>
-        /// 
+        /// 编号
         /// </summary>
         public string F_Code
         {
@@ -65,7 +65,7 @@ namespace CallCenterApi.Model
             get { return _f_serialnum; }
         }
         /// <summary>
-        /// 
+        /// 工单编号
         /// </summary>
         public string F_WorkOrderId
         {
@@ -73,7 +73,7 @@ namespace CallCenterApi.Model
             get { return _f_workorderid; }
         }
         /// <summary>
-        /// 
+        /// 标题
         /// </summary>
         public string F_Title
         {
@@ -81,7 +81,7 @@ namespace CallCenterApi.Model
             get { return _f_title; }
         }
         /// <summary>
-        /// 
+        /// 等级
         /// </summary>
         public string  F_Level
         {
@@ -89,7 +89,7 @@ namespace CallCenterApi.Model
             get { return _f_level; }
         }
         /// <summary>
-        /// 
+        /// 时限
         /// </summary>
         public DateTime? F_LimitTime
         {
@@ -97,7 +97,7 @@ namespace CallCenterApi.Model
             get { return _f_limittime; }
         }
         /// <summary>
-        /// 
+        /// 意见
         /// </summary>
         public string F_Opinion
         {
@@ -105,7 +105,7 @@ namespace CallCenterApi.Model
             get { return _f_opinion; }
         }
         /// <summary>
-        /// 
+        /// 创建时间
         /// </summary>
         public DateTime? F_CreateTime
         {
@@ -121,7 +121,7 @@ namespace CallCenterApi.Model
             get { return _f_dealuser; }
         }
         /// <summary>
-        /// 
+        /// 反馈意见
         /// </summary>
         public string F_Result
         {
@@ -153,7 +153,7 @@ namespace CallCenterApi.Model
             get { return _f_isdelete; }
         }
         /// <summary>
-        /// 
+        /// 涉嫌违规情形
         /// </summary>
         public string F_Situation
         {
@@ -161,7 +161,7 @@ namespace CallCenterApi.Model
             get { return _f_situation; }
         }
         /// <summary>
-        /// 
+        /// 附件
         /// </summary>
         public string F_File
         {
@@ -169,13 +169,16 @@ namespace CallCenterApi.Model
             get { return _f_file; }
         }
         /// <summary>
-        /// 
+        /// 内容
         /// </summary>
         public string F_Content
         {
             set { _f_content = value; }
             get { return _f_content; }
         }
+        /// <summary>
+        /// 是否回复
+        /// </summary>
         public int F_State { set; get; }
         #endregion Model
 

CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -715,42 +715,42 @@ namespace CallCenterApi.Model
         /// </summary>
         public DateTime? F_VisitExamineTime { set; get; }
         public string F_VisitAssignUser { set; get; }
-        /// <summary>
-        ///任务单唯一标识
-        /// </summary>
-        public string TROWGUID { set; get; }
-        /// <summary>
-        ///工单编号
-        /// </summary>
-        public string CASE_SERIAL { set; get; }
-        /// <summary>
-        ///应签收时限
-        /// </summary>
-        public string TSIGNTIME_BF { set; get; }
-        /// <summary>
-        ///应退回时限
-        /// </summary>
-        public string TBACKTIME_BF { set; get; }
-        /// <summary>
-        ///交办时间
-        /// </summary>
-        public string SEND_TIME { set; get; }
-        /// <summary>
-        ///交办意见
-        /// </summary>
-        public string SEND_CONTENT { set; get; }
-        /// <summary>
-        ///登记时间
-        /// </summary>
-        public string CASE_TIME { set; get; }
-        /// <summary>
-        ///应办结时间
-        /// </summary>
-        public string TFDBACKTIME_BF { set; get; }
-        /// <summary>
-        ///结案回传附件
-        /// </summary>
-        public string FILE { set; get; }
+        ///// <summary>
+        /////任务单唯一标识
+        ///// </summary>
+        //public string TROWGUID { set; get; }
+        ///// <summary>
+        /////工单编号
+        ///// </summary>
+        //public string CASE_SERIAL { set; get; }
+        ///// <summary>
+        /////应签收时限
+        ///// </summary>
+        //public string TSIGNTIME_BF { set; get; }
+        ///// <summary>
+        /////应退回时限
+        ///// </summary>
+        //public string TBACKTIME_BF { set; get; }
+        ///// <summary>
+        /////交办时间
+        ///// </summary>
+        //public string SEND_TIME { set; get; }
+        ///// <summary>
+        /////交办意见
+        ///// </summary>
+        //public string SEND_CONTENT { set; get; }
+        ///// <summary>
+        /////登记时间
+        ///// </summary>
+        //public string CASE_TIME { set; get; }
+        ///// <summary>
+        /////应办结时间
+        ///// </summary>
+        //public string TFDBACKTIME_BF { set; get; }
+        ///// <summary>
+        /////结案回传附件
+        ///// </summary>
+        //public string FILES { set; get; }
         #endregion Model
 
     }

CallCenterApi/CallCenterApi.Model/T_Call_CallRecords.cs

@@ -553,6 +553,8 @@ namespace CallCenterApi.Model
         }
         public string WorkOrderId { set; get; }
         public string PhoneType { set; get; }
+
+        public int? Callback { set; get; }
         #endregion Model
 
     }

CallCenterApi/CallCenterApi.Model/T_Sys_Affairs.cs

@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.Model
+{
+    /// <summary>
+    /// T_Sys_Affairs:实体类(属性说明自动提取数据库字段的描述信息)
+    /// </summary>
+    [Serializable]
+    public partial class T_Sys_Affairs
+    {
+        public T_Sys_Affairs()
+        { }
+        #region Model
+        private int _f_id;
+        private string _f_workorderid;
+        private string _trowguid;
+        private string _case_serial;
+        private string _tsigntime_bf;
+        private string _tbacktime_bf;
+        private string _send_time;
+        private string _send_content;
+        private string _case_time;
+        private string _tfdbacktime_bf;
+        private string _files;
+        private DateTime? _createtime;
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_ID
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_WorkOrderId
+        {
+            set { _f_workorderid = value; }
+            get { return _f_workorderid; }
+        }
+        /// <summary>
+        /// 任务单唯一标识
+        /// </summary>
+        public string TROWGUID
+        {
+            set { _trowguid = value; }
+            get { return _trowguid; }
+        }
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string CASE_SERIAL
+        {
+            set { _case_serial = value; }
+            get { return _case_serial; }
+        }
+        /// <summary>
+        /// 应签收时限
+        /// </summary>
+        public string TSIGNTIME_BF
+        {
+            set { _tsigntime_bf = value; }
+            get { return _tsigntime_bf; }
+        }
+        /// <summary>
+        /// 应退回时限
+        /// </summary>
+        public string TBACKTIME_BF
+        {
+            set { _tbacktime_bf = value; }
+            get { return _tbacktime_bf; }
+        }
+        /// <summary>
+        /// 交办时间
+        /// </summary>
+        public string SEND_TIME
+        {
+            set { _send_time = value; }
+            get { return _send_time; }
+        }
+        /// <summary>
+        /// 交办意见
+        /// </summary>
+        public string SEND_CONTENT
+        {
+            set { _send_content = value; }
+            get { return _send_content; }
+        }
+        /// <summary>
+        /// 登记时间
+        /// </summary>
+        public string CASE_TIME
+        {
+            set { _case_time = value; }
+            get { return _case_time; }
+        }
+        /// <summary>
+        /// 应办结时间
+        /// </summary>
+        public string TFDBACKTIME_BF
+        {
+            set { _tfdbacktime_bf = value; }
+            get { return _tfdbacktime_bf; }
+        }
+        /// <summary>
+        /// 结案回传附件
+        /// </summary>
+        public string FILES
+        {
+            set { _files = value; }
+            get { return _files; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? CreateTime
+        {
+            set { _createtime = value; }
+            get { return _createtime; }
+        }
+        #endregion Model
+
+    }
+}

CallCenterCommon/CallCenter.QuartzService/ZhengWuDuiJie.cs

@@ -16,8 +16,8 @@ namespace CallCenter.QuartzService
 
         public ZhengWuDuiJie()
         {
-            CronExpression = "0 0 0 * * ? *";
-          //  DoWork += MyWork_DoWork;
+            CronExpression = "0 0/5 * * * ? ";
+           DoWork += submit_dept_crnt_status;
         }
        public class Push
         {
@@ -36,40 +36,59 @@ namespace CallCenter.QuartzService
             public string errorid { set; get; }
             public string errormsg { set; get; }
         }
+        public class paras
+        {
+            public string AREA_CODE { set; get; }
+            public string CRNT_SEATNUM { set; get; }
+            public string CRNT_TELNUM { set; get; }
+            public string TDY_NUM { set; get; }
+            public string TDY_TELNUM { set; get; }
+            public string TDY_ZWNUM { set; get; }
+            public string TDY_WZNUM { set; get; }
+            public string TDY_WXNUM { set; get; }
+            public string TDY_APNUM { set; get; }
+            public string TDY_OTNUM { set; get; }
+            public string TDY_TELRATE { set; get; }
+        }
         /// <summary>
         /// 实时服务信息上报接口
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void submit_dept_crnt_status(object sender, EventArgs e)
+
         {
+            string token = GetToken();
+           
+            paras paras = new paras();
+            paras.AREA_CODE = "410500";
             string ZX = " select top 1  Checkin from rep_service WITH(NOLOCK)  ";
-            var CRNT_SEATNUM = DbHelperSQL.GetSingle(ZX);
+            paras. CRNT_SEATNUM = DbHelperSQL.GetSingle(ZX).ToString ();
 
             string TH = "select top 1  Conversation from rep_service WITH(NOLOCK)  ";
-            var CRNT_TELNUM = DbHelperSQL.GetSingle(TH);
+            paras.CRNT_TELNUM = DbHelperSQL.GetSingle(TH).ToString();
 
             string GDCount = "select COUNT(1) from  T_Bus_WorkOrder WITH(NOLOCK)  where datediff(day , F_CreateTime   , getdate())= 0  ";
-            var TDY_NUM = DbHelperSQL.GetSingle(GDCount);
+            paras.TDY_NUM = DbHelperSQL.GetSingle(GDCount).ToString();
 
             string ldCount = "SELECT COUNT(1) FROM T_Call_CallRecords  WITH(NOLOCK)  WHERE datediff(day , BeginTime    , getdate())= 0   ";
-            var TDY_TELNUM = DbHelperSQL.GetSingle(ldCount);
+            paras.TDY_TELNUM = DbHelperSQL.GetSingle(ldCount).ToString();
 
             string DHCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource = 1 AND datediff(day , F_CreateTime   , getdate())= 0    ";
-            var TDY_ZWNUM = DbHelperSQL.GetSingle(DHCount);
+            paras.TDY_ZWNUM = DbHelperSQL.GetSingle(DHCount).ToString();
 
             //暂时不知
-            string WZCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource = '' AND datediff(day , F_CreateTime   , getdate())= 0    ";
-            var TDY_WZNUM = DbHelperSQL.GetSingle(WZCount);
+            string WZCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource in(4,7,2459) AND datediff(day , F_CreateTime   , getdate())= 0    ";
+            paras.TDY_WZNUM = DbHelperSQL.GetSingle(WZCount).ToString();
 
             string WXCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource =5 AND datediff(day , F_CreateTime   , getdate())= 0    ";
-            var TDY_WXNUM = DbHelperSQL.GetSingle(WXCount);
+            paras.TDY_WXNUM = DbHelperSQL.GetSingle(WXCount).ToString();
 
-            string APPCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource =2527 AND datediff(day , F_CreateTime   , getdate())= 0    ";
-            var TDY_APNUM = DbHelperSQL.GetSingle(APPCount);
+            string APPCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource in (2527,2458 )AND datediff(day , F_CreateTime   , getdate())= 0    ";
+            paras.TDY_APNUM = DbHelperSQL.GetSingle(APPCount).ToString();
 
             string WBCount = "SELECT  COUNT(1)  FROM T_Bus_WorkOrder WITH(NOLOCK) WHERE F_InfoSource =3 AND datediff(day , F_CreateTime   , getdate())= 0    ";
-            var TDY_OTNUM = DbHelperSQL.GetSingle(WBCount);
+            paras.TDY_OTNUM = DbHelperSQL.GetSingle(WBCount).ToString();
 
 
             string jt = "SELECT COUNT(1) FROM T_Call_CallRecords  WITH(NOLOCK)  WHERE datediff(day , BeginTime    , getdate())= 0 AND CallState =1  ";
@@ -86,57 +105,95 @@ namespace CallCenter.QuartzService
             catch
             {
             }
-            var paras = new SortedDictionary<string, string>
-            {
-                {"AREA_CODE", "410500"},
-                {"CRNT_SEATNUM", CRNT_SEATNUM.ToString ()},
-                {"CRNT_TELNUM", CRNT_TELNUM.ToString ()},
-                {"TDY_NUM", TDY_NUM.ToString ()},
-                {"TDY_TELNUM",TDY_TELNUM.ToString ()},
-                {"TDY_ZWNUM", TDY_ZWNUM.ToString ()},
-                {"TDY_WZNUM", TDY_WZNUM.ToString ()},
-                {"TDY_WXNUM", TDY_WXNUM.ToString ()},
-                {"TDY_APNUM", TDY_WXNUM.ToString ()},
-                {"TDY_OTNUM", TDY_OTNUM.ToString ()},
-                {"TDY_TELRATE", TDY_TELRATE.ToString ()},
-            };
+
+            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);
             //序列化参数
-            var jsonParam = JsonConvert.SerializeObject(paras);
-            var responseString = HttpMethods.HttpPost("submit_dept_crnt_status", jsonParam, "application/json;charset=UTF-8");
-            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);
+            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()
+        {
+
+            //Dictionary<string, object> values = new Dictionary<string, object>();
+            //values.Add("client_id", "d620caf2-d00f-41a9-ae99-c6dfd435875e");
+            //values.Add("client_secret", "4f75914e-d517-4325-ac64-c321377b12f0");
+            //values.Add("grant_type", "client_credentials");
+            //var jsonParam = JsonConvert.SerializeObject(values);
+
+            string jsonParam = "client_id=d620caf2-d00f-41a9-ae99-c6dfd435875e&client_secret=4f75914e-d517-4325-ac64-c321377b12f0&grant_type=client_credentials";
+            var responseString = HttpMethods.HttpPost("http://59.227.104.17/epoint-sso-web/rest/oauth2/token", jsonParam);
+            Token jo = JsonConvert.DeserializeObject<Token>(responseString);
+            if (jo.status.code == "1")
+            {
+                if (!string.IsNullOrEmpty(jo.custom.access_token))
+                    return jo.custom.access_token;
+                else
+                    return "";
+            }
+            else
+                return "";
+
+        }
+        public class Token
+        {
+            public List<Controls> controls { set; get; }
+            public Custom custom { set; get; }
+            public Status status { set; get; }
+        }
+        public class Controls
+        {
+
+        }
+        public class Custom
+        {
+            public string access_token { set; get; }
+            public string refresh_token { set; get; }
+            public string jsessionid { set; get; }
+            public string expires_in { set; get; }
+        }
+        public class Status
+        {
+            public string code { set; get; }
+        }
+
     }
 }

CallCenterCommon/CallCenter.Utility/Http/HttpMethods.cs

@@ -49,6 +49,8 @@ namespace CallCenter.Utility
 
             try
             {
+                LogFactory.GetLogger("HttpPost").Debug(url + "\r\n" + param + "\r\n");
+
                 requestStream = new StreamWriter(request.GetRequestStream());
                 requestStream.Write(param);
                 requestStream.Close();
@@ -60,6 +62,8 @@ namespace CallCenter.Utility
                     responseStr = reader.ReadToEnd();
                     reader.Close();
                 }
+
+                LogFactory.GetLogger("HttpPost").Debug(url + "\r\n" + param + "\r\n" + responseStr);
             }
             catch (Exception ex)
             {

CallCenterCommon/CallCenter.Utility/NPOI/MergerHot.cs

@@ -38,6 +38,13 @@ namespace CallCenter.Utility
             /// 接通率
             /// </summary>
             public string rate { set; get; }
+
+            /// <summary>
+            /// 回拨量
+            /// </summary>
+            public int  callback { set; get; }
+
+            public int sort { set; get; }
         }
     }
 }

CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -1206,80 +1206,61 @@ namespace CallCenter.Utility
                         indexsource = 0;
                         sheet.SetColumnWidth(0, 12 * 300);
                     }
-                    else if (i >0&&i <= MergerHotSource[0].MergerHot.Count-2)
+                    else if (i >0&&i <= MergerHotSource[0].MergerHot.Count-4)
                     {
                         ICell cell = irow2.CreateCell(indexsource+1);
                         cell.SetCellValue(MergerHotSource[0].MergerHot[i - 1].Source);
                         cell.CellStyle = cellStylebt2;
                         if (i ==1 )
                         {
-                            if (MergerHotSource[0].MergerHot[i - 1].Source=="12345")
+                            indexsource = 5;
+                            for (int z = 2; z <= indexsource - 1; z++)
                             {
-                                indexsource = 6;
-                                for (int z=2;z <= indexsource - 1;z++)
-                                {
-                                    ICell cell4 = irow2.CreateCell(z);
-                                    cell4.CellStyle = cellStylebt2;
-                                }
-                                sheet.AddMergedRegion(new CellRangeAddress(3, 3, 1, indexsource-1));
-                            }
-                            else
-                            {
-                                indexsource = 5;
-                                for (int z = 2; z <= indexsource - 1; z++)
-                                {
-                                    ICell cell4 = irow2.CreateCell(z);
-                                    cell4.CellStyle = cellStylebt2;
-                                }
-                                sheet.AddMergedRegion(new CellRangeAddress(3, 3, 1, indexsource-1));
+                                ICell cell4 = irow2.CreateCell(z);
+                                cell4.CellStyle = cellStylebt2;
                             }
+                            sheet.AddMergedRegion(new CellRangeAddress(3, 3, 1, indexsource - 1));
                         }
                         else
                         {
-                            if (MergerHotSource[0].MergerHot[i - 1].Source == "12345")
+                            for (int z = indexsource + 2; z <= indexsource + 4; z++)
                             {
-                                for (int z = indexsource + 2; z <= indexsource + 5 ; z++)
-                                {
-                                    ICell cell4 = irow2.CreateCell(z);
-                                    cell4.CellStyle = cellStylebt2;
-                                }
-                                sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 5));
-                                indexsource = indexsource + 6;
-
-                            }
-                            else
-                            {
-                                for (int z = indexsource + 2; z <= indexsource + 4; z++)
-                                {
-                                    ICell cell4 = irow2.CreateCell(z);
-                                    cell4.CellStyle = cellStylebt2;
-                                }
-                                sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 4));
-                                indexsource += 5;
-                               
+                                ICell cell4 = irow2.CreateCell(z);
+                                cell4.CellStyle = cellStylebt2;
                             }
+                            sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 4));
+                            indexsource += 5;
                         }
                        
+                       
                     }
                     else
                     {
                         ICell cell = irow2.CreateCell(indexsource + 1);
-                        if (i == MergerHotSource[0].MergerHot.Count - 1)
-                        {
-                            cell.SetCellValue("当日小计");
-                        }
-                        else if (i == MergerHotSource[0].MergerHot.Count )
+                        cell.SetCellValue(MergerHotSource[0].MergerHot[i - 1].Source);
+                        if (i == MergerHotSource[0].MergerHot.Count - 3)
                         {
-                            cell.SetCellValue("累计");
+                            for (int z = indexsource + 2; z <= indexsource + 6; z++)
+                            {
+                                ICell cell4 = irow2.CreateCell(z);
+                                cell4.CellStyle = cellStylebt2;
+                            }
+                            sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 6));
+                            cell.CellStyle = cellStylebt3;
+                            indexsource += 7;
                         }
-                        for (int z = indexsource + 2; z <= indexsource + 5; z++)
+                        else
                         {
-                            ICell cell4 = irow2.CreateCell(z);
-                            cell4.CellStyle = cellStylebt2;
+                            for (int z = indexsource + 2; z <= indexsource + 5; z++)
+                            {
+                                ICell cell4 = irow2.CreateCell(z);
+                                cell4.CellStyle = cellStylebt2;
+                            }
+                            sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 5));
+                            cell.CellStyle = cellStylebt3;
+                            indexsource += 6;
                         }
-                        sheet.AddMergedRegion(new CellRangeAddress(3, 3, indexsource + 1, indexsource + 5));
-                        cell.CellStyle = cellStylebt3;
-                        indexsource += 6;
+                      
                     }
                 }
                 IRow irow3 = sheet.CreateRow(4);
@@ -1293,209 +1274,9 @@ namespace CallCenter.Utility
                         cell.SetCellValue("日期");
                         cell.CellStyle = cellStylebt4;
                     }
-                    else if (i > 0 && i <= MergerHotSource[0].MergerHot.Count - 2)
+                    else if (i > 0 && i <= MergerHotSource[0].MergerHot.Count - 4)
                     {
-                   
-                        if (i == 1)
-                        {
-                            indexsource = 1;
-                            if (MergerHotSource[0].MergerHot[i - 1].Source == "12345")
-                            {
-                                for (int j = 0; j < 5; j++)
-                                {
-                                    ICell cell = irow3.CreateCell(indexsource);
-                                    switch (j)
-                                    {
-                                        case 0:
-                                            cell.SetCellValue("来\n电\n量\n");
-                                        
-                                            cell.CellStyle = cellStylebt5;
-                                          
-                                            sheet.SetColumnWidth(1, 12 * 100);
-                                            break;
-                                        case 1:
-                                            cell.SetCellValue("接\n通\n量\n");
-                                           
-                                            cell.CellStyle = cellStylebt9;
-                                            sheet.SetColumnWidth(2, 12 * 100);
-                                          
-                                            break;
-                                        case 2:
-                                            cell.SetCellValue("接\n通\n率\n");
-                                           
-                                            cell.CellStyle = cellStylebt13;
-                                            sheet.SetColumnWidth(3, 12 * 100);
-                                           
-                                           
-                                            break;
-                                        case 3:
-                                            cell.SetCellValue("未\n接\n通\n");
-                                            
-                                            cell.CellStyle = cellStylebt4;
-                                           
-                                           
-                                            sheet.SetColumnWidth(4, 12 * 100);
-                                            break;
-                                        case 4:
-                                            cell.SetCellValue("主\n动\n放\n弃\n");
-                                           
-                                            cell.CellStyle = cellStylebt4;
-                                            sheet.SetColumnWidth(5, 12 * 100);
-                                            break;
-                                      
-                                    }
-                                    indexsource += 1;
-                                }
-                                sheet.SetColumnWidth(6, 12 * 35);
-                                indexsource = 6;
-                            }
-                            else
-                            {
-                                indexsource = 1;
-                                for (int j = 0; j < 4; j++)
-                                {
-                                    ICell cell = irow3.CreateCell(indexsource);
-                                    switch (j)
-                                    {
-                                        case 0:
-                                            cell.SetCellValue("来\n电\n量\n");
-                                           
-                                            cell.CellStyle = cellStylebt5;
-                                          
-                                            sheet.SetColumnWidth(1, 12 * 100);
-                                          
-                                            break;
-                                        case 1:
-                                            cell.SetCellValue("接\n通\n量\n");
-                                           
-                                            cell.CellStyle = cellStylebt9;
-                                            sheet.SetColumnWidth(2, 12 * 100);
-                                          
-                                          
-                                            break;
-                                        case 2:
-                                            cell.SetCellValue("未\n接\n通\n");
-                                            
-                                            cell.CellStyle = cellStylebt4;
-                                          
-                                          
-                                            sheet.SetColumnWidth(3, 12 * 100);
-                                            break;
-                                        case 3:
-                                            cell.SetCellValue("主\n动\n放\n弃\n");
-                                           
-                                            cell.CellStyle = cellStylebt4;
-                                           
-                                          
-                                            sheet.SetColumnWidth(4, 12 * 100);
-                                            break;
-
-                                    }
-                                  
-                                    indexsource += 1;
-                                }
-                                sheet.SetColumnWidth(5, 12 * 35);
-                                indexsource = 5;
-                            }
-                        }
-                        else
-                        {
-                            if (MergerHotSource[0].MergerHot[i - 1].Source == "12345")
-                            {
-                                for (int j = 0; j < 5; j++)
-                                {
-                                    indexsource += 1;
-                                    ICell cell = irow3.CreateCell(indexsource);
-                                    switch (j)
-                                    {
-                                        case 0:
-                                            cell.SetCellValue("来\n电\n量\n");
-                                            cell.CellStyle = cellStylebt5;
-                                           
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
-                                            break;
-                                        case 1:
-                                            cell.SetCellValue("接\n通\n量\n");
-                                            cell.CellStyle = cellStylebt9;
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
-                                           
-                                            break;
-                                        case 2:
-                                            cell.SetCellValue("接\n通\n率\n");
-                                            cell.CellStyle = cellStylebt2;
-                                            sheet.SetColumnWidth(7, 12 * 100);
-                                           
-                                            break;
-                                        case 3:
-                                            cell.SetCellValue("未\n接\n通\n");
-                                            cell.CellStyle = cellStylebt4;
-                                          
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
-                                            break;
-                                        case 4:
-                                            cell.SetCellValue("主\n动\n放\n弃\n");
-                                            cell.CellStyle = cellStylebt4;
-                                          
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
-                                            break;
-                                    }
-                                  
-                                }
-                                indexsource += 1;
-                                sheet.SetColumnWidth(indexsource, 12 * 35);
-
-                            }
-                            else
-                            {
-                                for (int j = 0; j < 4; j++)
-                                {
-                                    indexsource += 1;
-                                    ICell cell = irow3.CreateCell(indexsource);
-                                    switch (j)
-                                    {
-                                        case 0:
-                                            cell.SetCellValue("来\n电\n量\n");
-                                           
-                                            cell.CellStyle = cellStylebt5;
-                                          
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
-                                            break;
-                                        case 1:
-                                            cell.SetCellValue("接\n通\n量\n");
-                                           
-                                            cell.CellStyle = cellStylebt9;
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
-                                           
-                                            break;
-                                        case 2:
-                                            cell.SetCellValue("未\n接\n通\n");
-                                           
-                                            cell.CellStyle = cellStylebt4;
-                                           
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
-                                            break;
-                                        case 3:
-                                            cell.SetCellValue("主\n动\n放\n弃\n");
-                                          
-                                            cell.CellStyle = cellStylebt4;
-                                          
-                                            sheet.SetColumnWidth(indexsource, 12 * 100);
-                                            break;
-
-                                    }
-                                 
-                                  
-                                }
-
-                                indexsource += 1;
-                                sheet.SetColumnWidth(indexsource, 12 * 35);
-                            }
-                          
-                        }
-                    }
-                    else
-                    {
-                        for (int j = 0; j < 5; j++)
+                        for (int j = 0; j < 4; j++)
                         {
                             indexsource += 1;
                             ICell cell = irow3.CreateCell(indexsource);
@@ -1503,47 +1284,205 @@ namespace CallCenter.Utility
                             {
                                 case 0:
                                     cell.SetCellValue("来\n电\n量\n");
-                                
+
                                     cell.CellStyle = cellStylebt5;
-                                  
-                                    sheet.SetColumnWidth(indexsource, 12 * 100);
+                                    sheet.AutoSizeColumn(indexsource);
+                                    //sheet.SetColumnWidth(indexsource, 12 * 150);
                                     break;
                                 case 1:
                                     cell.SetCellValue("接\n通\n量\n");
-                                   
+
                                     cell.CellStyle = cellStylebt9;
-                                    sheet.SetColumnWidth(indexsource, 12 * 100);
-                                   
+                                    sheet.AutoSizeColumn(indexsource);
+                                    // sheet.SetColumnWidth(indexsource, 12 * 150);
+
                                     break;
                                 case 2:
                                     cell.SetCellValue("未\n接\n通\n");
-                                  
+
                                     cell.CellStyle = cellStylebt4;
-                                  
-                                    sheet.SetColumnWidth(indexsource, 12 * 100);
+                                    sheet.AutoSizeColumn(indexsource);
+                                  //  sheet.SetColumnWidth(indexsource, 12 * 150);
                                     break;
                                 case 3:
                                     cell.SetCellValue("主\n动\n放\n弃\n");
-                                  
+
                                     cell.CellStyle = cellStylebt4;
-                                   
-                                    sheet.SetColumnWidth(indexsource, 12 * 100);
-                                    break;
-                                case 4:
-                                    cell.SetCellValue("接\n通\n率\n");
-                                   
-                                    cell.CellStyle = cellStylebt10;
-                                    sheet.SetColumnWidth(indexsource, 12 * 200);
-                                  
-                               
+                                    sheet.AutoSizeColumn(indexsource);
+                                    // sheet.SetColumnWidth(indexsource, 12 * 150);
                                     break;
+
                             }
-                        
+
 
                         }
                         indexsource += 1;
                         sheet.SetColumnWidth(indexsource, 12 * 35);
                     }
+                    else
+                    {
+                        if (MergerHotSource[0].MergerHot[i - 1].Source == "12345")
+                        {
+                            for (int j = 0; j < 5; j++)
+                            {
+                                indexsource += 1;
+                                ICell cell = irow3.CreateCell(indexsource);
+                                switch (j)
+                                {
+                                    case 0:
+                                        cell.SetCellValue("来\n电\n量\n");
+                                        cell.CellStyle = cellStylebt5;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        // sheet.SetColumnWidth(indexsource, 12 * 150);
+                                        break;
+                                    case 1:
+                                        cell.SetCellValue("接\n通\n量\n");
+                                        cell.CellStyle = cellStylebt9;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
+
+                                        break;
+                                    case 2:
+                                        cell.SetCellValue("接\n通\n率\n");
+                                        cell.CellStyle = cellStylebt2;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //  sheet.SetColumnWidth(7, 12 * 150);
+
+                                        break;
+                                    case 3:
+                                        cell.SetCellValue("未\n接\n通\n");
+                                        cell.CellStyle = cellStylebt4;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
+                                        break;
+                                    case 4:
+                                        cell.SetCellValue("主\n动\n放\n弃\n");
+                                        cell.CellStyle = cellStylebt4;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
+                                        break;
+                                }
+
+                            }
+                            indexsource += 1;
+                            sheet.SetColumnWidth(indexsource, 12 * 35);
+
+                        }
+                        else if (MergerHotSource[0].MergerHot[i - 1].Source == "归并热线小计")
+                        {
+                            for (int j = 0; j < 6; j++)
+                            {
+                                indexsource += 1;
+                                ICell cell = irow3.CreateCell(indexsource);
+                                switch (j)
+                                {
+                                    case 0:
+                                        cell.SetCellValue("来\n电\n量\n");
+
+                                        cell.CellStyle = cellStylebt5;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //sheet.SetColumnWidth(indexsource, 12 * 150);
+                                        break;
+                                    case 1:
+                                        cell.SetCellValue("接\n通\n量\n");
+
+                                        cell.CellStyle = cellStylebt9;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        // sheet.SetColumnWidth(indexsource, 12 * 150);
+
+                                        break;
+                                    case 2:
+                                        cell.SetCellValue("未\n接\n通\n");
+
+                                        cell.CellStyle = cellStylebt4;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        // sheet.SetColumnWidth(indexsource, 12 * 150);
+                                        break;
+                                    case 3:
+                                        cell.SetCellValue("主\n动\n放\n弃\n");
+
+                                        cell.CellStyle = cellStylebt4;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
+                                        break;
+                                    case 4:
+                                        cell.SetCellValue("接\n通\n率\n");
+
+                                        cell.CellStyle = cellStylebt10;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 200);
+
+                                        break;
+                                    case 5:
+                                        cell.SetCellValue("回\n拨\n量\n");
+                                        cell.CellStyle = cellStylebt4;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //   sheet.SetColumnWidth(indexsource, 12 * 150);
+                                        break;
+                                }
+
+
+                            }
+                            indexsource += 1;
+                            sheet.SetColumnWidth(indexsource, 12 * 35);
+
+                        }
+                        else 
+                        {
+                            for (int j = 0; j < 5; j++)
+                            {
+                                indexsource += 1;
+                                ICell cell = irow3.CreateCell(indexsource);
+                                switch (j)
+                                {
+                                    case 0:
+                                        cell.SetCellValue("来\n电\n量\n");
+
+                                        cell.CellStyle = cellStylebt5;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
+                                        break;
+                                    case 1:
+                                        cell.SetCellValue("接\n通\n量\n");
+
+                                        cell.CellStyle = cellStylebt9;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //   sheet.SetColumnWidth(indexsource, 12 * 150);
+
+                                        break;
+                                    case 2:
+                                        cell.SetCellValue("未\n接\n通\n");
+
+                                        cell.CellStyle = cellStylebt4;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 150);
+                                        break;
+                                    case 3:
+                                        cell.SetCellValue("主\n动\n放\n弃\n");
+
+                                        cell.CellStyle = cellStylebt4;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        // sheet.SetColumnWidth(indexsource, 12 * 150);
+                                        break;
+                                    case 4:
+                                        cell.SetCellValue("接\n通\n率\n");
+
+                                        cell.CellStyle = cellStylebt10;
+                                        sheet.AutoSizeColumn(indexsource);
+                                        //  sheet.SetColumnWidth(indexsource, 12 * 200);
+
+                                        break;
+                                    
+                                }
+
+
+                            }
+                            indexsource += 1;
+                            sheet.SetColumnWidth(indexsource, 12 * 35);
+
+                        }
+
+                    }
                 }
 
                 for (int i=0;i< MergerHotSource.Count; i++)
@@ -1564,6 +1503,42 @@ namespace CallCenter.Utility
                             {
                                 if (j == 1)
                                 {
+                                    for (int z = 0; z < 4; z++)
+                                    {
+                                        indexsource += 1;
+                                        ICell cell = irow4.CreateCell(indexsource);
+                                        switch (z)
+                                        {
+                                            case 0:
+                                                cell.SetCellValue(MergerHotSource[i]
+                                                    .MergerHot[j - 1].Call);
+                                                cell.CellStyle = cellStylebt8;
+                                                break;
+                                            case 1:
+                                                cell.SetCellValue(MergerHotSource[i]
+                                                    .MergerHot[j - 1].Connect);
+                                                cell.CellStyle = cellStylebt8;
+                                                break;
+
+                                            case 2:
+                                                cell.SetCellValue(MergerHotSource[i]
+                                                    .MergerHot[j - 1].Notconnected);
+                                                cell.CellStyle = cellStylebt8;
+                                                break;
+                                            case 3:
+                                                cell.SetCellValue(MergerHotSource[i]
+                                                    .MergerHot[j - 1].voluntarily);
+                                                cell.CellStyle = cellStylebt8;
+
+
+                                                break;
+
+                                        }
+                                    }
+                                    indexsource += 1;
+                                }
+                                else
+                                {
                                     if (MergerHotSource[i].MergerHot[j - 1].Source == "12345")
                                     {
                                         for (int z = 0; z < 5; z++)
@@ -1576,59 +1551,33 @@ namespace CallCenter.Utility
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].Call);
                                                     cell.CellStyle = cellStylebt8;
+
+
                                                     break;
                                                 case 1:
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].Connect);
                                                     cell.CellStyle = cellStylebt8;
+
+
+
                                                     break;
                                                 case 2:
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].rate);
                                                     cell.CellStyle = cellStylebt8;
-                                                    break;
-                                                case 3:
-                                                    cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].Notconnected);
-                                                    cell.CellStyle = cellStylebt8;
 
-                                                    break;
-                                                case 4:
-                                                    cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].voluntarily);
-                                                    cell.CellStyle = cellStylebt8;
-                                                    break;
 
-                                            }
-                                        }
-                                        indexsource += 1;
 
-                                    }
-                                    else
-                                    {
-                                        for (int z = 0; z < 4; z++)
-                                        {
-                                            indexsource += 1;
-                                            ICell cell = irow4.CreateCell(indexsource);
-                                            switch (z)
-                                            {
-                                                case 0:
-                                                    cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].Call);
-                                                    cell.CellStyle = cellStylebt8;
                                                     break;
-                                                case 1:
-                                                    cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].Connect);
-                                                    cell.CellStyle = cellStylebt8;
-                                                    break;
-
-                                                case 2:
+                                                case 3:
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].Notconnected);
                                                     cell.CellStyle = cellStylebt8;
+
+
                                                     break;
-                                                case 3:
+                                                case 4:
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].voluntarily);
                                                     cell.CellStyle = cellStylebt8;
@@ -1639,12 +1588,13 @@ namespace CallCenter.Utility
                                             }
                                         }
                                         indexsource += 1;
+
+
                                     }
-                                }
-                                else
-                                {
-                                    if (MergerHotSource[i].MergerHot[j - 1].Source == "12345")
+                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "当日小计"
+                                        || MergerHotSource[i].MergerHot[j - 1].Source == "累计")
                                     {
+
                                         for (int z = 0; z < 5; z++)
                                         {
                                             indexsource += 1;
@@ -1655,38 +1605,26 @@ namespace CallCenter.Utility
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].Call);
                                                     cell.CellStyle = cellStylebt8;
-
-
                                                     break;
                                                 case 1:
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].Connect);
                                                     cell.CellStyle = cellStylebt8;
-
-
-
                                                     break;
                                                 case 2:
                                                     cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].rate);
+                                                        .MergerHot[j - 1].Notconnected);
                                                     cell.CellStyle = cellStylebt8;
-
-
-
                                                     break;
                                                 case 3:
                                                     cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].Notconnected);
+                                                        .MergerHot[j - 1].voluntarily);
                                                     cell.CellStyle = cellStylebt8;
-
-
                                                     break;
                                                 case 4:
                                                     cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].voluntarily);
+                                                        .MergerHot[j - 1].rate);
                                                     cell.CellStyle = cellStylebt8;
-
-
                                                     break;
 
                                             }
@@ -1695,11 +1633,11 @@ namespace CallCenter.Utility
 
 
                                     }
-                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "当日小计"
-                                        || MergerHotSource[i].MergerHot[j - 1].Source == "累计")
+                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "归并热线小计"
+                                    )
                                     {
 
-                                        for (int z = 0; z < 5; z++)
+                                        for (int z = 0; z < 6; z++)
                                         {
                                             indexsource += 1;
                                             ICell cell = irow4.CreateCell(indexsource);
@@ -1730,6 +1668,11 @@ namespace CallCenter.Utility
                                                         .MergerHot[j - 1].rate);
                                                     cell.CellStyle = cellStylebt8;
                                                     break;
+                                                case 5:
+                                                    cell.SetCellValue(MergerHotSource[i]
+                                                        .MergerHot[j - 1].callback );
+                                                    cell.CellStyle = cellStylebt8;
+                                                    break;
 
                                             }
                                         }
@@ -1783,6 +1726,42 @@ namespace CallCenter.Utility
                             {
                                 if (j == 1)
                                 {
+                                    for (int z = 0; z < 4; z++)
+                                    {
+                                        indexsource += 1;
+                                        ICell cell = irow4.CreateCell(indexsource);
+                                        switch (z)
+                                        {
+                                            case 0:
+                                                cell.SetCellValue(MergerHotSource[i]
+                                                    .MergerHot[j - 1].Call);
+                                                cell.CellStyle = cellStylebt15;
+                                                break;
+                                            case 1:
+                                                cell.SetCellValue(MergerHotSource[i]
+                                                    .MergerHot[j - 1].Connect);
+                                                cell.CellStyle = cellStylebt14;
+                                                break;
+
+                                            case 2:
+                                                cell.SetCellValue(MergerHotSource[i]
+                                                    .MergerHot[j - 1].Notconnected);
+                                                cell.CellStyle = cellStylebt11;
+                                                break;
+                                            case 3:
+                                                cell.SetCellValue(MergerHotSource[i]
+                                                    .MergerHot[j - 1].voluntarily);
+                                                cell.CellStyle = cellStylebt11;
+
+
+                                                break;
+
+                                        }
+                                    }
+                                    indexsource += 1;
+                                }
+                                else
+                                {
                                     if (MergerHotSource[i].MergerHot[j - 1].Source == "12345")
                                     {
                                         for (int z = 0; z < 5; z++)
@@ -1795,37 +1774,51 @@ namespace CallCenter.Utility
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].Call);
                                                     cell.CellStyle = cellStylebt15;
+
+
                                                     break;
                                                 case 1:
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].Connect);
                                                     cell.CellStyle = cellStylebt14;
+
+
+
                                                     break;
                                                 case 2:
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].rate);
                                                     cell.CellStyle = cellStylebt6;
+
+
+
                                                     break;
                                                 case 3:
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].Notconnected);
                                                     cell.CellStyle = cellStylebt11;
 
+
                                                     break;
                                                 case 4:
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].voluntarily);
                                                     cell.CellStyle = cellStylebt11;
+
+
                                                     break;
 
                                             }
                                         }
                                         indexsource += 1;
 
+
                                     }
-                                    else
+                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "当日小计"
+                                        || MergerHotSource[i].MergerHot[j - 1].Source == "累计")
                                     {
-                                        for (int z = 0; z < 4; z++)
+
+                                        for (int z = 0; z < 5; z++)
                                         {
                                             indexsource += 1;
                                             ICell cell = irow4.CreateCell(indexsource);
@@ -1841,7 +1834,6 @@ namespace CallCenter.Utility
                                                         .MergerHot[j - 1].Connect);
                                                     cell.CellStyle = cellStylebt14;
                                                     break;
-
                                                 case 2:
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].Notconnected);
@@ -1851,61 +1843,11 @@ namespace CallCenter.Utility
                                                     cell.SetCellValue(MergerHotSource[i]
                                                         .MergerHot[j - 1].voluntarily);
                                                     cell.CellStyle = cellStylebt11;
-
-
-                                                    break;
-
-                                            }
-                                        }
-                                        indexsource += 1;
-                                    }
-                                }
-                                else
-                                {
-                                    if (MergerHotSource[i].MergerHot[j - 1].Source == "12345")
-                                    {
-                                        for (int z = 0; z < 5; z++)
-                                        {
-                                            indexsource += 1;
-                                            ICell cell = irow4.CreateCell(indexsource);
-                                            switch (z)
-                                            {
-                                                case 0:
-                                                    cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].Call);
-                                                    cell.CellStyle = cellStylebt15;
-
-
-                                                    break;
-                                                case 1:
-                                                    cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].Connect);
-                                                    cell.CellStyle = cellStylebt14;
-
-
-
-                                                    break;
-                                                case 2:
-                                                    cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].rate);
-                                                    cell.CellStyle = cellStylebt6;
-
-
-
-                                                    break;
-                                                case 3:
-                                                    cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].Notconnected);
-                                                    cell.CellStyle = cellStylebt11;
-
-
                                                     break;
                                                 case 4:
                                                     cell.SetCellValue(MergerHotSource[i]
-                                                        .MergerHot[j - 1].voluntarily);
-                                                    cell.CellStyle = cellStylebt11;
-
-
+                                                        .MergerHot[j - 1].rate);
+                                                    cell.CellStyle = cellStylebt12;
                                                     break;
 
                                             }
@@ -1914,11 +1856,10 @@ namespace CallCenter.Utility
 
 
                                     }
-                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "当日小计"
-                                        || MergerHotSource[i].MergerHot[j - 1].Source == "累计")
+                                    else if (MergerHotSource[i].MergerHot[j - 1].Source == "归并热线小计")
                                     {
 
-                                        for (int z = 0; z < 5; z++)
+                                        for (int z = 0; z < 6; z++)
                                         {
                                             indexsource += 1;
                                             ICell cell = irow4.CreateCell(indexsource);
@@ -1949,6 +1890,11 @@ namespace CallCenter.Utility
                                                         .MergerHot[j - 1].rate);
                                                     cell.CellStyle = cellStylebt12;
                                                     break;
+                                                case 5:
+                                                    cell.SetCellValue(MergerHotSource[i]
+                                                        .MergerHot[j - 1].callback );
+                                                    cell.CellStyle = cellStylebt11;
+                                                    break;
 
                                             }
                                         }