From 2717fbb3ba5b01f6a58453b8eaa50caee4c78b2a Mon Sep 17 00:00:00 2001 From: zpc Date: Mon, 22 Sep 2025 08:59:31 +0800 Subject: [PATCH] 321 --- .../Business/OdfPortsController.cs | 4 +- .../wwwroot/ImportTemplate/OdfPorts.xlsx | Bin 10830 -> 10867 bytes ZR.Model/Business/Dto/OdfPortsDto.cs | 49 +++++++++++++++--- 3 files changed, 45 insertions(+), 8 deletions(-) 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 4c43e90611a632af5f212674e0adcd6983d5a6b2..02aad158601697b77c33812f45d3abd3ff6c53a1 100644 GIT binary patch delta 2807 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 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