diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpMaintainRecordListOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpMaintainRecordListOutput.cs
new file mode 100644
index 00000000..14af7e74
--- /dev/null
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpMaintainRecordListOutput.cs
@@ -0,0 +1,25 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class EqpMaintainRecordListOutput
+    {
+        public string id { get; set; }
+        public string equip_id { get; set; }
+        public string equip_id_id { get; set; }
+        public string status { get; set; }
+        public string result { get; set; }
+        public string result_remark { get; set; }
+        public string repeat_result { get; set; }
+        public string repeat_remark { get; set; }
+        public string create_time { get; set; }
+        public string execute_time { get; set; }
+        public string repeat_user_id { get; set; }
+        public string repeat_user_id_id { get; set; }
+        public string execute_user_id{ get; set; }
+        public string execute_user_id_id { get; set; }
+        public string repeat_time { get; set; }
+        
+        public DateTime? date_repeat_time { get; set; }
+        public DateTime? date_create_time { get; set; }
+        public DateTime? date_execute_time { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpSpotInsRecordListOutput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpSpotInsRecordListOutput.cs
index f09d07ff..97af0a07 100644
--- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpSpotInsRecordListOutput.cs
+++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpSpotInsRecordListOutput.cs
@@ -15,5 +15,9 @@ namespace Tnb.EquipMgr.Entities.Dto
         public string spot_record_user_id{ get; set; }
         public string spot_record_user_id_id { get; set; }
         public string repeat_time { get; set; }
+        
+        public DateTime? date_repeat_time { get; set; }
+        public DateTime? date_create_time { get; set; }
+        public DateTime? date_spot_record_date_time { get; set; }
     }
 }
\ No newline at end of file
diff --git a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs
index 899d9dbf..c8268edc 100644
--- a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs
@@ -2,6 +2,7 @@ using JNPF.Common.Core.Manager;
 using JNPF.Common.Dtos.VisualDev;
 using JNPF.Common.Enums;
 using JNPF.Common.Filter;
+using JNPF.Common.Security;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
 using JNPF.FriendlyException;
@@ -9,6 +10,7 @@ using JNPF.Systems.Entitys.Permission;
 using JNPF.Systems.Entitys.System;
 using JNPF.VisualDev;
 using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
 using JNPF.VisualDev.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -44,8 +46,54 @@ namespace Tnb.EquipMgr
             _visualDevService = visualDevService;
             _runService = runService;
             _userManager = userManager;
+            OverideFuncs.GetListAsync = GetList;
             // OverideFuncs.UpdateAsync = ExecuteSpotIns;
         }
+        
+        private async Task<object> GetList(VisualDevModelListQueryInput input)
+        {
+            var db = _repository.AsSugarClient();
+            Dictionary<string, object>? queryJson = (input==null || string.IsNullOrEmpty(input.queryJson)) ? new Dictionary<string, object>() : input.queryJson.ToObject<Dictionary<string, object>>();
+            string equioInfo = queryJson.ContainsKey("query_info") ? (queryJson["query_info"].ToString() ?? "") : "";
+            string status = queryJson.ContainsKey("status") ? (queryJson["status"].ToString() ?? "") : "";
+            var list = await db.Queryable<EqpMaintainRecordH, EqpEquipment, UserEntity,UserEntity>((a, b, c,d) => new object[]
+                {
+                    JoinType.Left, a.equip_id == b.id,
+                    JoinType.Left, a.execute_user_id == c.Id,
+                    JoinType.Left, a.repeat_user_id == d.Id,
+                })
+                .WhereIF(!string.IsNullOrEmpty(status),(a,b,c)=>a.status==status)
+                .WhereIF(!string.IsNullOrEmpty(equioInfo),(a,b,c)=>b.code.Contains(equioInfo)|| b.name.Contains(equioInfo))
+                .Select((a, b, c,d) => new EqpMaintainRecordListOutput
+                {
+                    id = a.id,
+                    equip_id = b.code+"/"+b.name,
+                    equip_id_id = a.equip_id,
+                    status = a.status,
+                    result = a.result=="1" ? "合格" : "不合格",
+                    repeat_result = a.repeat_result=="1" ? "合格" : "不合格",
+                    date_create_time = a.create_time,
+                    date_execute_time = a.execute_time,
+                    date_repeat_time = a.repeat_time,
+                    execute_user_id = c.RealName,
+                    execute_user_id_id = a.execute_user_id,
+                    repeat_user_id = d.RealName,
+                    repeat_user_id_id = a.repeat_user_id,
+                    result_remark = a.result_remark,
+                    repeat_remark = a.repeat_remark
+                })
+                .OrderByDescending(a=>a.create_time)
+                .Mapper(a =>
+                {
+                    a.status = a.status=="1" ? "待执行" : a.status=="2" ? "待复核" : "已完成";
+                    a.create_time = a.date_create_time == null ? "" : a.date_create_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    a.execute_time = a.date_execute_time == null ? "" : a.date_execute_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    a.repeat_time = a.date_repeat_time == null ? "" : a.date_repeat_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                })
+                .ToPagedListAsync((input?.currentPage ?? 1), (input?.pageSize ?? 50));
+            
+            return  PageResult<EqpMaintainRecordListOutput>.SqlSugarPageResult(list);
+        }
 
         /// <summary>
         /// 执行设备保养计划
diff --git a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs
index fa0bbcc6..343d124a 100644
--- a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs
@@ -72,9 +72,9 @@ namespace Tnb.EquipMgr
                     status = a.status,
                     result = a.result=="1" ? "合格" : "不合格",
                     repeat_result = a.repeat_result=="1" ? "合格" : "不合格",
-                    create_time = a.create_time==null ? "" : a.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
-                    spot_record_date_time = a.spot_record_date_time==null ? "" : a.spot_record_date_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
-                    repeat_time = a.repeat_time==null ? "" : a.repeat_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+                    date_create_time = a.create_time,
+                    date_spot_record_date_time = a.spot_record_date_time,
+                    date_repeat_time = a.repeat_time,
                     spot_record_user_id = c.RealName,
                     spot_record_user_id_id = a.spot_record_user_id,
                     repeat_user_id = d.RealName,
@@ -84,6 +84,9 @@ namespace Tnb.EquipMgr
                 .Mapper(a =>
                 {
                     a.status = a.status=="1" ? "待执行" : a.status=="2" ? "待复核" : "已完成";
+                    a.create_time = a.date_create_time == null ? "" : a.date_create_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    a.spot_record_date_time = a.date_spot_record_date_time == null ? "" : a.date_spot_record_date_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    a.repeat_time = a.date_repeat_time == null ? "" : a.date_repeat_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 })
                 .ToPagedListAsync((input?.currentPage ?? 1), (input?.pageSize ?? 50));