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

update

Browse Source 
Former-commit-id: 42f09f564feb876054a86cdb9c34fa7f7f023742
Former-commit-id: 133ab96bc4d13c09bca90d90c497831a29387673
1.0
wanggang 5 years ago
parent 455b3c4ea4
commit 2a806f30f7
2 changed files with 42 additions and 48 deletions
Show Stats Download Patch File Download Diff File

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

@ -354,7 +354,11 @@ namespace TeacherExt.Controllers
where (person.IsUsed && person.BureauId == model.bureau_id)
orderby person.BureauId, person.CreateAt
select new { organ2.Name, person = person };
//
var nations = this.GetNation();
var titles = this.GetTitle();
var politics = this.GetPolitics();
var postTypes = this.GetPostType();
//
var style = NPOIHelper.CreateStyle(sheet, fontName: "宋体", fontSize: 11);
@ -372,7 +376,6 @@ namespace TeacherExt.Controllers
.ToList();
var rowIndex = 0;
var colIndex = -1;
var nations = this.GetNation();
for (int i = 0; i < list.Count; i++)
{
var teacher = list[i];
@ -385,7 +388,7 @@ namespace TeacherExt.Controllers
row.Export("A", headers, () => teacher.DisplayOrder)?.SetCell(++colIndex, style, teacher.DisplayOrder);
row.Export("B", headers, () => teacher.OrganName)?.SetCell(++colIndex, style, teacher.OrganName);
row.Export("C", headers, () => teacher.RealName)?.SetCell(++colIndex, style, teacher.RealName);
row.Export("D", headers, () => teacher.Sex)?.SetCell(++colIndex, style, teacher.Sex);
row.Export("D", headers, () => teacher.Sex)?.SetCell(++colIndex, style,teacher.Sex);
row.Export("E", headers, () => teacher.Birthday)?.SetCell(++colIndex, style, teacher.Birthday);
row.Export("F", headers, () => teacher.Age)?.SetCell(++colIndex, style, teacher.Age);
row.Export("G", headers, () => teacher.Nation)?.SetCell(++colIndex, style, nations.GetText(teacher.Nation));
@ -397,16 +400,16 @@ namespace TeacherExt.Controllers
row.Export("M", headers, () => teacher.CurrentJobStart)?.SetCell(++colIndex, style, teacher.CurrentJobStart);
row.Export("N", headers, () => teacher.JobAgeYear)?.SetCell(++colIndex, style, teacher.JobAgeYear, teacher.WorkingTime.HasValue);
row.Export("O", headers, () => teacher.JobAgeMonth)?.SetCell(++colIndex, style, teacher.JobAgeMonth, teacher.WorkingTime.HasValue);
row.Export("P", headers, () => teacher.Politics)?.SetCell(++colIndex, style, teacher.Politics);
row.Export("P", headers, () => teacher.Politics)?.SetCell(++colIndex, style,politics.GetText( teacher.Politics));
row.Export("Q", headers, () => teacher.JoinPartyDate)?.SetCell(++colIndex, style, teacher.JoinPartyDate);
row.Export("R", headers, () => teacher.MaxTitle)?.SetCell(++colIndex, style, teacher.MaxTitle);
row.Export("R", headers, () => teacher.MaxTitle)?.SetCell(++colIndex, style,titles.GetText(teacher.MaxTitle));
row.Export("S", headers, () => teacher.MaxTitleStart)?.SetCell(++colIndex, style, teacher.MaxTitleStart);
row.Export("T", headers, () => teacher.JobAsMaxTitleDate)?.SetCell(++colIndex, style, teacher.JobAsMaxTitleDate, teacher.IsJobAsMaxTitle.HasValue && teacher.IsJobAsMaxTitle.Value);
row.Export("U", headers, () => teacher.JobAsNotMaxTitleReason)?.SetCell(++colIndex, style, teacher.JobAsNotMaxTitleReason, teacher.IsJobAsMaxTitle.HasValue && !teacher.IsJobAsMaxTitle.Value);
row.Export("V", headers, () => teacher.NotMaxTitle)?.SetCell(++colIndex, style, teacher.NotMaxTitle, teacher.IsJobAsMaxTitle.HasValue && !teacher.IsJobAsMaxTitle.Value);
row.Export("V", headers, () => teacher.NotMaxTitle)?.SetCell(++colIndex, style,titles.GetText(teacher.NotMaxTitle), teacher.IsJobAsMaxTitle.HasValue && !teacher.IsJobAsMaxTitle.Value);
row.Export("W", headers, () => teacher.NotMaxTitleStart)?.SetCell(++colIndex, style, teacher.NotMaxTitleStart, teacher.IsJobAsMaxTitle.HasValue && !teacher.IsJobAsMaxTitle.Value);
row.Export("X", headers, () => teacher.JobAsNotMaxTitleDate)?.SetCell(++colIndex, style, teacher.JobAsNotMaxTitleDate, teacher.IsJobAsMaxTitle.HasValue && !teacher.IsJobAsMaxTitle.Value);
row.Export("Y", headers, () => teacher.PostType)?.SetCell(++colIndex, style, teacher.PostType);
row.Export("Y", headers, () => teacher.PostType)?.SetCell(++colIndex, style, postTypes.GetText(teacher.PostType));
row.Export("Z", headers, () => teacher.PostGrade)?.SetCell(++colIndex, style, teacher.PostGrade);
row.Export("AA", headers, () => teacher.CurrentPostGradeStart)?.SetCell(++colIndex, style, teacher.CurrentPostGradeStart);
@ -450,18 +453,18 @@ namespace TeacherExt.Controllers
{
ViewData.SelectList(o => model.Nation, () => this.GetNation(model.Nation));
ViewData.SelectList(o => model.Politics, () => this.GetPolitics(model.Politics));
ViewData.SelectList(o => model.MaxTitle, () => this.GetTitle(model.MaxTitle));
ViewData.SelectList(o => model.NotMaxTitle, () => this.GetTitle(model.MaxTitle));
//
ViewData.SelectList(o => model.Nationality, () => this.GetSelectListFromDirectory("NATIONALITY", model.Nationality));
ViewData.SelectList(o => model.UserType, () => this.GetSelectListFromDirectory("PERSON_STATUS", model.UserType));
ViewData.SelectList(o => model.PostType, () => this.GetSelectListFromDirectory("POST_CATEGORY", model.PostType));
ViewData.SelectList(o => model.PostType, () => this.GetPostType(model.PostType));
ViewData.SelectList(o => model.MaritalStatus, () => this.GetSelectListFromDirectory("MARITAL_STATUS", model.MaritalStatus));
ViewData.SelectList(o => model.MaxTitle, () => this.GetSelectListFromDirectory("PROFESSIONAL_TITLE", model.MaxTitle));
ViewData.SelectList(o => model.MaxDegree, () => this.GetSelectListFromDirectory("DEGREE", model.MaxDegree));
ViewData.SelectList(o => model.FirstEducation, () => this.GetSelectListFromDirectory("DEGREE", model.FirstEducation));
ViewData.SelectList(o => model.MaxEducation, () => this.GetSelectListFromDirectory("DEGREE", model.MaxEducation));
ViewData.SelectList(o => model.Position, () => this.GetSelectListFromDirectory("ADMINISTRATIVE_POST", model.Position));
//
ViewData.SelectList(o => model.NotMaxTitle, () => this.GetSelectListFromDirectory("PROFESSIONAL_TITLE", model.MaxTitle));
ViewData.SelectList(o => model.FullTimeSchoolEducation, () => this.GetSelectListFromDirectory("DEGREE", model.MaxDegree));
ViewData.SelectList(o => model.JobTimeSchoolEducation, () => this.GetSelectListFromDirectory("DEGREE", model.MaxDegree));
////
@ -513,58 +516,34 @@ namespace TeacherExt.Controllers
// }.ToSelectList(selected);
//}
private SelectList GetSex(string selected)
private SelectList GetSex(object selected=null)
{
return new string[] {
"男",
"女",
}.ToSelectList(selected);
return this.GetSelectListFromDirectory("SEX2", selected);
}
private SelectList GetNation(string selected = null)
private SelectList GetNation(object selected = null)
{
return this.GetSelectListFromDirectory("ETHNIC_GROUP", selected);
}
private SelectList GetPolitics(object selected)
private SelectList GetPolitics(object selected = null)
{
return this.GetSelectListFromDirectory("POLITICALSTATUS", selected);
}
//private SelectList GetTitle(string selected)
//{
// return new string[] {
// "正高级教师",
// "高级教师",
// "一级教师",
// "二级教师",
// "未评",
// "工勤",
// }.ToSelectList(selected);
//}
private SelectList GetTitle(object selected = null)
{
return this.GetSelectListFromDirectory("PROFESSIONAL_TITLE", selected);
}
//private SelectList GetPost(string selected)
//{
// return new string[] {
// "专技岗位",
// "管理岗位",
// "工勤岗位",
// }.ToSelectList(selected);
//}
private SelectList GetPostType(object selected = null)
{
return this.GetSelectListFromDirectory("POST_CATEGORY", selected);
}
private SelectList GetPostGrade(string selected)
private SelectList GetPostGrade(object selected=null)
{
return new string[] {
"四级",
"五级",
"六级",
"七级",
"八级",
"九级",
"十级",
"十一级",
"十二级",
}.ToSelectList(selected);
return this.GetSelectListFromDirectory("POSTGRADE2", selected);
}
private SelectList GetEducationGrade(string selected)

15
labs/Teacher/TeacherExt/update.sql
Unescape View File

@ -15,8 +15,23 @@ CREATE TABLE `t_base_person_log2` (
PRIMARY KEY (`Id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('SEX2',1,'男','男','男',1);
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('SEX2',1,'女','女','女',2);
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('POSTGRADE2',1,'四级','四级','四级',4);
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('POSTGRADE2',1,'五级','五级','五级',5);
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('POSTGRADE2',1,'六级','六级','六级',6);
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('POSTGRADE2',1,'七级','七级','七级',7);
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('POSTGRADE2',1,'八级','八级','八级',8);
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('POSTGRADE2',1,'九级','九级','九级',9);
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('POSTGRADE2',1,'十级','十级','十级',10);
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('POSTGRADE2',1,'十一级','十一级','十一级',11);
insert into t_sys_dic_item (KIND,B_USE,CODE,DETAIL,REMARK,SORT) values('POSTGRADE2',1,'十二级','十二级','十二级',12);
update t_sys_dic_item set DETAIL = '区聘教师',REMARK='区聘教师' where KIND='PERSON_STATUS' and DETAIL='区招代课教师';
update t_sys_dic_item set DETAIL = '校聘教师',REMARK='校聘教师' where KIND='PERSON_STATUS' and DETAIL='校招代课教师';
update t_sys_dic_item set DETAIL = '未评',REMARK='未评' where KIND='PROFESSIONAL_TITLE' and DETAIL='未定级';
update t_sys_dic_item set DETAIL = '工勤',REMARK='工勤' where KIND='PROFESSIONAL_TITLE' and DETAIL='其他';
update t_sys_dic_item set DETAIL = '专业岗位',REMARK='专业岗位' where KIND='POST_CATEGORY' and DETAIL='专业技术岗位';
update t_sys_dic_item set DETAIL = '工勤岗位',REMARK='工勤岗位' where KIND='POST_CATEGORY' and DETAIL='工勤技能岗位';
update t_base_person set STAGE_NAME='普通初中' where STAGE_NAME='初中';
update t_base_person set SUBJECT_NAME='无' where SUBJECT_NAME='通用';

Write Preview
Loading…
Cancel
Save