server/.NETAdmin
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

321

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
View File

@ -386,6 +386,8 @@ namespace ZR.Admin.WebApi.Controllers.Business
port.Remarks = ""; port.Remarks = "";
port.OpticalCableOffRemarks = ""; port.OpticalCableOffRemarks = "";
} }
port.EquipmentModel = parm.EquipmentModel;
port.BusinessType = parm.BusinessType;
port.HistoryRemarks = ToHistoryString(parm.HistoryFault); port.HistoryRemarks = ToHistoryString(parm.HistoryFault);
var response = _OdfPortsService.UpdateOdfPorts(port); var response = _OdfPortsService.UpdateOdfPorts(port);
var count = await _OdfPortFaultService.CountAsync(it => it.PortId == port.Id); var count = await _OdfPortFaultService.CountAsync(it => it.PortId == port.Id);
@ -755,7 +757,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
[AllowAnonymous] [AllowAnonymous]
public IActionResult ImportTemplateExcel() public IActionResult ImportTemplateExcel()
{ {
var result = DownloadImportTemplate(new List<OdfPortsDto>() { }, "OdfPorts"); var result = DownloadImportTemplate(new List<OdfPortsfDto>() { }, "OdfPorts");
return ExportExcel(result.Item2, result.Item1); return ExportExcel(result.Item2, result.Item1);
} }
/// <summary> /// <summary>

BIN
ZR.Admin.WebApi/wwwroot/ImportTemplate/OdfPorts.xlsx
View File

Binary file not shown.

49
ZR.Model/Business/Dto/OdfPortsDto.cs
View File

@ -188,16 +188,14 @@ namespace ZR.Model.Business.Dto
[ExcelColumn(Name = "光缆断信息")] [ExcelColumn(Name = "光缆段信息")]
[ExcelColumnName("光缆断信息")] [ExcelColumnName("光缆段信息")]
public string OpticalCableOffRemarks { get; set; } public string OpticalCableOffRemarks { get; set; }
[ExcelColumn(Name = "历史故障表")] [ExcelColumn(Name = "历史故障记录")]
[ExcelColumnName("历史故障表")] [ExcelColumnName("历史故障记录")]
public string HistoryRemarks { get; set; } public string HistoryRemarks { get; set; }
public List<OdfPortsHistoryDto> HistoryFault { get; set; } public List<OdfPortsHistoryDto> HistoryFault { get; set; }
[Required(ErrorMessage = "创建时间不能为空")] [Required(ErrorMessage = "创建时间不能为空")]
@ -230,6 +228,19 @@ namespace ZR.Model.Business.Dto
/// </summary> /// </summary>
[ExcelColumn(Name = "部门名称")] [ExcelColumn(Name = "部门名称")]
public string DeptName { get; set; } 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> /// <summary>
@ -348,7 +359,18 @@ namespace ZR.Model.Business.Dto
public string DeptName { get; set; } 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> /// <summary>
@ -569,6 +591,19 @@ namespace ZR.Model.Business.Dto
/// </summary> /// </summary>
public string OpticalCableOffRemarks { get; set; } 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 public class OdfPortsHistoryDto