完善批注

Author: codelove1314

src/Magicodes.ExporterAndImporter.Excel/Utility/ImportHelper.cs

@@ -131,11 +131,15 @@ protected virtual void LabelingError(ExcelPackage excelPackage)
                 //标注数据错误
                 foreach (var item in ImportResult.RowErrors)
                 {
-                    var col = ImporterHeaderInfos.First(p => p.ExporterHeader.Name == item.FieldErrors.First().Key);
-                    var cell = worksheet.Cells[item.RowIndex, col.ExporterHeader.ColumnIndex];
-                    cell.Style.Font.Color.SetColor(Color.Red);
-                    cell.Style.Font.Bold = true;
-                    cell.AddComment(string.Join(",", item.FieldErrors.Values), col.ExporterHeader.Author);
+                    foreach (var field in item.FieldErrors)
+                    {
+                        var col = ImporterHeaderInfos.First(p => p.ExporterHeader.Name == field.Key);
+                        var cell = worksheet.Cells[item.RowIndex, col.ExporterHeader.ColumnIndex];
+                        cell.Style.Font.Color.SetColor(Color.Red);
+                        cell.Style.Font.Bold = true;
+                        cell.AddComment(string.Join(",", item.FieldErrors.Values), col.ExporterHeader.Author);
+                    }
+                    
                 }
                 var ext = Path.GetExtension(FilePath);
                 excelPackage.SaveAs(new FileInfo(FilePath.Replace(ext, "_" + Guid.NewGuid().ToString("N") + ext)));

src/Magicodes.ExporterAndImporter.Tests/ExcelImporter_Tests.cs

@@ -116,11 +116,19 @@ public async Task RowDataError_Test()
             result.TemplateErrors.Count.ShouldBe(0);
             result.RowErrors.ShouldContain(p => p.RowIndex == 2 && p.FieldErrors.ContainsKey("产品名称"));
             result.RowErrors.ShouldContain(p => p.RowIndex == 3 && p.FieldErrors.ContainsKey("产品名称"));
+
+            result.RowErrors.ShouldContain(p => p.RowIndex == 7 && p.FieldErrors.ContainsKey("产品代码"));
+
             result.RowErrors.ShouldContain(p => p.RowIndex == 3 && p.FieldErrors.ContainsKey("重量(KG)"));
-            result.RowErrors.ShouldContain(p => p.RowIndex == 3 && p.FieldErrors.ContainsKey("公式测试"));
             result.RowErrors.ShouldContain(p => p.RowIndex == 4 && p.FieldErrors.ContainsKey("公式测试"));
             result.RowErrors.ShouldContain(p => p.RowIndex == 5 && p.FieldErrors.ContainsKey("公式测试"));
             result.RowErrors.ShouldContain(p => p.RowIndex == 6 && p.FieldErrors.ContainsKey("公式测试"));
+            result.RowErrors.ShouldContain(p => p.RowIndex == 7 && p.FieldErrors.ContainsKey("公式测试"));
+
+            result.RowErrors.ShouldContain(p => p.RowIndex == 3 && p.FieldErrors.ContainsKey("身份证"));
+            result.RowErrors.ShouldContain(p => p.RowIndex == 4 && p.FieldErrors.ContainsKey("身份证"));
+            result.RowErrors.ShouldContain(p => p.RowIndex == 5 && p.FieldErrors.ContainsKey("身份证"));
+
             result.RowErrors.Count.ShouldBeGreaterThan(0);
         }
     }

src/Magicodes.ExporterAndImporter.Tests/Models/ImportProductDto.cs

@@ -80,6 +80,7 @@ public class ImportProductDto
         public DateTime FormulaTest { get; set; }
 
         [ImporterHeader(Name = "身份证")]
+        [RegularExpression(@"(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)", ErrorMessage = "身份证号码无效！")]
         public string IdNo { get; set; }
 
         [Display(Name = "性别")]