From c51806a8515a458c3842980ac2c1f81efa50d1ce Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 8 Jan 2021 11:02:37 +0800 Subject: [PATCH] =?UTF-8?q?excel=E5=AE=BD=E5=BA=A6=E8=AE=BE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 85e0259b6e6bdbca7d818399c98bdc88a002561b Former-commit-id: b38039f4b09e807cb6b20de3419bb6ecada4a2cc --- labs/Teacher/TeacherExt/Controllers/HomeController.cs | 4 ++-- labs/Teacher/TeacherExt/Models/EditTeacherModel.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 = "兼职任教学段")]