From 86975dceb0dc50f2aecff04b20fb9bfbcde620c7 Mon Sep 17 00:00:00 2001 From: zpc Date: Wed, 6 Aug 2025 20:47:54 +0800 Subject: [PATCH] 333 --- .../Controllers/Business/OdfPortsController.cs | 12 +++++++++++- ZR.Admin.WebApi/appsettings.json | 2 +- ZR.Model/Business/Dto/OdfPortsDto.cs | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs index 58b7547..143bf21 100644 --- a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs +++ b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs @@ -156,7 +156,17 @@ namespace ZR.Admin.WebApi.Controllers.Business } var predicate = Expressionable.Create(); var list = _OdfPortsService.AsQueryable().Where(it => it.Name.Contains(key) || it.Remarks.Contains(key) || it.HistoryRemarks.Contains(key) || it.OpticalAttenuation.Contains(key)).ToPage(dto); - + var roomId = list.Result.Select(it => it.RoomId).Distinct(); + var roomList = await _OdfRoomsService.AsQueryable().Where(it => roomId.Contains(it.Id)).ToListAsync(); + list.Result.ForEach(it => + { + var t = roomList.Find(r => r.Id == it.RoomId); + if (t != null) + { + it.Address = t.RoomAddress; + } + //roomList + }); return SUCCESS(list); } diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index 63d8174..10a43e3 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -14,7 +14,7 @@ "IsAutoCloseConnection": true } //, - //{ + //{ // "Conn": "Data Source=LAPTOP-STKF2M8H\\SQLEXPRESS;User ID=admin;Password=admin123;Initial Catalog=ZrAdmin;Encrypt=True;TrustServerCertificate=True;", // "DbType": 1, // "ConfigId": "1", //商城数据库 diff --git a/ZR.Model/Business/Dto/OdfPortsDto.cs b/ZR.Model/Business/Dto/OdfPortsDto.cs index 5c6484f..1f4c7f3 100644 --- a/ZR.Model/Business/Dto/OdfPortsDto.cs +++ b/ZR.Model/Business/Dto/OdfPortsDto.cs @@ -279,6 +279,7 @@ namespace ZR.Model.Business.Dto [ExcelColumnName("历史故障表")] public string HistoryRemarks { get; set; } + public string Address { get; set; } }