From 8081be4f2d9ddd99e5ff312ae91328449351ee29 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Fri, 12 Sep 2025 20:22:39 +0800
Subject: [PATCH] 32321

---
 ZR.Admin.WebApi/Controllers/CommonController.cs |  2 +-
 ZR.Model/Business/Dto/CamWorkrecordDto.cs       |  5 +++++
 ZR.Service/Business/CamWorkrecordService.cs     | 15 +++++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs
index 5cd07a4..111bc1c 100644
--- a/ZR.Admin.WebApi/Controllers/CommonController.cs
+++ b/ZR.Admin.WebApi/Controllers/CommonController.cs
@@ -85,7 +85,7 @@ namespace ZR.Admin.WebApi.Controllers
         public IActionResult Index()
         {
             var hello = _localizer["hello"].Value;
-            return Ok($"请求成功！=>" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+            return Ok($"请求成功！=>" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")+"==>camera");
         }
 
 
diff --git a/ZR.Model/Business/Dto/CamWorkrecordDto.cs b/ZR.Model/Business/Dto/CamWorkrecordDto.cs
index ca3cc11..1e1561f 100644
--- a/ZR.Model/Business/Dto/CamWorkrecordDto.cs
+++ b/ZR.Model/Business/Dto/CamWorkrecordDto.cs
@@ -10,6 +10,11 @@ namespace ZR.Model.Business.Dto
         public string Address { get; set; }
         public string Content { get; set; }
         public string StatusName { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Workrecord { get; set; }
         public DateTime? BeginRecordTime { get; set; }
         public DateTime? EndRecordTime { get; set; }
     }
diff --git a/ZR.Service/Business/CamWorkrecordService.cs b/ZR.Service/Business/CamWorkrecordService.cs
index e1a2b5c..46fea4a 100644
--- a/ZR.Service/Business/CamWorkrecordService.cs
+++ b/ZR.Service/Business/CamWorkrecordService.cs
@@ -117,7 +117,7 @@ namespace ZR.Service.Business
                 .Where(predicate.ToExpression())
                 .Select((it) => new CamWorkrecordExcelDto()
                 {
-                   
+
                 }, true)
                 .ToPage(parm);
             var ids = response.Result.Select(it => it.Id).ToList();
@@ -128,7 +128,7 @@ namespace ZR.Service.Business
                 {
                     var w = works.Where(it => it.WorkrecordId == item.Id).Select(it => it.WorkerName).ToList();
                     item.Workers = w;
-                     
+
                     if (!string.IsNullOrEmpty(item.Remarks))
                     {
                         try
@@ -162,6 +162,17 @@ namespace ZR.Service.Business
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Address), it => it.Address.Contains(parm.Address));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Content), it => it.Content.Contains(parm.Content));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.StatusName), it => it.StatusName == parm.StatusName);
+            //camWorkerService.AsQueryable().Where(it => it.WorkerName.Contains(parm.Workrecord));
+
+            // 关键：根据子表 CamWorker 过滤
+            if (!string.IsNullOrEmpty(parm.Workrecord))
+            {
+                predicate = predicate.And(it =>
+                    SqlFunc.Subqueryable<CamWorker>()
+                        .Where(w => w.WorkrecordId == it.Id && w.WorkerName.Contains(parm.Workrecord))
+                        .Any()
+                );
+            }
             return predicate;
         }
     }