获取人员分组信息

OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs

@@ -84,21 +84,51 @@ namespace OpenAuth.App.ServiceApp.FireManagement
             }
         }
 
-        //查询下发人员
-        public async Task<Response<List<SysUserResp>>> GetIssuedUsers(string username)
+        /// <summary>
+        /// 查询下发人员
+        /// </summary>
+        /// <param name="username"></param>
+        /// <returns></returns>
+        public async Task<Response<List<SysUserResp>>> LoadFireClueUser(string username)
         {
             using (var db = base.UnitWork.CreateContext())
             {
                 var users = await db.User.AsQueryable()
-                    .WhereIF(string.IsNullOrEmpty(username),r=>r.Name.Contains(username))
-                    .Where(r => r.Status==0)
-                    .Select(r=> new SysUserResp
+                    .WhereIF(string.IsNullOrEmpty(username), r => r.Name.Contains(username))
+                    .Where(r => r.Status == 0)
+                    .Select(r => new SysUserResp
                     {
                         Id = r.Id,
                         Name = r.Name
-                    }) .ToListAsync();
+                    }).ToListAsync();
                 return new Response<List<SysUserResp>> { Result = users };
             }
         }
+        /// <summary>
+        /// 查询任务列表
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Response<List<FmFireclueTask>>> GetTaskList()
+        {
+            using (var db = base.UnitWork.CreateContext())
+            {
+                var tasks = await db.FmFireclueTask.AsQueryable()
+                    .Where(r => r.IsDelete == false)
+                    .ToListAsync();
+                return new Response<List<FmFireclueTask>> { Result = tasks };
+            }
+        }
+        /// <summary>
+        /// 查询人员单位信息
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Response<List<FmUserUnit>>> GetUserUnit()
+        {
+            using (var db = base.UnitWork.CreateContext())
+            {
+                var userunit = await db.FmUserUnit.AsQueryable().ToListAsync();
+                return new Response<List<FmUserUnit>> { Result = userunit };
+            }
+        }
     }
 }

OpenAuth.Repository/Domain/FireManagement/FmUserUnit.cs

@@ -0,0 +1,52 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.Repository.Domain.FireManagement
+{
+    /// <summary>
+    /// 用户单位
+    /// </summary>
+    [SugarTable("fm_userunit")]
+    public class FmUserUnit
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 单位名称
+        /// </summary>
+        public string UnitName { get; set; }
+
+        /// <summary>
+        /// 单位类型
+        /// </summary>
+        public string UnitType { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 创建人ID
+        /// </summary>
+        public string CreateUserId { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 图标
+        /// </summary>
+        public string ImaUrl { get; set; }
+    }
+}

OpenAuth.Repository/SugarDbContext.cs

@@ -69,7 +69,7 @@ namespace OpenAuth.Repository
         #region 防火平台实体类
         public SugarRepositiry<FmFireclueTask> FmFireclueTask { get; set; }
         public SugarRepositiry<FmFireTaskUser> FmFireTaskUser { get; set; }
-
+        public SugarRepositiry<FmUserUnit> FmUserUnit { get; set; }
         #endregion
 
         public SugarRepositiry<DmModule> DmModule { get; set; }

OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs

@@ -48,12 +48,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
         /// <param name="username"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<List<SysUserResp>>> GetIssuedUsers(string username)
+        public async Task<Response<List<SysUserResp>>> LoadFireClueUser(string username)
         {
             Response<List<SysUserResp>> response = new Response<List<SysUserResp>>();
             try
             {
-                return await _app.GetIssuedUsers(username);
+                return await _app.LoadFireClueUser(username);
             }
             catch (Exception ex)
             {
@@ -62,5 +62,46 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
             }
             return response;
         }
+
+        /// <summary>
+        /// 查询任务列表
+        /// </summary>
+        /// <param name="username"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Response<List<FmFireclueTask>>> GetTaskList()
+        {
+            Response<List<FmFireclueTask>> response = new Response<List<FmFireclueTask>>();
+            try
+            {
+                return await _app.GetTaskList();
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+        /// <summary>
+        /// 查询人员单位信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet] 
+        public async Task<Response<List<FmUserUnit>>> GetUserUnit()
+        {
+            Response<List<FmUserUnit>> response = new Response<List<FmUserUnit>>();
+            try
+            {
+                return await _app.GetUserUnit();
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+
     }
 }