From ecf5f3802d39a9122d0bb28fff52a2bb2cc82a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Tue, 26 Aug 2025 20:17:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=B5=B4=E6=A0=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/SchoolBusinessController.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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"); } From 682eeea11bca80a68278adc7b90d1c4e54b78972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Wed, 27 Aug 2025 10:00:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20edit=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learn.Archives.API/Controllers/StudentController.cs | 1 + Learn.Archives.Core/Model/Dto/UserCenterServiceDto.cs | 4 ++++ 2 files changed, 5 insertions(+) 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; } /// /// 备注