diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs index ac88a2a..c1420e2 100644 --- a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs +++ b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs @@ -386,6 +386,8 @@ namespace ZR.Admin.WebApi.Controllers.Business port.Remarks = ""; port.OpticalCableOffRemarks = ""; } + port.EquipmentModel = parm.EquipmentModel; + port.BusinessType = parm.BusinessType; port.HistoryRemarks = ToHistoryString(parm.HistoryFault); var response = _OdfPortsService.UpdateOdfPorts(port); var count = await _OdfPortFaultService.CountAsync(it => it.PortId == port.Id); @@ -755,7 +757,7 @@ namespace ZR.Admin.WebApi.Controllers.Business [AllowAnonymous] public IActionResult ImportTemplateExcel() { - var result = DownloadImportTemplate(new List() { }, "OdfPorts"); + var result = DownloadImportTemplate(new List() { }, "OdfPorts"); return ExportExcel(result.Item2, result.Item1); } /// diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx b/ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx index 4c43e90..02aad15 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 e4d39e0..6ce2341 100644 --- a/ZR.Model/Business/Dto/OdfPortsDto.cs +++ b/ZR.Model/Business/Dto/OdfPortsDto.cs @@ -188,16 +188,14 @@ namespace ZR.Model.Business.Dto - [ExcelColumn(Name = "光缆断信息")] - [ExcelColumnName("光缆断信息")] + [ExcelColumn(Name = "光缆段信息")] + [ExcelColumnName("光缆段信息")] public string OpticalCableOffRemarks { get; set; } - [ExcelColumn(Name = "历史故障表")] - [ExcelColumnName("历史故障表")] + [ExcelColumn(Name = "历史故障记录")] + [ExcelColumnName("历史故障记录")] public string HistoryRemarks { get; set; } - - public List HistoryFault { get; set; } [Required(ErrorMessage = "创建时间不能为空")] @@ -230,6 +228,19 @@ namespace ZR.Model.Business.Dto /// [ExcelColumn(Name = "部门名称")] public string DeptName { get; set; } + + /// + /// 设备型号 + /// + [ExcelColumn(Name = "设备型号")] + [ExcelColumnName("设备型号")] + public string EquipmentModel { get; set; } + /// + /// 业务类型 + /// + [ExcelColumn(Name = "业务类型")] + [ExcelColumnName("业务类型")] + public string BusinessType { get; set; } } /// @@ -348,7 +359,18 @@ namespace ZR.Model.Business.Dto public string DeptName { get; set; } - + /// + /// 设备型号 + /// + [ExcelColumn(Name = "设备型号")] + [ExcelColumnName("设备型号")] + public string EquipmentModel { get; set; } + /// + /// 业务类型 + /// + [ExcelColumn(Name = "业务类型")] + [ExcelColumnName("业务类型")] + public string BusinessType { get; set; } } /// @@ -569,6 +591,19 @@ namespace ZR.Model.Business.Dto /// public string OpticalCableOffRemarks { get; set; } + /// + /// 设备型号 + /// + [ExcelColumn(Name = "设备型号")] + [ExcelColumnName("设备型号")] + public string EquipmentModel { get; set; } + /// + /// 业务类型 + /// + [ExcelColumn(Name = "业务类型")] + [ExcelColumnName("业务类型")] + public string BusinessType { get; set; } + } public class OdfPortsHistoryDto