This commit is contained in:
zpc 2025-09-22 08:59:31 +08:00
parent cae9c8a596
commit 2717fbb3ba
3 changed files with 45 additions and 8 deletions

View File

@ -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<OdfPortsDto>() { }, "OdfPorts");
var result = DownloadImportTemplate(new List<OdfPortsfDto>() { }, "OdfPorts");
return ExportExcel(result.Item2, result.Item1);
}
/// <summary>

View File

@ -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<OdfPortsHistoryDto> HistoryFault { get; set; }
[Required(ErrorMessage = "创建时间不能为空")]
@ -230,6 +228,19 @@ namespace ZR.Model.Business.Dto
/// </summary>
[ExcelColumn(Name = "部门名称")]
public string DeptName { get; set; }
/// <summary>
/// 设备型号
/// </summary>
[ExcelColumn(Name = "设备型号")]
[ExcelColumnName("设备型号")]
public string EquipmentModel { get; set; }
/// <summary>
/// 业务类型
/// </summary>
[ExcelColumn(Name = "业务类型")]
[ExcelColumnName("业务类型")]
public string BusinessType { get; set; }
}
/// <summary>
@ -348,7 +359,18 @@ namespace ZR.Model.Business.Dto
public string DeptName { get; set; }
/// <summary>
/// 设备型号
/// </summary>
[ExcelColumn(Name = "设备型号")]
[ExcelColumnName("设备型号")]
public string EquipmentModel { get; set; }
/// <summary>
/// 业务类型
/// </summary>
[ExcelColumn(Name = "业务类型")]
[ExcelColumnName("业务类型")]
public string BusinessType { get; set; }
}
/// <summary>
@ -569,6 +591,19 @@ namespace ZR.Model.Business.Dto
/// </summary>
public string OpticalCableOffRemarks { get; set; }
/// <summary>
/// 设备型号
/// </summary>
[ExcelColumn(Name = "设备型号")]
[ExcelColumnName("设备型号")]
public string EquipmentModel { get; set; }
/// <summary>
/// 业务类型
/// </summary>
[ExcelColumn(Name = "业务类型")]
[ExcelColumnName("业务类型")]
public string BusinessType { get; set; }
}
public class OdfPortsHistoryDto