wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 6a5da51938458eb19b3d68ccf23d0623802febf5
Former-commit-id: 78a0895b2cd000fda65690915038415e76185f82
1.0
wanggang 5 years ago
parent 944e86db1e
commit 4da5cde0e6
7 changed files with 130 additions and 100 deletions
Show Stats Download Patch File Download Diff File

81
labs/Teacher/TeacherExt/Controllers/HomeController.cs
Unescape View File

@ -13,7 +13,6 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
using Stateless;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@ -90,6 +89,8 @@ namespace TeacherExt.Controllers
.OrderBy(o => o.OrganId)
.ThenBy(o => o.CreateAt);
var query = from person in personQuery
join organ in this._organizationRepo.ReadOnlyTable() on person.BureauId equals organ.OrganId
join department in this._organizationRepo.ReadOnlyTable() on person.OrganId equals department.OrganId
join login in this._loginRepo.ReadOnlyTable() on person.Id equals login.PersonId
orderby person.OrganId ascending, person.CreateAt ascending
select new TeacherListItem
@ -101,7 +102,9 @@ namespace TeacherExt.Controllers
sex = person.Sex,
nation = person.Nation,
placeofbirth = person.NativePlace,
person_id = person.Id
person_id = person.Id,
org_name = organ.Name,
department_name = department.Name
};
var count = query.Count();
var list = query
@ -158,7 +161,7 @@ namespace TeacherExt.Controllers
}
[HttpGet]
public IActionResult Update(int id,string access_token)
public IActionResult Update(int id, string access_token)
{
var person = this._personRepo.ReadOnlyTable().Where(o => o.Id == id).FirstOrDefault();
var organ = this._organizationRepo.ReadOnlyTable().Where(o => o.Id == person.OrganId).FirstOrDefault();
@ -167,7 +170,7 @@ namespace TeacherExt.Controllers
this.EntityToModel(person, model);
this.ToEditModel(person, model);
model.LoginName = this._loginRepo.ReadOnlyTable().Where(o => o.PersonId == model.Id).Select(o => o.LoginName).FirstOrDefault();
if(!string.IsNullOrEmpty(access_token))
if (!string.IsNullOrEmpty(access_token))
{
var httpContext = this.Request.HttpContext;
var token = access_token;
@ -210,7 +213,7 @@ namespace TeacherExt.Controllers
ToStatus = model.CheckStatus
});
}
this.UpdateInternal(entity,model);
this.UpdateInternal(entity, model);
//entity.From(model);
//this.ModelToEntity(model, entity);
this._personRepo.SaveChanges();
@ -228,18 +231,18 @@ namespace TeacherExt.Controllers
private void UpdateInternal(Person entity, EditTeacherModel model)
{
var self = this.HttpContext.Request.Query.ContainsKey("self") || (this.HttpContext.Request.Method == "POST" && this.HttpContext.Request.Form.ContainsKey("self"));
if(self)
if (self)
{
if (entity.CheckStatus==model.CheckStatus)
if (entity.CheckStatus == model.CheckStatus)
{
if(model.CheckStatus== "未提交"||model.CheckStatus== "审核失败")
if (model.CheckStatus == "未提交" || model.CheckStatus == "审核失败")
{
entity.From(model);
this.ModelToEntity(model, entity);
}
else
{
if(entity.RequestEditStatus!=model.RequestEditStatus)
if (entity.RequestEditStatus != model.RequestEditStatus)
{
entity.RequestEditStatus = model.RequestEditStatus;
}
@ -255,13 +258,20 @@ namespace TeacherExt.Controllers
this.ModelToEntity(model, entity);
}
}
else if (entity.CheckStatus == "待审核")
{
if (model.CheckStatus == "未提交")
{
entity.CheckStatus = model.CheckStatus;
}
}
}
}
else
{
if (User.IsInRole("城中区教育局管理员"))
{
if (model.CheckStatus == "审核失败"&&model.RequestEditStatus== "未申请")
if (model.CheckStatus == "审核失败" && model.RequestEditStatus == "未申请")
{
entity.Comment = model.Comment;
entity.CheckStatus = model.CheckStatus;
@ -276,9 +286,9 @@ namespace TeacherExt.Controllers
entity.Comment = model.Comment;
entity.CheckStatus = model.CheckStatus;
entity.RequestEditStatus = model.RequestEditStatus;
entity.FromWhere(model,(s,t)=>s.Name.EndsWith("Checked"));
entity.FromWhere(model, (s, t) => s.Name.EndsWith("Checked"));
}
if (entity.RequestEditStatus!=model.RequestEditStatus)
if (entity.RequestEditStatus != model.RequestEditStatus)
{
entity.CheckStatus = model.CheckStatus;
entity.RequestEditStatus = model.RequestEditStatus;
@ -292,7 +302,7 @@ namespace TeacherExt.Controllers
var self = this.HttpContext.Request.Query.ContainsKey("self") || (this.HttpContext.Request.Method == "POST" && this.HttpContext.Request.Form.ContainsKey("self"));
if (self)
{
if (entity.CheckStatus!=model.CheckStatus)
if (entity.CheckStatus != model.CheckStatus)
{
if (model.CheckStatus == "待审核")
{
@ -301,15 +311,22 @@ namespace TeacherExt.Controllers
ModelState.AddModelError(nameof(model.CheckStatus), $"无法从[{entity.CheckStatus}]状态修改为[{model.CheckStatus}]状态");
}
}
if (model.CheckStatus == "未提交")
{
if (entity.CheckStatus != "待审核")
{
ModelState.AddModelError(nameof(model.CheckStatus), $"无法从[{entity.CheckStatus}]状态修改为[{model.CheckStatus}]状态");
}
}
}
if(entity.RequestEditStatus!=model.RequestEditStatus)
if (entity.RequestEditStatus != model.RequestEditStatus)
{
if(entity.CheckStatus== "未提交"||entity.CheckStatus=="审核失败")
if (entity.CheckStatus == "未提交" || entity.CheckStatus == "审核失败")
{
ModelState.AddModelError(nameof(model.RequestEditStatus), $"无法从[{entity.CheckStatus}]状态修改为[{model.RequestEditStatus}]状态");
}
}
if(model.LoginName!=User.Identity.Name)
if (model.LoginName != User.Identity.Name)
{
ModelState.AddModelError(nameof(model.RealName), $"当前用户不是[{model.RealName}]无法修改登录名其的个人信息");
}
@ -318,9 +335,9 @@ namespace TeacherExt.Controllers
{
if (User.IsInRole("城中区教育局管理员"))
{
if(model.CheckStatus== "审核失败")
if (model.CheckStatus == "审核失败")
{
if(entity.CheckStatus!= "审核成功")
if (entity.CheckStatus != "审核成功")
{
ModelState.AddModelError(nameof(model.CheckStatus), $"无法从[{entity.CheckStatus}]状态修改为[{model.CheckStatus}]状态");
}
@ -328,16 +345,16 @@ namespace TeacherExt.Controllers
}
else if (User.IsInRole("学校管理员"))
{
if(model.CheckStatus== "审核成功"||model.CheckStatus=="审核失败")
if (model.CheckStatus == "审核成功" || model.CheckStatus == "审核失败")
{
if (entity.CheckStatus != "待审核")
{
ModelState.AddModelError(nameof(model.CheckStatus), $"无法从[{entity.CheckStatus}]状态修改为[{model.CheckStatus}]状态");
}
}
if(entity.RequestEditStatus != model.RequestEditStatus)
if (entity.RequestEditStatus != model.RequestEditStatus)
{
if(entity.CheckStatus!="待审核"&& entity.CheckStatus != "审核成功")
if (entity.CheckStatus != "待审核" && entity.CheckStatus != "审核成功")
{
ModelState.AddModelError(nameof(model.RequestEditStatus), $"无法从[{entity.RequestEditStatus}]状态修改为[{model.RequestEditStatus}]状态");
}
@ -553,7 +570,7 @@ namespace TeacherExt.Controllers
var organQuery = this._organizationRepo.ReadOnlyTable();
var query = from person in personQuery
join organ in organQuery on person.OrganId equals organ.OrganId
orderby person.BureauId, person.CreateAt
orderby person.AreaId, person.CreateAt
select new { organ.Name, person = person };
//
var nations = this.GetNation();
@ -670,25 +687,19 @@ namespace TeacherExt.Controllers
var name = model.person_name?.Trim();
var personQuery = this._personRepo.ReadOnlyTable()
.Where(o => o.IsUsed)
.Where(o => o.BureauId == bureau_id);
if (User.IsInRole("城中区教育局管理员"))
{
if (model.bureau_id.Value != bureau_id)
{
personQuery = personQuery.Where(o => o.OrganId == model.bureau_id);
}
}
else if (User.IsInRole("学校管理员"))
.Where(o => o.AreaId == bureau_id);
if (model.bureau_id.Value != bureau_id)
{
personQuery = personQuery.Where(o => o.OrganId == model.bureau_id);
personQuery = personQuery.Where(o => o.BureauId == model.bureau_id);
}
else
if (!User.IsInRole("城中区教育局管理员") && !User.IsInRole("学校管理员"))
{
var personId= Convert.ToInt32(User.Claims.Where(o => o.Type == "PersonId").Select(o => o.Value).FirstOrDefault());
var personId = Convert.ToInt32(User.Claims.Where(o => o.Type == "PersonId").Select(o => o.Value).FirstOrDefault());
personQuery = personQuery.Where(o => o.Id == personId);
}
personQuery = personQuery
.WhereIf(!string.IsNullOrEmpty(model.person_name), o => o.RealName.Contains(name))
.WhereIf(!string.IsNullOrEmpty(name), o => o.RealName.Contains(name))
.WhereIf(!string.IsNullOrEmpty(model.RequestEditStatus), o => o.RequestEditStatus == model.RequestEditStatus)
.WhereIf(!string.IsNullOrEmpty(model.CheckStatus), o => o.CheckStatus == model.CheckStatus);
return personQuery;

2
labs/Teacher/TeacherExt/Data/TeacherDbContext.cs
Unescape View File

@ -51,7 +51,7 @@ namespace TeacherExt.Data
modelBuilder.Entity<Person>().Property(o => o.Id).HasColumnName("PERSON_ID").ValueGeneratedOnAdd();
modelBuilder.Entity<Person>().Property(o => o.RealName).HasColumnName("PERSON_NAME").IsRequired();
modelBuilder.Entity<Person>().Property(o => o.IsUsed).HasColumnName("B_USE").HasConversion(o => o ? 1 : 0, o => o == 1);
modelBuilder.Entity<Person>().Property(o => o.BureauId).HasColumnName("DISTRICT_ID");
modelBuilder.Entity<Person>().Property(o => o.BureauId).HasColumnName("BUREAU_ID");
modelBuilder.Entity<Person>().Property(o => o.OrganId).HasColumnName("ORG_ID");
modelBuilder.Entity<Person>().Property(o => o.Sex).HasColumnName("XB_NAME");
modelBuilder.Entity<Person>().Property(o => o.IdentityId).HasColumnName("IDENTITY_ID");

2
labs/Teacher/TeacherExt/Models/TeacherListItem.cs
Unescape View File

@ -12,6 +12,6 @@
public string placeofbirth { get; set; }
public string org_name { get; set; }
public int person_id { get; set; }
public string bureau_name { get; set; }
public string department_name { get; set; }
}
}

3
labs/Teacher/TeacherExt/TeacherExt.csproj
Unescape View File

@ -5,13 +5,12 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
<Version>1.0.0.0-beta.1</Version>
<Version>1.0.0.0-beta.4</Version>
<UserSecretsId>13a75881-1072-47ca-88e9-4d78bd678d65</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NPOI" Version="2.5.2" />
<PackageReference Include="Stateless" Version="5.1.8" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
</ItemGroup>
<ItemGroup>

103
labs/Teacher/TeacherExt/Views/Home/Index.cshtml
Unescape View File

@ -4,27 +4,27 @@
@model QueryTeacherModel
@{
var index = 0;
var isSuper=User.IsInRole("城中区教育局管理员");
var isSuper = User.IsInRole("城中区教育局管理员");
}
<div class="row">
@if (isSuper)
{
<div class="col-sm-4">
<div class="card">
<div class="card-body">
<ul class="navbar-nav">
@RenderOrgans(Model.Organs)
</ul>
<div class="col-sm-3">
<div class="card">
<div class="card-body">
<ul class="navbar-nav">
@RenderOrgans(Model.Organs)
</ul>
</div>
</div>
</div>
</div>
}
<div class="@(isSuper?"col-sm-8":"col-sm-12")">
<div class="@(isSuper?"col-sm-9":"col-sm-12")">
<form method="post" action="/" target="_self">
<div class="card">
<div class="card-header">
<div class="row">
@Html.HiddenFor(o=>o.bureau_id)
@Html.HiddenFor(o => o.bureau_id)
<div class="col-sm-4">
<div class="form-group row">
@Html.LabelFor(o => o.RequestEditStatus, new { @class = "col-sm-4 col-form-label" })
@ -65,12 +65,12 @@
@{
foreach (var item in Model.HeaderSelectList)
{
<div class="col-sm-3">
<label title="@item.Text" class="td"
style="width:100%;white-space:nowrap;text-overflow:ellipsis;overflow: hidden;word-break: break-all;">
<input type="checkbox" name="headers" value="@item.Value" @Html.Raw(item.Selected?"checked=\"checked\"":"") />@item.Text
</label>
</div>
<div class="col-sm-3">
<label title="@item.Text" class="td"
style="width:100%;white-space:nowrap;text-overflow:ellipsis;overflow: hidden;word-break: break-all;">
<input type="checkbox" name="headers" value="@item.Value" @Html.Raw(item.Selected ? "checked=\"checked\"" : "") />@item.Text
</label>
</div>
}
}
</div>
@ -90,6 +90,8 @@
<th>性别</th>
<th>民族</th>
<th>籍贯</th>
<th>学校</th>
<th>部门</th>
<th>操作</th>
<th>审计</th>
</tr>
@ -97,41 +99,43 @@
{
var url = Url.Action("Update", new { id = item.person_id });
index++;
<tr>
<td>@index</td>
<td>@item.login_name</td>
<td>@item.RequestEditStatus</td>
<td>@item.CheckStatus</td>
<td>@item.person_name</td>
<td>@item.sex</td>
<td>@item.nation_name</td>
<td>@item.placeofbirth</td>
<td>
@if (User.IsInRole("城中区教育局管理员"))
<tr>
<td>@index</td>
<td>@item.login_name</td>
<td>@item.RequestEditStatus</td>
<td>@item.CheckStatus</td>
<td>@item.person_name</td>
<td>@item.sex</td>
<td>@item.nation_name</td>
<td>@item.placeofbirth</td>
<td>@item.org_name</td>
<td>@item.department_name</td>
<td>
@if (User.IsInRole("城中区教育局管理员"))
{
<a href="@url">查看</a>
@if (item.CheckStatus == "审核成功")
<a href="@url">查看</a>
@if (item.CheckStatus == "审核成功")
{
<a href="@url">退回</a>
<a href="@url">退回</a>
}
}
@if (User.IsInRole("学校管理员"))
@if (User.IsInRole("学校管理员"))
{
<a href="@url">查看</a>
@if (item.CheckStatus == "待审核")
<a href="@url">查看</a>
@if (item.CheckStatus == "待审核")
{
<a href="@url">审核</a>
<a href="@url">审核</a>
}
@if (item.RequestEditStatus == "已申请")
@if (item.RequestEditStatus == "已申请")
{
<a href="@url">批准</a>
<a href="@url">批准</a>
}
}
</td>
<td>
<a href="@Url.Action("History",new { id=item.person_id})">日志</a>
</td>
</tr>
</td>
<td>
<a href="@Url.Action("History",new { id=item.person_id})">日志</a>
</td>
</tr>
}
</table>
</div>
@ -150,15 +154,15 @@
foreach (var item in list)
{
var cls = "nav-link" + (item.OrganId == Model.bureau_id.Value ? " " + "active" : "");
<li class="navbar-nav">
<a class="@cls" href="@Url.Action("Index",new { bureau_id=item.Id})">@item.Name</a>
@if (item.Children.Any())
<li class="navbar-nav">
<a class="@cls" href="@Url.Action("Index",new { bureau_id=item.Id})">@item.Name</a>
@if (item.Children.Any())
{
<ul class="nav-treeview">
@RenderOrgans(item.Children)
</ul>
<ul class="nav-treeview">
@RenderOrgans(item.Children)
</ul>
}
</li>
</li>
}
return "";
}
@ -186,7 +190,6 @@
checkAll.prop("indeterminate", true);
}
});
</script>
<script>
$(function () {
@ -225,8 +228,6 @@
}
});
});
</script>
<script>
$('[data-action]').click(function () {

30
labs/Teacher/TeacherExt/Views/Home/Update.cshtml
Unescape View File

@ -140,7 +140,14 @@
}
else
{
<button id="submitModifyRequest" type="button" class="btn btn-primary">申请修改</button>
@if (Model.CheckStatus == "待审核")
{
<button id="submitCancelRequest" type="button" class="btn btn-primary">取消审核申请</button>
}
else if (Model.CheckStatus == "审核成功")
{
<button id="submitModifyRequest" type="button" class="btn btn-primary">申请修改</button>
}
}
}
}
@ -148,22 +155,25 @@
{
@if (User.IsInRole("城中区教育局管理员") && Model.CheckStatus == "审核成功")
{
<span>教育局管理员:</span>
<button id="super" type="button" class="btn btn-primary">退回</button>
}
else if (User.IsInRole("学校管理员"))
{
@if (Model.CheckStatus == "待审核")
@if (Model.RequestEditStatus == "未申请")
{
<span>学校管理员:</span>
<button id="admin1" type="button" class="btn btn-primary">审核通过</button>
<button id="admin2" type="button" class="btn btn-primary">审核失败</button>
if (Model.CheckStatus == "待审核")
{
<button id="admin1" type="button" class="btn btn-primary">审核通过</button>
<button id="admin2" type="button" class="btn btn-primary">审核失败</button>
}
}
@if (Model.RequestEditStatus == "已申请")
else
{
<span>学校管理员:</span>
<button id="admin3" type="button" class="btn btn-primary">批准修改申请</button>
<button id="admin4" type="button" class="btn btn-primary">拒绝修改申请</button>
if (Model.CheckStatus == "审核成功")
{
<button id="admin3" type="button" class="btn btn-primary">批准修改申请</button>
<button id="admin4" type="button" class="btn btn-primary">拒绝修改申请</button>
}
}
}
}

9
labs/Teacher/TeacherExt/wwwroot/js/update.js
Unescape View File

@ -23,6 +23,15 @@ $('#submitCheckRequest').click(function () {
form.submit();
});
});
//待审核时取消提交审核的申请
$('#submitCancelRequest').click(function () {
var form = $(this).parents('form');
var msg = '确认' + $(this).text() + '？';
submit(msg, function () {
$('#CheckStatus').val('未提交');
form.submit();
});
});
//申请修改
$('#submitModifyRequest').click(function () {
var form = $(this).parents('form');

Write Preview
Loading…
Cancel
Save