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

OpenAuth.App/ServiceApp/InsTaskHallManager/InsTaskHallApp.cs

@@ -0,0 +1,53 @@
+using OpenAuth.App.BaseApp.Base;
+using OpenAuth.Repository.Domain;
+using OpenAuth.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using OpenAuth.App.Interface;
+using SqlSugar;
+using Microsoft.Extensions.Configuration;
+using DocumentFormat.OpenXml.Office2010.ExcelAc;
+using DocumentFormat.OpenXml.Office2010.CustomUI;
+using NPOI.OpenXmlFormats.Dml;
+
+namespace OpenAuth.App.ServiceApp.InsTaskHallManager
+{
+    public class InsTaskHallApp : SqlSugarBaseApp<InsTask, SugarDbContext>
+    {
+        private readonly IConfiguration _configuration;
+        private readonly ISqlSugarClient client;
+        public InsTaskHallApp(ISugarUnitOfWork<SugarDbContext> unitWork,
+            ISimpleClient<InsTask> repository, IAuth auth, ISqlSugarClient sqlSugarClient,
+            IConfiguration configuration) : base(unitWork, repository, auth)
+        {
+            _configuration = configuration;
+            this.client = sqlSugarClient;
+        }
+
+        /// <summary>
+        /// 任务区
+        /// </summary>
+        /// <returns></returns>
+        public async Task<List<dynamic>> GetTaskList()
+        {
+            var query = await client.Queryable<InsTask>().Where(r => r.IsCompleted == false)
+                .LeftJoin<InsAishp>((r, p) => r.ShpId == p.Id)
+                .OrderByDescending(r=>r.CreateTime)
+                .Select<dynamic>((r, p) => new
+                {
+                    r.Id,
+                    r.TaskName,
+                    r.State,
+                    p.ShpCount,
+                    CompleteCount = SqlFunc.Subqueryable<InsTaskgroup>().Where(a => a.TaskId == r.Id).Count() > 0 ? SqlFunc.Subqueryable<InsTaskgroup>().Where(a => a.TaskId == r.Id).Sum(r => (r.EndNum - r.BeginNum)) : 0
+                }).ToListAsync();
+
+            return query;
+        }
+
+
+    }
+}

OpenAuth.Repository/Domain/InsTask.cs

@@ -79,5 +79,25 @@ namespace OpenAuth.Repository.Domain
            /// </summary>           
            public short State {get;set;}
 
+        /// <summary>
+        /// Desc:是否完成
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public bool IsCompleted { get; set; }
+
+        /// <summary>
+        /// Desc:创建人姓名
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string CreateUserName { get; set; }
+
+        /// <summary>
+        /// Desc:修改人姓名
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string UpdateUserName { get; set; }
     }
 }

OpenAuth.WebApi/Controllers/ServiceControllers/InsTaskHallController.cs

@@ -0,0 +1,41 @@
+using Infrastructure;
+using Microsoft.AspNetCore.Mvc;
+using OpenAuth.App.ServiceApp.InsTaskHallManager;
+using OpenAuth.App.SysDatabaseLink;
+
+namespace OpenAuth.WebApi.Controllers.ServiceControllers
+{
+    /// <summary>
+    /// 任务大厅
+    /// </summary>
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class InsTaskHallController : ControllerBase
+    {
+        private readonly InsTaskHallApp _app;
+        public InsTaskHallController(InsTaskHallApp app)
+        {
+            _app = app;
+        }
+
+        /// <summary>
+        ///任务区
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Response<List<dynamic>>> GetTaskList()
+        {
+            var result = new Response<List<dynamic>>();
+            try
+            {
+                result.Result = await _app.GetTaskList();
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return result;
+        }
+    }
+}