From 22214d2ec514707cc9723e4080f9abc3a147a99e Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Wed, 19 Nov 2025 10:39:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=82=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ServiceApp/FireManagement/FireGridApp.cs  | 28 +++++++-----
 .../FireManagement/Response/CheckPointInfo.cs | 44 +++++++++++++++++++
 .../FireManagement/FireGridController.cs      |  5 ++-
 3 files changed, 65 insertions(+), 12 deletions(-)
 create mode 100644 OpenAuth.App/ServiceApp/FireManagement/Response/CheckPointInfo.cs

diff --git a/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs b/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs
index 023d0ce..0579b9e 100644
--- a/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs
+++ b/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs
@@ -75,7 +75,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
             }
         }
         //查询打卡点
-        public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(long areaid, string pointName, int pageIndex, int pageSize)
+        public async Task<Response<PageInfo<List<CheckPointInfo>>>> GetCheckPointList(long areaid, string pointName, int pageIndex, int pageSize)
         {
             using (SugarDbContext db = base.UnitWork.CreateContext())
             {
@@ -88,18 +88,26 @@ namespace OpenAuth.App.ServiceApp.FireManagement
                     .Where((a, b) => a.IsDelete == false)
                     .WhereIF(!string.IsNullOrEmpty(pointName), (a, b, c) => a.PointName.Contains(pointName))
                     .WhereIF(areaid != 0, (a, b, c) => chileorg.Contains(c.AreaId))
-                    .Select<dynamic>((a, b) => new
+                    .Select((a, b) => new CheckPointInfo
                     {
-                        a.Id,
-                        a.PointName,
-                        a.Lat,
-                        a.Lng,
-                        a.CreateTime,
-                        CreateUserName = b.Name
+                        id = a.Id,
+                        pointname = a.PointName,
+                        lat = a.Lat,
+                        lng = a.Lng,
+                        createtime = a.CreateTime,
+                        //CreateUserName = b.Name,
+                        userinfo = SqlFunc.Subqueryable<FmCheckPointUser>()
+                            .Where(c => c.PointId == a.Id)
+                            .LeftJoin<SysUser>((c, u) => c.UserId == u.Id)
+                            .SelectStringJoin((c, u) => u.Account, ","),
+                        userid = SqlFunc.Subqueryable<FmCheckPointUser>()
+                            .Where(c => c.PointId == a.Id)
+                            .LeftJoin<SysUser>((c, u) => c.UserId == u.Id)
+                            .SelectStringJoin((c, u) => u.Id.ToString(), ","),
                     }).ToPageListAsync(pageIndex, pageSize, totalNumber);
-                return new Response<PageInfo<List<dynamic>>>
+                return new Response<PageInfo<List<CheckPointInfo>>>
                 {
-                    Result = new PageInfo<List<dynamic>> { Items = query, Total = totalNumber }
+                    Result = new PageInfo<List<CheckPointInfo>> { Items = query, Total = totalNumber }
                 };
             }
         }
diff --git a/OpenAuth.App/ServiceApp/FireManagement/Response/CheckPointInfo.cs b/OpenAuth.App/ServiceApp/FireManagement/Response/CheckPointInfo.cs
new file mode 100644
index 0000000..52d3bf2
--- /dev/null
+++ b/OpenAuth.App/ServiceApp/FireManagement/Response/CheckPointInfo.cs
@@ -0,0 +1,44 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.FireManagement.Response
+{
+    public class CheckPointInfo
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true)]
+        public long id { get; set; }
+        /// <summary>
+        /// 打卡点经度
+        /// </summary>
+        public string lng { get; set; }
+        /// <summary>
+        /// 打卡点维度
+        /// </summary>
+        public string lat { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime createtime { get; set; }
+        /// <summary>
+        /// 打卡点名称
+        /// </summary>
+        public string pointname { get; set; }
+        /// <summary>
+        /// 打卡点人员
+        /// </summary>
+        public string usernames { get; set; }
+        /// <summary>
+        /// 打卡点人员xinxi
+        /// </summary>
+        public string userinfo { get; set; }
+        public string userid { get; set; }
+        public DateTime? lasttime { get; set; }
+    }
+}
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs
index f00b1fa..4f1f390 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs
@@ -51,9 +51,10 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
         /// <param name="limit"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(long areaid, string pointName, int page, int limit)
+        [AllowAnonymous]
+        public async Task<Response<PageInfo<List<CheckPointInfo>>>> GetCheckPointList(long areaid, string pointName, int page, int limit)
         {
-            Response<PageInfo<List<dynamic>>> response = new Response<PageInfo<List<dynamic>>>();
+            Response<PageInfo<List<CheckPointInfo>>> response = new Response<PageInfo<List<CheckPointInfo>>>();
             try
             {
                 return await _app.GetCheckPointList(areaid, pointName, page, limit);