server/.NETAdmin
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

32321

Browse Source
This commit is contained in:
zpc 2025-09-12 20:22:39 +08:00
parent 830732aeeb
commit 8081be4f2d
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/CommonController.cs
View File

@ -85,7 +85,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult Index() public IActionResult Index()
{ {
var hello = _localizer["hello"].Value; 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");
} }

5
ZR.Model/Business/Dto/CamWorkrecordDto.cs
View File

@ -10,6 +10,11 @@ namespace ZR.Model.Business.Dto
public string Address { get; set; } public string Address { get; set; }
public string Content { get; set; } public string Content { get; set; }
public string StatusName { get; set; } public string StatusName { get; set; }
/// <summary>
///
/// </summary>
public string Workrecord { get; set; }
public DateTime? BeginRecordTime { get; set; } public DateTime? BeginRecordTime { get; set; }
public DateTime? EndRecordTime { get; set; } public DateTime? EndRecordTime { get; set; }
} }

15
ZR.Service/Business/CamWorkrecordService.cs
View File

@ -117,7 +117,7 @@ namespace ZR.Service.Business
.Where(predicate.ToExpression()) .Where(predicate.ToExpression())
.Select((it) => new CamWorkrecordExcelDto() .Select((it) => new CamWorkrecordExcelDto()
{ {
}, true) }, true)
.ToPage(parm); .ToPage(parm);
var ids = response.Result.Select(it => it.Id).ToList(); 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(); var w = works.Where(it => it.WorkrecordId == item.Id).Select(it => it.WorkerName).ToList();
item.Workers = w; item.Workers = w;
if (!string.IsNullOrEmpty(item.Remarks)) if (!string.IsNullOrEmpty(item.Remarks))
{ {
try 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.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.Content), it => it.Content.Contains(parm.Content));
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.StatusName), it => it.StatusName == parm.StatusName); 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; return predicate;
} }
} }