调整bug

CallCenterApi.Interface/Controllers/County/CountyBusinessController.cs

@@ -15,7 +15,7 @@ using Newtonsoft.Json.Linq;
 
 namespace CallCenterApi.Interface.Controllers.County
 {
-    [Authority]
+    //[Authority]
     public class CountyBusinessController : BaseController
     {
         // GET: CountyBusiness
@@ -228,6 +228,7 @@ namespace CallCenterApi.Interface.Controllers.County
         /// <returns></returns>
         public ActionResult GetAreaAssessmentNew(string branchcode, DateTime? start, DateTime? end, int isdc = 0)
         {
+            start = DateTime.Now.AddDays(-100);
             
             #region 定义新表
             DataTable dtnew = new DataTable();
@@ -267,7 +268,7 @@ namespace CallCenterApi.Interface.Controllers.County
             ArrayList result = new ArrayList();
             var list = new BLL.T_Branch_List().GetModelList(sqlwhere);
             string controllername = RouteData.Values["controller"].ToString();
-            string actionname = RouteData.Values["action"].ToString();
+            string actionname = "GetAreaAssessment";//RouteData.Values["action"].ToString();
             foreach (var l in list)
             {
                 if (!string.IsNullOrEmpty(l.F_Sign) && !string.IsNullOrEmpty(l.F_Url))
@@ -302,19 +303,33 @@ namespace CallCenterApi.Interface.Controllers.County
                         }
                         else
                         {
+                            int isbh = 0;
                             //前部分相加
                             DataTable dt1 = HeadToDataTable(jo0["data"].ToString(), "Item");
-                            for (int i = 0; i < dtnew .Columns .Count ; i++)
+                            for (int m = 0; m < dt1 .Rows  .Count ; m++)
                             {
-                                for (int j = 1; j < 11; j++)
+                                for (int i = 0; i < dtnew.Rows.Count; i++)
                                 {
-                                    string cols = dtnew.Columns[j].ColumnName;
-                                    decimal t = decimal.Parse(dtnew.Rows[i][cols].ToString()) + decimal.Parse(dt1.Rows[i][cols].ToString());
-
-                                    dtnew.Rows[i][cols] = t;
-
+                                    if (dtnew.Rows[i]["areaname"].ToString() == dt1.Rows[m]["areaname"].ToString())
+                                    {
+                                        for (int j = 1; j < 11; j++)
+                                        {
+                                            string cols = dtnew.Columns[j].ColumnName;
+                                            decimal t = decimal.Parse(dtnew.Rows[i][cols].ToString()) + decimal.Parse(dt1.Rows[m][cols].ToString());
+
+                                            dtnew.Rows[i][cols] = t;
+                                            isbh = 1;
+                                        }
+                                        //totalcount += Int64.Parse(dtnew.Rows[i]["TotalCount"].ToString());
+                                    }
+                                }
+                                if (isbh == 0)
+                                {
+                                    
+                                    DataRow dr = dt1.Rows[m];
+                                    dtnew.ImportRow(dr);
+                                    
                                 }
-                                //totalcount += Int64.Parse(dtnew.Rows[i]["TotalCount"].ToString());
                             }
 
                         }