diff --git a/labs/Teacher/TeacherExt/Controllers/HomeController.cs b/labs/Teacher/TeacherExt/Controllers/HomeController.cs index c3f725c2..dcc938d3 100644 --- a/labs/Teacher/TeacherExt/Controllers/HomeController.cs +++ b/labs/Teacher/TeacherExt/Controllers/HomeController.cs @@ -476,7 +476,7 @@ namespace TeacherExt.Controllers row.Order(24).CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(string.IsNullOrEmpty(teacher.PostType) ? "无" : teacher.PostType); row.Order(25).CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(string.IsNullOrEmpty(teacher.PostGrade) ? "无" : teacher.PostGrade); row.Order(26).CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(teacher.CurrentPostGradeStart.HasValue ? teacher.CurrentPostGradeStart.Value.ToString("yyyy-MM") : "无"); - row.Order(27).CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(teacher.EducationGrade); + row.Order(27).CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(string.IsNullOrEmpty(teacher.EducationGrade) ? "无" : teacher.EducationGrade); row.Order(28).CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(string.IsNullOrEmpty(teacher.EducationGrade) ? "无" : teacher.EducationGradeDate.Value.ToString("yyyy-MM")); row.Order(30).CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(string.IsNullOrEmpty(teacher.FullTimeSchool) ? "无" : teacher.FullTimeSchool); row.Order(29).CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(string.IsNullOrEmpty(teacher.FullTimeSchoolType) ? "无" : teacher.FullTimeSchoolType); @@ -661,7 +661,7 @@ namespace TeacherExt.Controllers } } } - var length = (cell.ToString().Split('\n').Select(o => Encoding.UTF8.GetBytes(o).Count()).Max())* 256; + var length = ((cell.ToString().Split('\n').Select(o => Encoding.UTF8.GetBytes(o).Count()).Max())+1)* 256; if (length > sheet.GetColumnWidth(j)) { sheet.SetColumnWidth(j, length); diff --git a/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs b/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs index 6fb27c7b..4725b0dd 100644 --- a/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs +++ b/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs @@ -432,7 +432,7 @@ namespace TeacherExt.Models [Display(Order = 441, Name = "已审核")] public bool MainTeachGradeChecked { get; set; } - [ExcelHeader("主要任教\r\n年级")] + [ExcelHeader("兼职任教学段")] [SkipSearch, SkipList] [SelectList] [Display(Order = 450, Name = "兼职任教学段")]