修改bug

CallCenterApi.DAL/T_Branch_List.cs

@@ -322,6 +322,18 @@ namespace CallCenterApi.DAL
                 {
                     model.F_DeleteTime = DateTime.Parse(row["F_DeleteTime"].ToString());
                 }
+                if (row["F_IsDP"] != null && row["F_IsDP"].ToString() != "")
+                {
+                    model.F_IsDP = int.Parse(row["F_IsDP"].ToString());
+                }
+                if (row["F_IsSQ"] != null && row["F_IsSQ"].ToString() != "")
+                {
+                    model.F_IsSQ = int.Parse(row["F_IsSQ"].ToString());
+                }
+                if (row["F_AreaId"] != null)
+                {
+                    model.F_AreaId = row["F_AreaId"].ToString();
+                }
             }
             return model;
         }
@@ -332,7 +344,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_Code,F_Name,F_Password,F_Address,F_ConName,F_ConPhone,F_ConTel,F_ConEmail,F_Url,F_Sign,F_WebSocketUrl,F_Phone,F_State,F_CreateTime,F_CreateUser,F_IsDelete,F_DeleteUser,F_DeleteTime ");
+            strSql.Append("select F_ID,F_Code,F_Name,F_Password,F_Address,F_ConName,F_ConPhone,F_ConTel,F_ConEmail,F_Url,F_Sign,F_WebSocketUrl,F_Phone,F_State,F_CreateTime,F_CreateUser,F_IsDelete,F_DeleteUser,F_DeleteTime,F_IsDP,F_IsSQ,F_AreaId ");
             strSql.Append(" FROM T_Branch_List ");
             if (strWhere.Trim() != "")
             {

CallCenterApi.Interface/Controllers/InfoController.cs

@@ -39,18 +39,32 @@ namespace CallCenterApi.Interface.Controllers
             {               
                 date = DateTime.Now;
             }
-            
+            int backtotal = 0;
             //string sqlwhere = " F_IsDelete=0 ";
             string sqlwhere = " F_IsDP=1 ";//大屏展示用到的
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+                sqlwhere += " and F_IsSQS='0";
+            }
             if (!string.IsNullOrEmpty(branchcode))
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
-
+            else
+            {
+                backtotal = 1;
+              
+                    sqlwhere += " and F_IsSQ!=1";
+                
+            }
+            int first = 1;
             int[] hours = Enumerable.Range(0, 24).ToArray<int>();
             decimal[,] countstotal=new decimal [10,24];//用于计算累计值//固定了10个市县区
             decimal[] tcountstotal = new decimal[10];
             string[] cols=new string [10];
+            string[] colsx = new string[1];//用于县数据相加
+
             //List<object> items;
             List<List<Dictionary<string, object>>> items = new List<List<Dictionary<string, object>>>();
             //IEnumerable<List<Dictionary<string, object>>> items;
@@ -80,45 +94,90 @@ namespace CallCenterApi.Interface.Controllers
                     JObject jo0 = (JObject)JsonConvert.DeserializeObject(ar);
                     if (jo0 != null && jo0["state"].ToString() == ResultTypes.success.ToString())
                     {
-
+                        if (first == 1)
+                        {
+                            string a = System.Text.RegularExpressions.Regex.Replace(jo0["data"]["cols"].ToString(), "[\r\n\t  ]", "");
+                            a = a.Replace("[", "");
+                            a = a.Replace("]", "");
+                            a = a.Replace("\"", "");
+                            cols = a.Split(',');
+                        }
+                        else
+                        {
+                            string a = System.Text.RegularExpressions.Regex.Replace(jo0["data"]["cols"].ToString(), "[\r\n\t  ]", "");
+                            a = a.Replace("[", "");
+                            a = a.Replace("]", "");
+                            a = a.Replace("\"", "");
+                            colsx = a.Split(',');
+                        }
                         //string x = jo0["data"].ToString();
                         for (int i = 0; i < 10;i++)
                         {
+                            
                             string y = System.Text.RegularExpressions.Regex.Replace(jo0["data"]["counts"][i].ToString(), "[\r\n\t  ]", "");
                             y = y.Replace("[", "");
                             y = y.Replace("]", "");
                             string[] z = y.Split(',');
+
                             for (int m = 0; m < z.Length; m++)
                             {
-                                countstotal[i,m] += decimal.Parse(z[m]);
+                                if (first == 1)
+                                {
+                                    countstotal[i, m] = decimal.Parse(z[m]);
+                                }
+                                else if (backtotal == 1)
+                                {
+                                    if (cols[i] == colsx[0])
+                                    {
+                                        countstotal[i, m] += decimal.Parse(z[m]);
+                                    }
+                                }
+                            }
+                            
+                                string p = System.Text.RegularExpressions.Regex.Replace(jo0["data"]["tcounts"].ToString(), "[\r\n\t  ]", "");
+                                p = p.Replace("[", "");
+                                p = p.Replace("]", "");
+                                string[] q = p.Split(',');
+                            if (backtotal == 1)
+                            {
+                                if (cols[i] == colsx[0])
+                                {
+                                    tcountstotal[i] += decimal.Parse(q[0]);
+                                }
+                            }
+                            else
+                            {
+                                tcountstotal[i] += decimal.Parse(q[i]);
                             }
 
-                            string p = System.Text.RegularExpressions.Regex.Replace(jo0["data"]["tcounts"].ToString(), "[\r\n\t  ]", "");
-                            p = p.Replace("[", "");
-                            p = p.Replace("]", "");
-                            string[] q = p.Split(',');
-                            tcountstotal[i] += decimal.Parse(q[i]);
 
                             //item计算
-                            var rtlist = jo0["data"]["items"][0].ToJson().ToList<Dictionary<string, object>>();
-                            for(int r=0;r<rtlist .Count;r++)
+                            if (backtotal == 1)
                             {
-                                decimal zh = 0;
-                                if (items.Count > i)
+                                if (cols[i] == colsx[0])
                                 {
-                                    zh = decimal.Parse(items[i][r]["Count"].ToString());
+                                    var rtlist = jo0["data"]["items"][0].ToJson().ToList<Dictionary<string, object>>();
+                                    for (int r = 0; r < rtlist.Count; r++)
+                                    {
+                                        decimal zh = 0;
+                                        if (items.Count > i)
+                                        {
+                                            zh = decimal.Parse(items[i][r]["Count"].ToString());
+                                        }
+                                        rtlist[r]["Count"] = zh + decimal.Parse(rtlist[r]["Count"].ToString());
+                                    }
+                                    //List<Dictionary<string, object>> li = new List<Dictionary<string, object>>();
+                                    //li.AddRange(rtlist );
+                                    items.Add(rtlist);
                                 }
-                                rtlist[r]["Count"] = zh+decimal.Parse(rtlist[r]["Count"].ToString ());
                             }
-                            //List<Dictionary<string, object>> li = new List<Dictionary<string, object>>();
-                            //li.AddRange(rtlist );
-                            items.Add(rtlist );
+                            else
+                            {
+                                var rtlist = jo0["data"]["items"][i].ToJson().ToList<Dictionary<string, object>>();
+                                items.Add(rtlist);
+                            }
                         }
-                        string a = System.Text.RegularExpressions.Regex.Replace(jo0["data"]["cols"].ToString(), "[\r\n\t  ]", "");
-                        a = a.Replace("[", "");
-                        a = a.Replace("]", "");
-                        a = a.Replace("\"", "");
-                        cols = a.Split(',');
+                        first = 0;
                       
                         
                     }
@@ -137,13 +196,13 @@ namespace CallCenterApi.Interface.Controllers
         }
 
         /// <summary>
-        /// 获取来源百分比
+        /// 获取受理区域数量
         /// </summary>
         /// <param name="branchcode"></param>
         /// <param name="start"></param>
         /// <param name="end"></param>
         /// <returns></returns>
-        public ActionResult GetSourcePercentByDate(string branchcode, DateTime? start, DateTime? end, string areaid)
+        public ActionResult GetAreaCountByDate(string branchcode, DateTime? start, DateTime? end, string areaid)
         {
 
             if (start == null && end == null)
@@ -155,23 +214,33 @@ namespace CallCenterApi.Interface.Controllers
             {
                 if (start == null) { start = DateTime.Now; }
                 if (end == null) { end = DateTime.Now; }
-                
-            }
 
+            }
+            int backtotal = 0;
             string sqlwhere = " F_IsDP=1 ";
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (!string.IsNullOrEmpty(branchcode))
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                backtotal = 1;
+               
+                    sqlwhere += " and F_IsSQ!=1";
+               
+            }
+
             #region 定义新表
             DataTable dtnew = new DataTable();
-            dtnew.Columns.Add("Id");
-            dtnew.Columns.Add("Source");
+            dtnew.Columns.Add("F_AreaId");
+            dtnew.Columns.Add("AreaName");
             dtnew.Columns.Add("Count");
-            dtnew.Columns.Add("Percent");
-            
+
             int first = 1;
-            decimal totalcount = 0;//用于计算百分比
             #endregion
 
             ArrayList result = new ArrayList();
@@ -187,7 +256,7 @@ namespace CallCenterApi.Interface.Controllers
                         areaid = l.F_AreaId;
                     }
                     string signcode = CommonHelper.getsigncode(controllername, actionname, l.F_Sign);
-                    string strparams = "?start=" + start.Value.ToString("yyyy-MM-dd") + "&end=" + end.Value.ToString("yyyy-MM-dd") + "&areaid=" + areaid + "&isdpjk=1" + "&signcode=" + signcode;
+                    string strparams = "?start=" + start.Value.ToString("yyyy-MM-dd") + "&end=" + end.Value.ToString("yyyy-MM-dd") + "&areaid=" + areaid + "&backtotal=" + backtotal + "&isdpjk=1" + "&signcode=" + signcode;
 
                     string ar = HttpMethods.HttpGet(l.F_Url + "/" + controllername + "/" + actionname + strparams);//.ToObject<AjaxResult>();
                     if (!string.IsNullOrEmpty(branchcode))
@@ -197,7 +266,6 @@ namespace CallCenterApi.Interface.Controllers
                     JObject jo0 = (JObject)JsonConvert.DeserializeObject(ar);
                     if (jo0 != null && jo0["state"].ToString() == ResultTypes.success.ToString())
                     {
-                        
                         if (first == 1)
                         {
                             DataTable dt = HeadToDataTable(jo0["data"].ToString(), "Item");
@@ -211,54 +279,49 @@ namespace CallCenterApi.Interface.Controllers
                         }
                         else
                         {
-                            //前部分相加
-                            DataTable dt1 = HeadToDataTable(jo0["data"].ToString(), "Item");
-                            for (int i = 0; i < dt1.Rows.Count; i++)
+                            for (int m = 0; m < dtnew.Rows.Count; m++)
                             {
-                                decimal t = decimal.Parse(dtnew.Rows[i][2].ToString()) + decimal.Parse(dt1.Rows[i][2].ToString());
-                                totalcount += t;
-                                 dtnew.Rows[i][2] = t;                               
-                            }
-                            //后半部分两个datatable相加    
-                            
-                            for (int i = 0; i < dtnew.Rows.Count; i++)
-                            {
-                                DataTable dtitem = new DataTable();
-                                string c = jo0["data"][i]["Item"].ToString();
-                                DataTable dt = HeadToDataTable(jo0["data"][i]["Item"].ToString(), "Item");
-                                dtitem = dt;
-                                DataTable dtold = HeadToDataTable(dtnew.Rows[i]["Item"].ToString(), "Item");
-                                for (int j = 0; j < dtold.Rows.Count; j++)
+                                
+                                //前部分相加
+                                DataTable dt1 = HeadToDataTable(jo0["data"].ToString(), "Item");
+                                for (int i = 0; i < dt1.Rows.Count; i++)
                                 {
-                                    dtitem.Rows[j][1] = decimal.Parse(dtold.Rows[j][1].ToString()) + decimal.Parse(dt.Rows[j][1].ToString());
+                                    if (dtnew.Rows[m][1].ToString() == dt1.Rows[i][1].ToString())
+                                    {
+                                        decimal t = decimal.Parse(dtnew.Rows[i][2].ToString()) + decimal.Parse(dt1.Rows[i][2].ToString());
+                                        dtnew.Rows[i][2] = t;
+
+                                        //后半部分两个datatable相加    
+
+
+                                        DataTable dtitem = new DataTable();
+                                        string c = jo0["data"][i]["Item"].ToString();
+                                        DataTable dt = HeadToDataTable(jo0["data"][i]["Item"].ToString(), "Item");
+                                        dtitem = dt;
+                                        DataTable dtold = HeadToDataTable(dtnew.Rows[i]["Item"].ToString(), "Item");
+                                        for (int j = 0; j < dtold.Rows.Count; j++)
+                                        {
+                                            dtitem.Rows[j][1] = decimal.Parse(dtold.Rows[j][1].ToString()) + decimal.Parse(dt.Rows[j][1].ToString());
+                                        }
+                                        dtnew.Rows[i]["Item"] = dtitem;
+                                    }
                                 }
-                                dtnew.Rows[i]["Item"] = dtitem;                       
                             }
                         }
-                        //var rtlist = ar.data.ToJson().ToList<Dictionary<string, object>>();
-                        //result.AddRange(rtlist);
                     }
                 }
             }
-            //计算百分比
-            if (totalcount > 0)
-            {
-                for (int m = 0; m < dtnew.Rows.Count; m++)
-                {
-                    dtnew.Rows[m]["Percent"] = Math.Round(decimal.Parse(dtnew.Rows[m]["Count"].ToString()) / totalcount * 100, 2);
-                }
-            }
-            return Success("成功", dtnew );
+            return Success("成功", dtnew);
         }
 
         /// <summary>
-        /// 获取受理区域数量
+        /// 获取来源百分比
         /// </summary>
         /// <param name="branchcode"></param>
         /// <param name="start"></param>
         /// <param name="end"></param>
         /// <returns></returns>
-        public ActionResult GetAreaCountByDate(string branchcode, DateTime? start, DateTime? end, string areaid)
+        public ActionResult GetSourcePercentByDate(string branchcode, DateTime? start, DateTime? end, string areaid)
         {
 
             if (start == null && end == null)
@@ -270,22 +333,31 @@ namespace CallCenterApi.Interface.Controllers
             {
                 if (start == null) { start = DateTime.Now; }
                 if (end == null) { end = DateTime.Now; }
-
+                
             }
 
             string sqlwhere = " F_IsDP=1 ";
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (!string.IsNullOrEmpty(branchcode))
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
-
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
             #region 定义新表
             DataTable dtnew = new DataTable();
-            dtnew.Columns.Add("F_AreaId");
-            dtnew.Columns.Add("AreaName");
+            dtnew.Columns.Add("Id");
+            dtnew.Columns.Add("Source");
             dtnew.Columns.Add("Count");
+            dtnew.Columns.Add("Percent");
             
             int first = 1;
+            decimal totalcount = 0;//用于计算百分比
             #endregion
 
             ArrayList result = new ArrayList();
@@ -311,6 +383,7 @@ namespace CallCenterApi.Interface.Controllers
                     JObject jo0 = (JObject)JsonConvert.DeserializeObject(ar);
                     if (jo0 != null && jo0["state"].ToString() == ResultTypes.success.ToString())
                     {
+                        
                         if (first == 1)
                         {
                             DataTable dt = HeadToDataTable(jo0["data"].ToString(), "Item");
@@ -329,10 +402,11 @@ namespace CallCenterApi.Interface.Controllers
                             for (int i = 0; i < dt1.Rows.Count; i++)
                             {
                                 decimal t = decimal.Parse(dtnew.Rows[i][2].ToString()) + decimal.Parse(dt1.Rows[i][2].ToString());
-                                dtnew.Rows[i][2] = t;
+                                totalcount += t;
+                                 dtnew.Rows[i][2] = t;                               
                             }
                             //后半部分两个datatable相加    
-
+                            
                             for (int i = 0; i < dtnew.Rows.Count; i++)
                             {
                                 DataTable dtitem = new DataTable();
@@ -344,15 +418,27 @@ namespace CallCenterApi.Interface.Controllers
                                 {
                                     dtitem.Rows[j][1] = decimal.Parse(dtold.Rows[j][1].ToString()) + decimal.Parse(dt.Rows[j][1].ToString());
                                 }
-                                dtnew.Rows[i]["Item"] = dtitem;
+                                dtnew.Rows[i]["Item"] = dtitem;                       
                             }
                         }
+                        //var rtlist = ar.data.ToJson().ToList<Dictionary<string, object>>();
+                        //result.AddRange(rtlist);
                     }
                 }
             }
+            //计算百分比
+            if (totalcount > 0)
+            {
+                for (int m = 0; m < dtnew.Rows.Count; m++)
+                {
+                    dtnew.Rows[m]["Percent"] = Math.Round(decimal.Parse(dtnew.Rows[m]["Count"].ToString()) / totalcount * 100, 2);
+                }
+            }
             return Success("成功", dtnew );
         }
 
+        
+
         /// <summary>
         /// 获取来源数量百分比
         /// </summary>
@@ -376,10 +462,18 @@ namespace CallCenterApi.Interface.Controllers
             }
 
             string sqlwhere = " F_IsDP=1 ";
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (!string.IsNullOrEmpty(branchcode))
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
 
             #region 定义新表
             DataTable dtnew = new DataTable();
@@ -442,7 +536,7 @@ namespace CallCenterApi.Interface.Controllers
                 }
             }
             //计算百分比
-            dtnew.Columns.Add("Percent", typeof(object));
+            //dtnew.Columns.Add("Percent", typeof(object));
             if (totalcount > 0)
             {
                 for (int m = 0; m < dtnew.Rows.Count; m++)
@@ -450,7 +544,7 @@ namespace CallCenterApi.Interface.Controllers
                     dtnew.Rows[m]["Percent"] = Math.Round(decimal.Parse(dtnew.Rows[m]["Count"].ToString()) / totalcount * 100, 2).ToString ()+"%";
                 }
             }
-            return Success("成功", result);
+            return Success("成功", dtnew);
         }
         #endregion
 
@@ -462,12 +556,19 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetStateCountMonthByDate(string branchcode, string areaid)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             string sqlwhere = " F_IsDP=1 ";
             if (!string.IsNullOrEmpty(branchcode))
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
             decimal[,] countstotal = new decimal[10, 12];//用于计算累计值
             string[] cols = new string[10];
             string[] months = new string[12];
@@ -542,7 +643,10 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetDeptCountByDateNew(string branchcode, DateTime? start, DateTime? end, string areaid, int deptid = 0)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (start == null && end == null)
             {
                 start = DateTime.Now;
@@ -560,6 +664,10 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
 
             ArrayList result = new ArrayList();
             var list = new BLL.T_Branch_List().GetModelList(sqlwhere);
@@ -596,7 +704,10 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetDealCount24ByDate(string branchcode, DateTime? date, string areaid)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (date == null)
             {
                 date = DateTime.Now;
@@ -607,6 +718,10 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
 
             int[] hours = Enumerable.Range(7, 12).ToArray<int>();
             int[] acounts = new int[12];
@@ -671,6 +786,10 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetStateCountByMonth(string branchcode, string month, string day, string areaid)
         {
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (string.IsNullOrEmpty(month))
             {
                 month = DateTime.Now.ToString("yyyy-MM");
@@ -684,6 +803,10 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
             #region 定义新表
             DataTable dtnew = new DataTable();
             dtnew.Columns.Add("State");
@@ -752,12 +875,19 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetTypeCountMonthByDate(string branchcode, string start, string end, string areaid)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             string sqlwhere = " F_IsDP=1 ";
             if (!string.IsNullOrEmpty(branchcode))
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
             #region 变量定义
             DateTime startdate = DateTime.Now.AddMonths(-12);
             DateTime enddate = DateTime.Now;
@@ -847,7 +977,10 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetKeyCountByDateNew(string branchcode, DateTime? start, DateTime? end, string areaid, int keyid = 0)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (start == null && end == null)
             {
                 start = DateTime.Now;
@@ -865,6 +998,10 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
 
             #region 定义新表
             DataTable dtnew = new DataTable();
@@ -948,11 +1085,11 @@ namespace CallCenterApi.Interface.Controllers
 
                 //dtTemp.Columns.Add(autoColumn);
 
-                dtTemp.Columns["排名"].SetOrdinal(0);
+                //dtTemp.Columns["排名"].SetOrdinal(0);
 
                 for (int i = 0; i < dtTemp.Rows.Count; i++)
                 {
-                    dtTemp.Rows[i][0] = i + 1;
+                    dtTemp.Rows[i]["排名"] = i + 1;
                 }
 
             }
@@ -969,7 +1106,10 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetTypeCountByDate(string branchcode, DateTime? start, DateTime? end, string areaid)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (start == null && end == null)
             {
                 start = DateTime.Now;
@@ -987,6 +1127,10 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
 
             #region 定义新表
             DataTable dtnew = new DataTable();
@@ -1058,7 +1202,10 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetUserStateCount24ByDate(string branchcode, DateTime? start, DateTime? end, string areaid)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (start == null && end == null)
             {
                 start = DateTime.Now;
@@ -1076,6 +1223,10 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
 
             int[] hours = Enumerable.Range(0, 24).ToArray<int>();
             double[] kxpercents = new double[24];
@@ -1191,7 +1342,10 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetTelCount24ByDate(string branchcode, DateTime? date, string areaid)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (date == null)
             {
                 date = DateTime.Now;
@@ -1202,6 +1356,10 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
 
             int[] hours = Enumerable.Range(0, 24).ToArray<int>();
             int[] rcounts = new int[24];//来电数量
@@ -1290,7 +1448,10 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetTelCountByDate(string branchcode, DateTime? date, string areaid)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (date == null)
             {
                 date = DateTime.Now;
@@ -1301,6 +1462,10 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
 
             decimal hwcon=0;
             decimal lhcon = 0;
@@ -1373,12 +1538,19 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetTypeCountNew(string branchcode, string areaid)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             string sqlwhere = " F_IsDP=1 ";
             if (!string.IsNullOrEmpty(branchcode))
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
 
             #region 定义新表
             DataTable dtnew = new DataTable();
@@ -1466,7 +1638,10 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetTelRate24ByDate(string branchcode, DateTime? date, string areaid)
         {
-
+            if (branchcode == "sqs12345")
+            {
+                branchcode = "";
+            }
             if (date == null)
             {
                 date = DateTime.Now;
@@ -1477,6 +1652,10 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sqlwhere += " and F_Code='" + branchcode + "'";
             }
+            else
+            {
+                sqlwhere += " and F_IsSQ!=1";
+            }
 
             int[] hours = Enumerable.Range(0, 24).ToArray<int>();
             int[] jt = new int[24];
@@ -1613,7 +1792,15 @@ namespace CallCenterApi.Interface.Controllers
                                     DataRow dataRow = dataTable.NewRow();
                                     foreach (var li in cname )
                                     {
-                                        dataRow[li] = dictionary[li];
+                                        if (dictionary[li] == null)
+                                        {
+                                            dataRow[li] = -1;
+                                        }
+                                        else
+                                        {
+                                            dataRow[li] = dictionary[li];
+                                        }
+                                        
                                     }
                                     //dataRow[root] = dictionary[root];
                                     foreach (string key in dic.Keys)
@@ -1692,8 +1879,14 @@ namespace CallCenterApi.Interface.Controllers
                             
                             foreach (var li in cname)
                             {
-
-                                dataRow[li] = dictionary[li];
+                                if (dictionary[li] == null)
+                                {
+                                    dataRow[li] = -1;
+                                }
+                                else
+                                {
+                                    dataRow[li] = dictionary[li];
+                                }
                             }
                             //dataRow[root] = dictionary[root];                          
                             

CallCenterApi.Model/T_Branch_List.cs

@@ -29,7 +29,9 @@ namespace CallCenterApi.Model
         private int? _f_isdelete;
         private string _f_deleteuser;
         private DateTime? _f_deletetime;
-        private string  _f_areaid;
+        private string    _f_areaid;
+        private int _f_isdp;
+        private int _f_issq;
         /// <summary>
         /// 
         /// </summary>
@@ -186,11 +188,29 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 
         /// </summary>
-        public string F_AreaId
+        public string  F_AreaId
         {
             set { _f_areaid = value; }
             get { return _f_areaid; }
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_IsDP
+        {
+            set { _f_isdp = value; }
+            get { return _f_isdp; }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_IsSQ
+        {
+            set { _f_issq = value; }
+            get { return _f_issq; }
+        }
         #endregion Model
 
     }