Merge branch 'Insight' of http://123.132.248.154:10000/HC_YFZX/Infrastructure into Insight

OpenAuth.App/ServiceApp/InsTaskHallManager/InsTaskHallApp.cs

@@ -9,6 +9,7 @@ using OpenAuth.App.ServiceApp.InsTaskHallManager.Response;
 using Infrastructure;
 using OpenAuth.App.BaseApp;
 using Moq;
+using System.Linq;
 
 namespace OpenAuth.App.ServiceApp.InsTaskHallManager
 {
@@ -53,6 +54,8 @@ namespace OpenAuth.App.ServiceApp.InsTaskHallManager
         /// <returns></returns>
         public async Task<List<InsTaskRes>> GetCompleteTaskList()
         {
+            var ts = DateTime.Now.AddDays(-30);
+
             var query = await client.Queryable<InsTask>().Where(r => r.IsCompleted == true&&r.CompleteTime!=null)
                 .Select(r => new
                 {
@@ -68,8 +71,25 @@ namespace OpenAuth.App.ServiceApp.InsTaskHallManager
                 })
                 .MergeTable().OrderBy(r => r.time)
                 .ToListAsync();
+            List<InsTaskRes> list=new List<InsTaskRes>();
+            for(int i=1; i <= 30; i++)
+            {
+                InsTaskRes itr = new InsTaskRes();  
+                var date=ts.AddDays(i).Date;
+                itr.time = date;
+                var data=query.Where(r=>r.time==date).FirstOrDefault();
+                if (data != null)
+                {
+                    itr.count = data.count;
+                }
+                else
+                {
+                    itr.count = 0;
+                }
+                list.Add(itr);
+            }
 
-            return query;
+            return list;
         }
 
         /// <summary>