From 132a37b02f79e3791fc78699588060455e6f006d Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 19 Jan 2021 11:58:34 +0800 Subject: [PATCH] update Former-commit-id: 71b918dd1a31f3f9518e188263d11e72e107d118 Former-commit-id: b287019e10c00dc789991f5a210e097734024ea5 --- .../Infrastructure/Application/IPagedList.cs | 4 +- .../Infrastructure/Application/PagedList.cs | 18 +- .../Shared/EditorTemplates/SelectList.cshtml | 5 +- .../Infrastructure/Views/Shared/_Paged.cshtml | 25 ++- .../Infrastructure/Web/Mvc/CrudController.cs | 4 +- .../DynamicController/GenericController.cs | 4 +- .../TeacherExt/Controllers/HomeController.cs | 195 ++++++++++++------ .../TeacherExt/Data/TeacherDbContext.cs | 6 + .../TeacherExt/Entities/Organization.cs | 8 +- labs/Teacher/TeacherExt/Entities/Person.cs | 3 + .../TeacherExt/Models/EditTeacherModel.cs | 23 +-- labs/Teacher/TeacherExt/Models/ListItem.cs | 27 ++- .../TeacherExt/Models/QueryTeacherModel.cs | 20 +- .../TeacherExt/Views/Home/Index.cshtml | 124 ++++++----- labs/Teacher/account.txt | 7 + 15 files changed, 284 insertions(+), 189 deletions(-) diff --git a/labs/Teacher/Infrastructure/Application/IPagedList.cs b/labs/Teacher/Infrastructure/Application/IPagedList.cs index 918da01c..504257b2 100644 --- a/labs/Teacher/Infrastructure/Application/IPagedList.cs +++ b/labs/Teacher/Infrastructure/Application/IPagedList.cs @@ -5,9 +5,9 @@ namespace Infrastructure.Application public interface IPagedList { int DefaultPageSize { get; set; } - int PageIndex { get; set; } + int PageNumber { get; set; } int PageSize { get; set; } - int TotalCount { get; set; } + int TotalRow { get; set; } IEnumerable GetPageIndexs(); diff --git a/labs/Teacher/Infrastructure/Application/PagedList.cs b/labs/Teacher/Infrastructure/Application/PagedList.cs index 537c502e..bb6a5c1b 100644 --- a/labs/Teacher/Infrastructure/Application/PagedList.cs +++ b/labs/Teacher/Infrastructure/Application/PagedList.cs @@ -8,7 +8,7 @@ namespace Infrastructure.Application { public PagedList() { - PageIndex = 1; + PageNumber = 1; PageSize = this.DefaultPageSize; } @@ -16,13 +16,13 @@ namespace Infrastructure.Application public int DefaultPageSize { get; set; } = 20; [ScaffoldColumn(false)] - public int PageIndex { get; set; } + public int PageNumber { get; set; } [ScaffoldColumn(false)] public int PageSize { get; set; } [ScaffoldColumn(false)] - public int TotalCount { get; set; } + public int TotalRow { get; set; } public int[] GetPageSizes() { @@ -31,17 +31,17 @@ namespace Infrastructure.Application public int PageCount() { - return (int)Math.Ceiling(this.TotalCount / (double)this.PageSize); + return (int)Math.Ceiling(this.TotalRow / (double)this.PageSize); } public bool HasPrev() { - return PageIndex > 1; + return PageNumber > 1; } public bool HasNext() { - return PageIndex < PageCount(); + return PageNumber < PageCount(); } public IEnumerable GetPageIndexs() @@ -49,9 +49,9 @@ namespace Infrastructure.Application var pageCount = PageCount(); var maxLinks = 10; var left = maxLinks / 2; - var start = PageIndex - left; + var start = PageNumber - left; start = start > 1 ? start : 1; - var end = PageIndex + (maxLinks - left - 1); + var end = PageNumber + (maxLinks - left - 1); end = end > pageCount ? pageCount : end; if (start == 1 && end < pageCount) { @@ -77,7 +77,7 @@ namespace Infrastructure.Application public IEnumerable Validate(ValidationContext validationContext) { - if (PageIndex < 1) + if (PageNumber < 1) { yield return new ValidationResult("当前页索引必须大于等于1"); } diff --git a/labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/SelectList.cshtml b/labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/SelectList.cshtml index 68706fdf..47380dc7 100644 --- a/labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/SelectList.cshtml +++ b/labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/SelectList.cshtml @@ -36,7 +36,10 @@ if(value is not null&&value is string selected) { var items = list.Items.Cast().ToList(); - items.Add(new SelectListItem { Value=selected,Text=selected}); + if (!items.Any(o => o.Value == selected)) + { + items.Add(new SelectListItem { Value = selected, Text = selected }); + } list = new SelectList(items, "Value", "Text", Model); } @Html.DropDownList("", list, "请选择", new { @class = select2Class }) diff --git a/labs/Teacher/Infrastructure/Views/Shared/_Paged.cshtml b/labs/Teacher/Infrastructure/Views/Shared/_Paged.cshtml index 664b8900..9ffe016c 100644 --- a/labs/Teacher/Infrastructure/Views/Shared/_Paged.cshtml +++ b/labs/Teacher/Infrastructure/Views/Shared/_Paged.cshtml @@ -2,33 +2,36 @@ @{ var links = Model.GetPageIndexs(); var url = Url.Content("~") + this.Context.Request.Path + this.Context.Request.QueryString; - var pageIndexParam = "PageIndex"; + var pageIndexParam = "PageNumber"; var empty = "javascript:;"; var firstUrl = url.RemoveParam(pageIndexParam); - var prevUrl = Model.PageIndex - 1 >= 1 ? url.SetParam(pageIndexParam, Model.PageIndex - 1) : empty; - var lastUrl = Model.TotalCount > 0 ? url.SetParam(pageIndexParam, Model.PageCount()) : empty; - var nextUrl = Model.PageIndex + 1 <= Model.PageCount() ? url.SetParam(pageIndexParam, Model.PageIndex + 1) : empty; + var prevUrl = Model.PageNumber - 1 >= 1 ? url.SetParam(pageIndexParam, Model.PageNumber - 1) : empty; + var lastUrl = Model.TotalRow > 0 ? url.SetParam(pageIndexParam, Model.PageCount()) : empty; + var nextUrl = Model.PageNumber + 1 <= Model.PageCount() ? url.SetParam(pageIndexParam, Model.PageNumber + 1) : empty; }
-
共 @(Model.TotalCount) 条 当前 @(Model.PageIndex)/@(Model.PageCount())
+
+
共 @(Model.TotalRow) 条 当前 @(Model.PageNumber)/@(Model.PageCount())
+
+
  • 首页
  • 上一页
    • @foreach (var item in links) { - if (item == Model.PageIndex) + if (item == Model.PageNumber) { -
  • @item
    • - } +
  • @item
    • + } else { -
  • @item
    • - } +
  • @item
    • + } }
  • 下一页
  • 末页
    • -
  • @Model.PageIndex / @Model.PageCount()
    • +
  • @Model.PageNumber / @Model.PageCount()
  • @Html.DropDownListFor(o => Model.PageSize, Model.GetPageSizes().Select(o => new SelectListItem { Text = o.ToString(), Value = o.ToString() }), new { @class = "page-link" })
    • diff --git a/labs/Teacher/Infrastructure/Web/Mvc/CrudController.cs b/labs/Teacher/Infrastructure/Web/Mvc/CrudController.cs index 5c3e230d..b733a20e 100644 --- a/labs/Teacher/Infrastructure/Web/Mvc/CrudController.cs +++ b/labs/Teacher/Infrastructure/Web/Mvc/CrudController.cs @@ -39,9 +39,9 @@ namespace Infrastructure.Web.Mvc //} query = this.Include(query); query = this.Query(model, query); - model.TotalCount = query.Count(); + model.TotalRow = query.Count(); - model.List.AddRange(query.Skip(model.PageSize * (model.PageIndex - 1)) + model.List.AddRange(query.Skip(model.PageSize * (model.PageNumber - 1)) .Take(model.PageSize) .ToList() .Select(o => diff --git a/labs/Teacher/Infrastructure/Web/Mvc/DynamicController/GenericController.cs b/labs/Teacher/Infrastructure/Web/Mvc/DynamicController/GenericController.cs index 6e3c8c6d..eb046ace 100644 --- a/labs/Teacher/Infrastructure/Web/Mvc/DynamicController/GenericController.cs +++ b/labs/Teacher/Infrastructure/Web/Mvc/DynamicController/GenericController.cs @@ -41,9 +41,9 @@ namespace Infrastructure.Web.Mvc //} query = this.Include(query); query = this.Query(model, query); - model.TotalCount = query.Count(); + model.TotalRow = query.Count(); - model.List.AddRange(query.Skip(model.PageSize * (model.PageIndex - 1)) + model.List.AddRange(query.Skip(model.PageSize * (model.PageNumber - 1)) .Take(model.PageSize) .ToList() .Select(o => diff --git a/labs/Teacher/TeacherExt/Controllers/HomeController.cs b/labs/Teacher/TeacherExt/Controllers/HomeController.cs index b8f4bde0..bc27fd5e 100644 --- a/labs/Teacher/TeacherExt/Controllers/HomeController.cs +++ b/labs/Teacher/TeacherExt/Controllers/HomeController.cs @@ -1,10 +1,16 @@ using Infrastructure.Data; using Infrastructure.Extensions; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.ModelBinding; +using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Reflection; using TeacherExt.Entities; using TeacherExt.Models; @@ -55,18 +61,18 @@ namespace TeacherExt.Controllers [HttpGet] [Route("/")] - public IActionResult Index(int bureau_id, string person_name, int pageNumber = 1, int pageSize = 20) + public IActionResult Index(QueryTeacherModel model) { var personQuery = this._personRepo.ReadOnlyTable(); - var organQuery = this._organizationRepo.ReadOnlyTable(); - if (!string.IsNullOrEmpty(person_name)) + if (!string.IsNullOrEmpty(model.person_name)) { - personQuery = personQuery.Where(o => o.RealName.Contains(person_name)); + personQuery = personQuery.Where(o => o.RealName.Contains(model.person_name)); } + var organQuery = this._organizationRepo.ReadOnlyTable(); var query = from person in personQuery join organ in organQuery on person.BureauId equals organ.Id join organ2 in organQuery on person.OrganId equals organ2.Id - where (person.IsUsed && person.BureauId == bureau_id) + where (person.IsUsed && person.BureauId == model.bureau_id) orderby person.BureauId,person.CreateAt select new ListItem { @@ -78,35 +84,94 @@ namespace TeacherExt.Controllers org_name = organ2.Name, person_id =person.Id, }; - if (!string.IsNullOrEmpty(person_name)) - { - query.Where(o => o.person_name.Contains(person_name)); - } var count = query.Count(); var list = query - .Skip(pageSize * (pageNumber - 1)) - .Take(pageSize) + .Skip(model.PageSize * (model.PageNumber - 1)) + .Take(model.PageSize) .ToList(); var nations = this.GetItems("ETHNIC_GROUP"); foreach (var item in list) { item.nation_name = nations.FirstOrDefault(o => o.Code == item.nation)?.Remark; } - var model = new + model.TotalRow = count; + model.List.AddRange(list); + if (!model.HeaderSelectList.Any()) { - List = list, - PageNumber = pageNumber, - PageSize = pageSize, - TotalRow = count - }; - return Json(model); - ////return Json(this._directoryRepo.ReadOnlyTable().Where(o=>o.IsUsed&&o.Category== "Nationality").OrderBy(o=>o.Order)); - //var model = this._personRepo.ReadOnlyTable().Where(o => o.IdentityNumber != null).FirstOrDefault(); - ////var bytes = HexStringToByteArray(model); - ////var output = AesDecrypt(bytes); - //var value = _helper.Decrypt(model.IdentityNumber); - //var en = _helper.Encrypt(value); - //return Content(value); + model.HeaderSelectList= typeof(EditTeacherModel).GetProperties() + .Select(o => o.GetCustomAttribute()) + .Where(o => o != null) + .Select(o => new SelectListItem { + Value = o.Header, + Text = o.Headers.Last().Key.Replace("\r\n", ""), + Selected = Request.Method.ToLower()=="get"?true: model.Headers.Any(h=>h==o.Header) + }) + .ToList(); + } + var organs = this._organizationRepo.ReadOnlyTable().Where(o => o.AreaId == 302705).ToList(); + var bureau = organs.FirstOrDefault(o => o.Name == "城中区教育局"); + bureau.Children = organs.Where(o => o.Name != "城中区教育局").ToList(); + model.Organs.Add(bureau); + return Result(model); + } + + [HttpPost] + [Route("/")] + public IActionResult Index(QueryTeacherModel model, bool isPost) + { + var result = this.Index(model); + return result; + } + + [HttpGet] + public IActionResult Edit(int id) + { + var personQuery = this._personRepo.ReadOnlyTable(); + var organQuery = this._organizationRepo.ReadOnlyTable(); + var query = from person in personQuery + join organ2 in organQuery on person.OrganId equals organ2.Id + where person.Id == id + //orderby person.BureauId, person.CreateAt + select new EditTeacherModel + { + Id=id, + // + Organ = organ2.Name, + // + RealName = person.RealName, + // + Birthday = person.Birthday, + Sex = person.Sex, + Nationality = person.Nationality, + UserType=person.UserType, + // + IdNumber = person.IdentityNumber, + NativePlace = person.NativePlace, + Nation = person.Nation, + }; + var model = query.First(); + model.IdNumber = _helper.Decrypt(model.IdNumber); + ViewData.SelectList(o => model.Sex, () => this.GetSex(model.Sex)); + ViewData.SelectList(o => model.Nationality, () => this.GetSelectList("Nationality", model.Nationality)); + ViewData.SelectList(o => model.UserType, () => this.GetSelectList("PERSON_STATUS", model.UserType)); + + ViewData.SelectList(o => model.Nation, ()=>this.GetSelectList("ETHNIC_GROUP", model.Nation)); + //var entity = this._userRepo.ReadOnlyTable() + // .Include(o => o.Organ) + // .Include(o => o.Teacher) + // .FirstOrDefault(o => o.UserName == userName); + //var model = entity.To(); + //if (entity.Teacher != null) + //{ + // model.From(entity.Teacher); + //} + //model.UserName = entity.UserName; + //model.UserId = entity.Id; + //model.Organ = entity.Organ.Name; + //model.RealName = entity.RealName; + //this.EntityToModel(entity.Teacher, model); + //this.ToEditModel(entity.Teacher, model); + return Result(model); } //[HttpGet] @@ -201,27 +266,6 @@ namespace TeacherExt.Controllers // return View(model); //} - //[HttpGet] - //public IActionResult Edit(string userName) - //{ - // var entity = this._userRepo.ReadOnlyTable() - // .Include(o => o.Organ) - // .Include(o => o.Teacher) - // .FirstOrDefault(o => o.UserName == userName); - // var model = entity.To(); - // if (entity.Teacher != null) - // { - // model.From(entity.Teacher); - // } - // model.UserName = entity.UserName; - // model.UserId = entity.Id; - // model.Organ = entity.Organ.Name; - // model.RealName = entity.RealName; - // this.EntityToModel(entity.Teacher, model); - // this.ToEditModel(entity.Teacher, model); - // return Result(model); - //} - //[HttpPost] //public IActionResult Add([FromForm] EditTeacherModel model) //{ @@ -601,13 +645,13 @@ namespace TeacherExt.Controllers // }.ToSelectList(selected); //} - //private SelectList GetSex(string selected) - //{ - // return new string[] { - // "男", - // "女", - // }.ToSelectList(selected); - //} + private SelectList GetSex(string selected) + { + return new string[] { + "男", + "女", + }.ToSelectList(selected); + } //private SelectList GetNation(string selected) //{ @@ -897,20 +941,37 @@ namespace TeacherExt.Controllers // }.ToSelectList(selected); //} - //private IActionResult Result(object model) - //{ - // if (this.IsJsonRequest()) - // { - // return Json(new - // { - // schema = this.GetJsonSchema(), - // model, - // errors = ModelState.Where(o => o.Value.ValidationState == ModelValidationState.Invalid), - // data = ViewData - // }, new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver(), ReferenceLoopHandling = ReferenceLoopHandling.Ignore }); - // } - // return View(model); - //} + private IActionResult Result(T model) + { + if (this.IsJsonRequest()) + { + return Json(new + { + schema = this.GetJsonSchema(), + model, + errors = ModelState.Where(o => o.Value.ValidationState == ModelValidationState.Invalid), + data = ViewData + }, new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver(), ReferenceLoopHandling = ReferenceLoopHandling.Ignore }); + } + return View(model); + } + + /// + /// 民族：ETHNIC_GROUP + /// + /// + /// + /// + private SelectList GetSelectList(string category,object selected) + { + var list = this._directoryRepo.ReadOnlyTable() + .Where(o=>o.IsUsed) + .Where(o => o.Category == category) + .OrderBy(o => o.Order) + .Select(o=>new SelectListItem { Text=o.Remark,Value=o.Code }) + .ToList(); + return new SelectList(list, nameof(SelectListItem.Value), nameof(SelectListItem.Text), selected); + } private List GetItems(string category) { return this._directoryRepo.ReadOnlyTable() diff --git a/labs/Teacher/TeacherExt/Data/TeacherDbContext.cs b/labs/Teacher/TeacherExt/Data/TeacherDbContext.cs index 1588dc35..ce5ab6ee 100644 --- a/labs/Teacher/TeacherExt/Data/TeacherDbContext.cs +++ b/labs/Teacher/TeacherExt/Data/TeacherDbContext.cs @@ -34,6 +34,9 @@ namespace TeacherExt.Data modelBuilder.Entity().ToTable("t_base_organization"); modelBuilder.Entity().HasKey(o => o.Id); modelBuilder.Entity().Property(o => o.Id).HasColumnName("ORG_ID").ValueGeneratedOnAdd(); + modelBuilder.Entity().Property(o => o.AreaId).HasColumnName("AREA_ID"); + modelBuilder.Entity().Property(o => o.OrganId).HasColumnName("ORG_ID"); + modelBuilder.Entity().Property(o => o.OrganType).HasColumnName("ORG_TYPE"); modelBuilder.Entity().Property(o => o.Name).HasColumnName("ORG_NAME"); modelBuilder.Entity().Property(o => o.IsUsed).HasColumnName("B_USE").HasConversion(o => o ? 1 : 0, o => o == 1); @@ -54,6 +57,9 @@ namespace TeacherExt.Data modelBuilder.Entity().Property(o => o.CreateAt).HasColumnName("create_time"); modelBuilder.Entity().Property(o => o.Nation).HasColumnName("NATION"); modelBuilder.Entity().Property(o => o.NativePlace).HasColumnName("placeofbirth"); + modelBuilder.Entity().Property(o => o.Birthday).HasColumnName("birthday"); + modelBuilder.Entity().Property(o => o.Nationality).HasColumnName("nationality"); + modelBuilder.Entity().Property(o => o.UserType).HasColumnName("person_status"); //t_base_person_title modelBuilder.Entity().ToTable("t_base_person_title"); diff --git a/labs/Teacher/TeacherExt/Entities/Organization.cs b/labs/Teacher/TeacherExt/Entities/Organization.cs index 2bfea729..ed38759f 100644 --- a/labs/Teacher/TeacherExt/Entities/Organization.cs +++ b/labs/Teacher/TeacherExt/Entities/Organization.cs @@ -1,4 +1,5 @@ -using System.ComponentModel.DataAnnotations.Schema; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; namespace TeacherExt.Entities { @@ -7,7 +8,12 @@ namespace TeacherExt.Entities [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; } + public int AreaId { get; set; } + public int OrganId { get; set; } + public int OrganType { get; set; } public string Name { get; set; } public bool IsUsed { get; set; } + [NotMapped] + public List Children { get; set; } = new List(); } } \ No newline at end of file diff --git a/labs/Teacher/TeacherExt/Entities/Person.cs b/labs/Teacher/TeacherExt/Entities/Person.cs index c439a9b1..5a96c9b1 100644 --- a/labs/Teacher/TeacherExt/Entities/Person.cs +++ b/labs/Teacher/TeacherExt/Entities/Person.cs @@ -31,5 +31,8 @@ namespace TeacherExt.Entities public DateTime CreateAt { get; set; } public string Nation { get; set; } public string NativePlace { get; set; } + public DateTime? Birthday { get; set; } + public int Nationality { get; set; } + public int UserType { get; set; } } } diff --git a/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs b/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs index f8a2bdb0..15c5c3d4 100644 --- a/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs +++ b/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs @@ -11,25 +11,12 @@ namespace TeacherExt.Models [Display(Name = "教师")] public class EditTeacherModel : IValidatableObject { - [SkipSearch, SkipList] - [ReadOnly(true)] - [ScaffoldColumn(false)] - [Display(Order = 0, Name = "用户名")] - public string UserName { get; set; } - - [SkipSearch, SkipList] - [HiddenInput] - [ReadOnly(true)] - [ScaffoldColumn(false)] - [Display(Order = 1, Name = "用户Id")] - public Guid UserId { get; set; } - [HiddenInput] [SkipSearch, SkipList] [ReadOnly(true)] [ScaffoldColumn(false)] [Display(Order = 2, Name = "Id")] - public Guid Id { get; set; } = Guid.NewGuid(); + public int Id { get; set; } [ReadOnly(true)] [Required(ErrorMessage = "必填项")] @@ -64,7 +51,7 @@ namespace TeacherExt.Models [SelectList] [Display(Order = 30, Name = "人员类别")] [Required(ErrorMessage = "必填项")] - public string UserType { get; set; } + public int UserType { get; set; } [ExcelHeader("性别")] [SkipSearch] @@ -73,6 +60,12 @@ namespace TeacherExt.Models [Required(ErrorMessage = "必填项")] public string Sex { get; set; } + [SkipSearch] + [SelectList] + [Display(Order = 41, Name = "国籍")] + [Required(ErrorMessage = "必填项")] + public int Nationality { get; set; } + [ExcelHeader("出生年月")] [SkipSearch, SkipList] [DataType(DataType.Date)] diff --git a/labs/Teacher/TeacherExt/Models/ListItem.cs b/labs/Teacher/TeacherExt/Models/ListItem.cs index 4d783434..cfaf138c 100644 --- a/labs/Teacher/TeacherExt/Models/ListItem.cs +++ b/labs/Teacher/TeacherExt/Models/ListItem.cs @@ -1,19 +1,16 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace TeacherExt.Models +namespace TeacherExt.Models { public class ListItem { - public string person_name { get; internal set; } - public string sex { get; internal set; } - public string nation { get; internal set; } - public string nation_name { get; internal set; } - public string placeofbirth { get; internal set; } - public string org_name { get; internal set; } - public int person_id { get; internal set; } - public string bureau_name { get; internal set; } + public string RequestEditStatus { get; set; } = "未提交"; + public string CheckStatus { get; set; } = "未申请"; + public string person_name { get; set; } + public string sex { get; set; } + public string nation { get; set; } + public string nation_name { get; set; } + public string placeofbirth { get; set; } + public string org_name { get; set; } + public int person_id { get; set; } + public string bureau_name { get; set; } } -} +} \ No newline at end of file diff --git a/labs/Teacher/TeacherExt/Models/QueryTeacherModel.cs b/labs/Teacher/TeacherExt/Models/QueryTeacherModel.cs index 4bbc4321..808da59f 100644 --- a/labs/Teacher/TeacherExt/Models/QueryTeacherModel.cs +++ b/labs/Teacher/TeacherExt/Models/QueryTeacherModel.cs @@ -1,22 +1,26 @@ using Infrastructure.Application; -using System; +using Microsoft.AspNetCore.Mvc.Rendering; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using TeacherExt.Entities; namespace TeacherExt.Models { - public class QueryTeacherModel: PagedList + public class QueryTeacherModel : PagedList { - [Display(Name="姓名")] - public string RealName { get; set; } + public int bureau_id { get; set; } = 302705; + + [Display(Name = "姓名")] + public string person_name { get; set; } + [Display(Name = "申请状态")] public string RequestEditStatus { get; set; } + [Display(Name = "审核状态")] public string CheckStatus { get; set; } - public Guid? OrganId { get; set; } - public List Organs { get; set; } = new List(); - public List Headers { get; set; } = new List(); + public List HeaderSelectList { get; set; } = new List(); + + public List Organs = new List(); } -} +} \ No newline at end of file diff --git a/labs/Teacher/TeacherExt/Views/Home/Index.cshtml b/labs/Teacher/TeacherExt/Views/Home/Index.cshtml index d0d71720..fcf77313 100644 --- a/labs/Teacher/TeacherExt/Views/Home/Index.cshtml +++ b/labs/Teacher/TeacherExt/Views/Home/Index.cshtml @@ -6,7 +6,7 @@ var index = 0; }
    -
    +
      @@ -15,7 +15,7 @@
    -
    +
    @@ -39,9 +39,9 @@
    - @Html.LabelFor(o => o.RealName, new { @class = "col-sm-4 col-form-label" }) + @Html.LabelFor(o => o.person_name, new { @class = "col-sm-4 col-form-label" })
    - @Html.EditorFor(o => o.RealName) + @Html.EditorFor(o => o.person_name)
    @@ -51,6 +51,7 @@ + @if (User.IsInRole("局管理员") || User.IsInRole("校管理员")) { @@ -59,25 +60,21 @@ - }
    +
    @{ - var list = typeof(EditTeacherModel).GetProperties() - .Select(o => o.GetCustomAttribute()) - .Where(o => o != null) - .ToList(); - foreach (var item in list) + foreach (var item in Model.HeaderSelectList) { - var display = item.Headers.Last().Key.Replace("\r\n", ""); - var raw = Model.Headers.Contains(item.Header) ? "checked=\"checked\"" : "";
    - +
    } } @@ -107,26 +104,26 @@ @index @item.RequestEditStatus @item.CheckStatus - @item.RealName - @item.Sex - @item.Nation - @item.NativePlace + @item.person_name + @item.sex + @item.nation_name + @item.placeofbirth @if (User.IsInRole("局管理员") && item.CheckStatus == "审核成功") { -     重置 + 重置 } else if (User.IsInRole("校管理员") && item.CheckStatus == "待审核") { - 审核 + 审核 } else { - 查看 + 查看 } - 日志 + 日志 } @@ -142,18 +139,17 @@
    @functions{ - public string RenderOrgans(List list) + public string RenderOrgans(List list) { foreach (var item in list) { - var cls = "nav-link" + (item.Id == Model.OrganId.Value ? " " + "active" : ""); + var cls = "nav-link" + (item.OrganId == Model.bureau_id ? " " + "active" : "");
  • - @item.Name + @item.Name @if (item.Children.Any()) {
      @RenderOrgans(item.Children) -
    }
    • @@ -171,44 +167,60 @@ @section scripts{ +