用户添加头像字段代码修改

OpenAuth.App/BaseApp/UserManager/Request/UpdateUserReq.cs

@@ -48,6 +48,11 @@ namespace OpenAuth.App.Request
         /// <returns></returns>
         public int Status { get; set; }
 
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string HeadIcon { get; set; }
+
 
         public static implicit operator UpdateUserReq(SysUser user)
         {

OpenAuth.App/BaseApp/UserManager/Response/UserView.cs

@@ -45,7 +45,10 @@ namespace OpenAuth.App.Response
         /// <returns></returns>
         public int Type { get; set; }
 
-
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string HeadIcon { get; set; }
 
         /// <summary>
         /// 创建时间

OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs

@@ -69,6 +69,7 @@ namespace OpenAuth.App
                          account = u.Account,
                          name = u.Name,
                          createtime = u.CreateTime,
+                         headicon=u.HeadIcon,
                          department = SqlFunc.Subqueryable<SysUserOrg>().Where(a => a.UserId == u.Id).LeftJoin<SysOrg>((a, o) => a.OrgId == o.Id).SelectStringJoin((a, o) => o.Name, ","),
                          role = SqlFunc.Subqueryable<SysUserRole>().Where(a => a.UserId == u.Id).LeftJoin<SysRole>((a, o) => a.RoleId == o.Id).SelectStringJoin((a, o) => o.Name, ","),
                      })
@@ -240,6 +241,7 @@ namespace OpenAuth.App
                      account = u.Account,
                      name = u.Name,
                      create = u.CreateTime,
+                     headicon=u.HeadIcon,
                      department = SqlFunc.Subqueryable<SysUserOrg>().Where(a => a.UserId == u.Id).LeftJoin<SysOrg>((a, o) => a.OrgId == o.Id).SelectStringJoin((a, o) => o.Name, ","),
                      role = SqlFunc.Subqueryable<SysUserRole>().Where(a => a.UserId == u.Id).LeftJoin<SysRole>((a, o) => a.RoleId == o.Id).SelectStringJoin((a, o) => o.Name, ","),
                  })

OpenAuth.App/ServiceApp/InsTaskHallManager/InsTaskHallApp.cs

@@ -14,6 +14,7 @@ using DocumentFormat.OpenXml.Office2010.CustomUI;
 using NPOI.OpenXmlFormats.Dml;
 using Infrastructure.Extensions;
 using Moq;
+using OpenAuth.App.ServiceApp.InsTaskHallManager.Response;
 
 namespace OpenAuth.App.ServiceApp.InsTaskHallManager
 {
@@ -54,16 +55,23 @@ namespace OpenAuth.App.ServiceApp.InsTaskHallManager
         /// 完成任务
         /// </summary>
         /// <returns></returns>
-        public async Task<List<dynamic>> GetCompleteTaskList()
+        public async Task<List<InsTaskRes>> GetCompleteTaskList()
         {
             var query = await client.Queryable<InsTask>().Where(r => r.IsCompleted == true&&r.CompleteTime!=null)
-                .OrderByDescending(r => r.CompleteTime)
+                .Select(r => new
-                .GroupBy(r=>r.CompleteTime.ToString("yyyy-MM-dd"))
-                .Select<dynamic>(r => new
                 {
-                    count = SqlFunc.AggregateCount(r.Id),
+                    id=r.Id,
-                    time= r.CompleteTime.ToString("yyyy-MM-dd")
+                    datetime= r.CompleteTime.Value.Date
-                }).ToListAsync();
+                })
+                .MergeTable()
+                .GroupBy(r=>r.datetime)
+                .Select(r => new InsTaskRes
+                {
+                    count = SqlFunc.AggregateCount(r.id),
+                    time= r.datetime
+                })
+                .MergeTable().OrderBy(r => r.time)
+                .ToListAsync();
 
             return query;
         }

OpenAuth.App/ServiceApp/InsTaskHallManager/Response/InsTaskRes.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.InsTaskHallManager.Response
+{
+    public class InsTaskRes
+    {
+        public int count { get; set; }
+        public DateTime time { get; set; }
+    }
+}

OpenAuth.WebApi/Controllers/ServiceControllers/InsTaskHallController.cs

@@ -1,6 +1,7 @@
 using Infrastructure;
 using Microsoft.AspNetCore.Mvc;
 using OpenAuth.App.ServiceApp.InsTaskHallManager;
+using OpenAuth.App.ServiceApp.InsTaskHallManager.Response;
 using OpenAuth.App.SysDatabaseLink;
 
 namespace OpenAuth.WebApi.Controllers.ServiceControllers
@@ -43,9 +44,9 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<List<dynamic>>> GetCompleteTaskList()
+        public async Task<Response<List<InsTaskRes>>> GetCompleteTaskList()
         {
-            var result = new Response<List<dynamic>>();
+            var result = new Response<List<InsTaskRes>>();
             try
             {
                 result.Result = await _app.GetCompleteTaskList();