32321

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");
         }
 
 

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; }
     }

ZR.Service/Business/CamWorkrecordService.cs

@@ -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;
         }
     }