RIZO/shgx_tz_mom
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

安灯

Browse Source
This commit is contained in:
quowingwang 2025-12-24 14:39:13 +08:00
parent 517b3a79d3
commit f7a3e5c57c
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Model/MES/andon/Dto/AndonAlarmAreaDto.cs
View File

@ -7,6 +7,7 @@ namespace ZR.Model.MES.andon.Dto
/// </summary>
public class AndonAlarmAreaQueryDto : PagerInfo
{
public string Area { get; set; }
}
/// <summary>
@ -20,6 +21,7 @@ namespace ZR.Model.MES.andon.Dto
public int? ParentId { get; set; }
public string Area { get; set; }
public string ParentArea { get; set; }
public string CreatedBy { get; set; }

17
ZR.Service/mes/andon/AndonAlarmAreaService.cs
View File

@ -23,10 +23,25 @@ namespace ZR.Service.mes.andon
public PagedInfo<AndonAlarmAreaDto> GetList(AndonAlarmAreaQueryDto parm)
{
var predicate = Expressionable.Create<AndonAlarmArea>();
predicate.AndIF(!string.IsNullOrEmpty(parm.Area), w => w.Area.Contains(parm.Area));
var response = Queryable()
// 左连接自身表，别名 t_parent 代表父级区域
.LeftJoin<AndonAlarmArea>((t, t_parent) => t.ParentId == t_parent.Id)
.Where(predicate.ToExpression())
.ToPage<AndonAlarmArea, AndonAlarmAreaDto>(parm);
// 字段映射：将父级区域的 Area 赋值给 DTO 的 ParentArea
.Select((t, t_parent) => new AndonAlarmAreaDto
{
Id = t.Id,
ParentId = t.ParentId,
ParentArea = t_parent == null ? string.Empty : t_parent.Area,
Area = t.Area,
CreatedBy = t.CreatedBy,
CreatedTime = t.CreatedTime,
UpdatedBy = t.UpdatedBy,
UpdatedTime = t.UpdatedTime
})
.ToPage(parm);
return response;
}