diff --git a/Learn.Archives.API/Controllers/SchoolBusinessController.cs b/Learn.Archives.API/Controllers/SchoolBusinessController.cs index d0a8791..54ee941 100644 --- a/Learn.Archives.API/Controllers/SchoolBusinessController.cs +++ b/Learn.Archives.API/Controllers/SchoolBusinessController.cs @@ -278,7 +278,22 @@ namespace Learn.Archives.API.Controllers [HttpGet, ResultIgnore, AllowAnonymous] public IActionResult DwImportTemplate() { - var resultList = new List() { new SchoolBusinessImport() { } }; + var resultList = new List() { new SchoolBusinessImport() + { + School="必填 与系统对应", + Grade="必填 : 初一/高一/初2025", + IsDiscussion="是/否", + IsClassMeeting="是/否", + Remark="选填 备注", + ClassMeeting ="选填 开展班会情况", + Discussion ="选填 开展会谈情况", + Solution="选填 需求/方案的描述", + Users="必填: 例 用户1,用户2 与系统中用户名称对应", + Record="选填 格式[时间:记录内容;] \r\n 例 2025年9月11日:执行了第一次沟通;\r\n2025年9月12日:执行了第二次沟通,沟通非常顺畅;", + EndRecord="选填 格式 [时间:记录内容]\r\n 例 2025年9月13日:已经顺利落地了解决方案", + Q学校领导班子="例子: 问题1:问题内容;问题2:问题内容2;", + P学校领导班子="例子: 问题1:问题解决方法;问题2:问题解决方法2;", + } }; return File(resultList.ExportExcel(), "application/ms-excel", "导入赴校信息模板.xlsx"); } diff --git a/Learn.Archives.API/Controllers/StudentController.cs b/Learn.Archives.API/Controllers/StudentController.cs index c3f6dad..dd10085 100644 --- a/Learn.Archives.API/Controllers/StudentController.cs +++ b/Learn.Archives.API/Controllers/StudentController.cs @@ -103,6 +103,7 @@ namespace Learn.Archives.API.Controllers item.AmountRelief = ex.AmountRelief; item.ReliefApplication = ex.ReliefApplication; + item.StudentType = ex.StudentType.ToString(); item.Remark = ex.Remark; item.ReliefType = ex?.ReliefType?.ToString(); item.ReliefSubTime = ex.ReliefSubTime?.ToString("yyyy-MM-dd") ?? string.Empty; diff --git a/Learn.Archives.Core/Model/Dto/UserCenterServiceDto.cs b/Learn.Archives.Core/Model/Dto/UserCenterServiceDto.cs index 8cbf78c..e1f0b17 100644 --- a/Learn.Archives.Core/Model/Dto/UserCenterServiceDto.cs +++ b/Learn.Archives.Core/Model/Dto/UserCenterServiceDto.cs @@ -310,6 +310,10 @@ namespace Learn.Archives.Core.Model.Dto /// 学生状态 /// public UserStatusEnum Status { get; set; } + /// + /// 学生类型 + /// + public string? StudentType { get; set; } /// /// 备注