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 02aad15..a3baaaa 100644
Binary files a/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx and b/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx differ
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
///
/// 设备型号
///
-
+
public string EquipmentModel { get; set; }
///
/// 业务类型
///
-
+
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; }
+
+
+ ///
+ /// 业务名称
+ ///
+ [ExcelColumn(Name = "业务名称")]
+ [ExcelColumnName("业务名称")]
+ public string YeWuMingCheng { get; set; }
+
+ ///
+ /// 1号端口
+ ///
+ [ExcelColumn(Name = "1号端口")]
+ [ExcelColumnName("1号端口")]
+ public string one { get; set; }
+ ///
+ /// 2号端口
+ ///
+ [ExcelColumn(Name = "2号端口")]
+ [ExcelColumnName("2号端口")]
+ public string two { get; set; }
+ ///
+ /// 3号端口
+ ///
+ [ExcelColumn(Name = "3号端口")]
+ [ExcelColumnName("3号端口")]
+ public string three { get; set; }
+
}