333

ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs

@@ -156,7 +156,17 @@ namespace ZR.Admin.WebApi.Controllers.Business
             }
             var predicate = Expressionable.Create<OdfPorts>();
             var list = _OdfPortsService.AsQueryable().Where(it => it.Name.Contains(key) || it.Remarks.Contains(key) || it.HistoryRemarks.Contains(key) || it.OpticalAttenuation.Contains(key)).ToPage<OdfPorts, OdfPortsQuDto>(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);
         }
 

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", //商城数据库

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