21

server/ZR.Model/Business/Dto/OdfCableFaultsDto.cs

@@ -67,7 +67,7 @@ namespace ZR.Model.Business.Dto
         public int? CableId { get; set; }
 
         [ExcelColumnName("故障时间")]
-        public DateTime? FaultTime { get; set; }
+        public string FaultTime { get; set; }
 
         [ExcelColumnName("人员")]
         public string Personnel { get; set; }

server/ZR.Service/Business/OdfCableFaultsService.cs

@@ -364,10 +364,21 @@ namespace ZR.Service.Business
                         continue;
                     }
 
+                    // 解析故障时间：导出时可能是多行时间拼接，取第一个有效时间
+                    DateTime faultTime = DateTime.Now;
+                    if (!string.IsNullOrWhiteSpace(item.FaultTime))
+                    {
+                        var timeParts = item.FaultTime.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
+                        if (timeParts.Length > 0 && DateTime.TryParse(timeParts[0].Trim(), out var parsed))
+                        {
+                            faultTime = parsed;
+                        }
+                    }
+
                     var model = new OdfCableFaults
                     {
                         CableId = cableId.Value,
-                        FaultTime = item.FaultTime ?? DateTime.Now,
+                        FaultTime = faultTime,
                         Personnel = item.Personnel,
                         FaultReason = item.FaultReason,
                         Mileage = item.Mileage,