From c07aacc08ed65efb69ab1ecba9d7e8d374000a46 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Mon, 22 Sep 2025 19:40:11 +0800
Subject: [PATCH] 312

---
 .../Business/OdfPortsController.cs            |   6 +--
 .../wwwroot/ImportTemplate/OdfPorts.xlsx      | Bin 10867 -> 10931 bytes
 ZR.Model/Business/Dto/OdfPortsDto.cs          |  38 +++++++++++++++---
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
index c1420e2..457a5ab 100644
--- a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
+++ b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
@@ -616,6 +616,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
                         }
                         //添加端口
                         var port = _OdfPortsService.AsQueryable().Where(it => it.FrameId == frame.Id && it.RowNumber == excelItem.RowNumber && it.PortNumber == excelItem.PortNumber).First();
+                        string remarks = $"{excelItem.YeWuMingCheng.Trim()} {excelItem.EquipmentModel.Trim()} {excelItem.BusinessType.Trim()} {excelItem.one}/{excelItem.two.Trim()}/{excelItem.three.Trim()}";
                         if (port == null)
                         {
                             port = new OdfPorts()
@@ -634,7 +635,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
                                 RowNumber = excelItem.RowNumber,
                                 PortNumber = excelItem.PortNumber,
                                 Status = excelItem.Status,
-                                Remarks = excelItem.Remarks?.Trim(),
+                                Remarks = remarks,
                                 OpticalAttenuation = excelItem.OpticalAttenuation?.Trim(),
                                 HistoryRemarks = excelItem.HistoryRemarks?.Trim(),
                                 OpticalCableOffRemarks = excelItem.OpticalCableOffRemarks,
@@ -647,8 +648,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
                         else
                         {
                             port.HistoryRemarks = excelItem.HistoryRemarks?.Trim();
-
-                            port.Remarks = excelItem.Remarks?.Trim();
+                            port.Remarks = remarks;
                             port.OpticalAttenuation = excelItem.OpticalAttenuation?.Trim();
                             port.Status = excelItem.Status;
                             port.OpticalCableOffRemarks = excelItem.OpticalCableOffRemarks;
diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx b/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx
index 02aad158601697b77c33812f45d3abd3ff6c53a1..a3baaaa53cef2d0d7f1ffe92426e86dd68d46ba4 100644
GIT binary patch
delta 4165
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
D3Ix8C

delta 4081
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
OijLrB!4u>7x9MMk#H=v@

diff --git a/ZR.Model/Business/Dto/OdfPortsDto.cs b/ZR.Model/Business/Dto/OdfPortsDto.cs
index 6ce2341..1769b71 100644
--- a/ZR.Model/Business/Dto/OdfPortsDto.cs
+++ b/ZR.Model/Business/Dto/OdfPortsDto.cs
@@ -100,12 +100,12 @@ namespace ZR.Model.Business.Dto
         /// <summary>
         /// 设备型号
         /// </summary>
-        
+
         public string EquipmentModel { get; set; }
         /// <summary>
         /// 业务类型
         /// </summary>
- 
+
         public string BusinessType { get; set; }
     }
     public class OdfPortsMDtoc : OdfPortsMDto
@@ -417,9 +417,9 @@ namespace ZR.Model.Business.Dto
         [ExcelColumnName("连接状态，0断开，1连接")]
         public int Status { get; set; }
 
-        [ExcelColumn(Name = "备注")]
-        [ExcelColumnName("备注")]
-        public string Remarks { get; set; }
+        //[ExcelColumn(Name = "备注")]
+        //[ExcelColumnName("备注")]
+        //public string Remarks { get; set; }
 
         [ExcelColumn(Name = "光衰值（dB）")]
         [ExcelColumnName("光衰值（dB）")]
@@ -454,6 +454,34 @@ namespace ZR.Model.Business.Dto
         [ExcelColumn(Name = "业务类型")]
         [ExcelColumnName("业务类型")]
         public string BusinessType { get; set; }
+
+
+        /// <summary>
+        /// 业务名称
+        /// </summary>
+        [ExcelColumn(Name = "业务名称")]
+        [ExcelColumnName("业务名称")]
+        public string YeWuMingCheng { get; set; }
+
+        /// <summary>
+        /// 1号端口
+        /// </summary>
+        [ExcelColumn(Name = "1号端口")]
+        [ExcelColumnName("1号端口")]
+        public string one { get; set; }
+        /// <summary>
+        ///  2号端口
+        /// </summary>
+        [ExcelColumn(Name = "2号端口")]
+        [ExcelColumnName("2号端口")]
+        public string two { get; set; }
+        /// <summary>
+        /// 3号端口
+        /// </summary>
+        [ExcelColumn(Name = "3号端口")]
+        [ExcelColumnName("3号端口")]
+        public string three { get; set; }
+
     }