update

Former-commit-id: 3b2d61c9d68ae3889fbd2c9e50787f7f4e503ccd
Former-commit-id: 8d151a6e4a9a3a6bc727c7d3c911309cd4c10d12

labs/Teacher/TeacherExt/Controllers/ArrayExt.cs

@@ -1,13 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Linq;
-
-namespace TeacherExt.Controllers
-{
-    public static class ArrayExt
-    {
-        public static SelectList ToSelectList(this string[] array,string selected)
-        {
-            return new SelectList(array.Select(o=>new SelectListItem { Value=o,Text=o }),"Value","Text",selected);
-        }
-    }
-}

labs/Teacher/TeacherExt/Controllers/Ext.cs

@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Mvc.Rendering;
+using System.Linq;
+
+namespace TeacherExt.Controllers
+{
+    public static class Ext
+    {
+        public static SelectList ToSelectList(this string[] array, string selected)
+        {
+            return new SelectList(array.Select(o => new SelectListItem { Value = o, Text = o }), "Value", "Text", selected);
+        }
+
+        public static string GetText(this SelectList list, object value)
+        {
+            var items = list.Items.Cast<SelectListItem>().ToList();
+            return items.FirstOrDefault(o => o.Value == value?.ToString())?.Text;
+        }
+    }
+}

labs/Teacher/TeacherExt/Controllers/NPOIHelper.cs

@@ -25,7 +25,7 @@ namespace TeacherExt.Controllers
             return cell;
         }
 
-        public static ICell SetCell(this IRow row,int col, ICellStyle style,object value,bool? flag=null)
+        public static ICell SetCell(this IRow row,int col, ICellStyle style,object value,bool? flag=null,string kind=null)
         {
             var cell = row.GetCell(col) ?? row.CreateCell(col);
             cell.SetStyle(style);
@@ -41,7 +41,7 @@ namespace TeacherExt.Controllers
                     else if (value.GetType().UnderlyingSystemType == typeof(DateTime))
                     {
                         cell.SetCellType(CellType.String);
-                        cell.SetCellValue((value as DateTime?).Value);
+                        cell.SetCellValue((value as DateTime?).Value.ToString("yyyy-MM"));
                     }
                     else
                     {

labs/Teacher/TeacherExt/Entities/Person.cs

@@ -34,15 +34,15 @@ namespace TeacherExt.Entities
         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; }
+        public int? Nationality { get; set; }
+        public int? UserType { get; set; }
         public int PostType { get; set; }
         public int MaritalStatus { get; set; }
         public DateTime? WorkingTime { get; set; }
         public string WorkingPlace { get; set; }
-        public int Politics { get; set; }
-        public int MaxTitle { get; set; }
-        public int MaxDegree { get; set; }
+        public int? Politics { get; set; }
+        public int? MaxTitle { get; set; }
+        public int? MaxDegree { get; set; }
         public string MaxMajor { get; set; }
         public string MainTeachPeriod { get; set; }
         public string MainTeachSubject { get; set; }
@@ -50,7 +50,7 @@ namespace TeacherExt.Entities
         public int FirstEducation { get; set; }
         public string FirstGraduateSchool { get; set; }
         public string FirstMajor { get; set; }
-        public int MaxEducation { get; set; }
+        public int? MaxEducation { get; set; }
         public string Email { get; set; }
         public string Position { get; set; }
         public string MaxEducationSchool { get; set; }

labs/Teacher/TeacherExt/Models/EditTeacherModel.cs

@@ -51,7 +51,7 @@ namespace TeacherExt.Models
         [SelectList]
         [Display(Order = 30, Name = "人员类别")]
         [Required(ErrorMessage = "必填项")]
-        public int UserType { get; set; }
+        public int? UserType { get; set; }
 
         [ExcelHeader("性别")]
         [SkipSearch]
@@ -70,7 +70,7 @@ namespace TeacherExt.Models
         [SelectList]
         [Display(Order = 41, Name = "国籍")]
         [Required(ErrorMessage = "必填项")]
-        public int Nationality { get; set; }
+        public int? Nationality { get; set; }
 
         [ExcelHeader("出生年月")]
         [SkipSearch, SkipList]
@@ -172,7 +172,7 @@ namespace TeacherExt.Models
         [SelectList]
         [Display(Order = 150, Name = "政治面貌")]
         [Required(ErrorMessage = "必填项")]
-        public int Politics { get; set; }
+        public int? Politics { get; set; }
 
         [ExcelHeader("入党(派)\r\n时间")]
         [SkipSearch, SkipList]
@@ -185,7 +185,7 @@ namespace TeacherExt.Models
         [SelectList]
         [Display(Order = 170, Name = "最高职称")]
         [Required(ErrorMessage = "必填项")]
-        public int MaxTitle { get; set; }
+        public int? MaxTitle { get; set; }
 
         [SkipSearch, SkipList]
         [Display(Order = 171, Name = "最高职称-已审核")]
@@ -401,7 +401,7 @@ namespace TeacherExt.Models
         [SkipSearch, SkipList]
         [SelectList]
         [Display(Order = 390, Name = "最高学历")]
-        public int MaxEducation { get; set; }
+        public int? MaxEducation { get; set; }
 
         [Display(Order = 391, Name = "最高学历毕业院校")]
         [SkipSearch, SkipList]
@@ -411,7 +411,7 @@ namespace TeacherExt.Models
         [SkipSearch, SkipList]
         [SelectList]
         [Display(Order = 400, Name = "最高学位")]
-        public int MaxDegree { get; set; }
+        public int? MaxDegree { get; set; }
 
         [SkipSearch, SkipList]
         [Display(Order = 402, Name = "最高学位毕业院校")]

labs/Teacher/TeacherExt/Models/QueryTeacherModel.cs

@@ -6,7 +6,7 @@ using TeacherExt.Entities;
 
 namespace TeacherExt.Models
 {
-    public class QueryTeacherModel : PagedList<ListItem>
+    public class QueryTeacherModel : PagedList<TeacherListItem>
     {
         public int bureau_id { get; set; } = 302705;
 

labs/Teacher/TeacherExt/Models/TeacherListItem.cs

@@ -1,9 +1,9 @@
 namespace TeacherExt.Models
 {
-    public class ListItem
+    public class TeacherListItem
     {
-        public string RequestEditStatus { get; set; } = "未提交";
-        public string CheckStatus { get; 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; }

labs/Teacher/TeacherExt/Startup.cs

@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -15,14 +14,11 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
 using System.Threading.Tasks;
 using TeacherExt.Data;
-using TeacherExt.Entities;
 
 namespace TeacherExt
 {
@@ -170,58 +166,58 @@ namespace TeacherExt
                     name: "default",
                     pattern: "{controller=Home}/{action=Index}/{id?}");
             });
-            using var scope = app.ApplicationServices.CreateScope();            
+            using var scope = app.ApplicationServices.CreateScope();
             //var encryptionService = scope.ServiceProvider.GetRequiredService<IEncryptionService>();
             //var salt = "111111";
             //var password = encryptionService.CreatePasswordHash(salt, salt);
-            using var db = scope.ServiceProvider.GetRequiredService<DbContext>();
-            var set = "Sex2";
-            if (!db.Set<DictionaryItem>().AsNoTracking().Any(o => o.Category == set))
-            {
-                db.Set<DictionaryItem>().Add(new DictionaryItem { Category = set, Detail = "男", Remark = "男", Code = "男", Order = 1 });
-                db.Set<DictionaryItem>().Add(new DictionaryItem { Category = set, Detail = "女", Remark = "女", Code = "女", Order = 2 });
-                db.SaveChanges();
-            }
-            var teachPeriod = "MainTeachPeriod2";//t_dm_stage
-            if (!db.Set<DictionaryItem>().AsNoTracking().Any(o => o.Category == teachPeriod))
-            {
-                db.Set<DictionaryItem>().Add(new DictionaryItem { Category = teachPeriod, Detail = "学前教育", Remark = "学前教育", Code = "学前教育", Order = 1 });
-                db.Set<DictionaryItem>().Add(new DictionaryItem { Category = teachPeriod, Detail = "小学", Remark = "小学", Code = "小学", Order = 2 });
-                db.Set<DictionaryItem>().Add(new DictionaryItem { Category = teachPeriod, Detail = "普通初中", Remark = "普通初中", Code = "普通初中", Order = 3 });
-                db.Set<DictionaryItem>().Add(new DictionaryItem { Category = teachPeriod, Detail = "无", Remark = "无", Code = "无", Order = 4 });
-                db.SaveChanges();
-            }
-            var teachSubject = "MainTeachSubject2";//t_dm_subject
-            if (!db.Set<DictionaryItem>().AsNoTracking().Any(o => o.Category == teachSubject))
-            {
-                var subjects = new string[] {
-                    "语文",
-                    "数学",
-                    "英语",
-                    "音乐",
-                    "体育",
-                    "美术",
-                    "科学",
-                    "书法",
-                    "信息技术",
-                    "政治",
-                    "历史",
-                    "地理",
-                    "物理",
-                    "化学",
-                    "生物",
-                    "幼教全科",
-                    "心理健康",
-                    "综合实践课",
-                    "无",
-                };
-                for (int i = 0; i < subjects.Length; i++)
-                {
-                    var item = subjects[i];
-                    db.Set<DictionaryItem>().Add(new DictionaryItem { Category = teachSubject, Detail = item, Remark = item, Code = item, Order = i + 1 });
-                }
-                db.SaveChanges();
-            }
+            //using var db = scope.ServiceProvider.GetRequiredService<DbContext>();
+            //var set = "Sex2";
+            //if (!db.Set<DictionaryItem>().AsNoTracking().Any(o => o.Category == set))
+            //{
+            //    db.Set<DictionaryItem>().Add(new DictionaryItem { Category = set, Detail = "男", Remark = "男", Code = "男", Order = 1 });
+            //    db.Set<DictionaryItem>().Add(new DictionaryItem { Category = set, Detail = "女", Remark = "女", Code = "女", Order = 2 });
+            //    db.SaveChanges();
+            //}
+            //var teachPeriod = "MainTeachPeriod2";//t_dm_stage
+            //if (!db.Set<DictionaryItem>().AsNoTracking().Any(o => o.Category == teachPeriod))
+            //{
+            //    db.Set<DictionaryItem>().Add(new DictionaryItem { Category = teachPeriod, Detail = "学前教育", Remark = "学前教育", Code = "学前教育", Order = 1 });
+            //    db.Set<DictionaryItem>().Add(new DictionaryItem { Category = teachPeriod, Detail = "小学", Remark = "小学", Code = "小学", Order = 2 });
+            //    db.Set<DictionaryItem>().Add(new DictionaryItem { Category = teachPeriod, Detail = "普通初中", Remark = "普通初中", Code = "普通初中", Order = 3 });
+            //    db.Set<DictionaryItem>().Add(new DictionaryItem { Category = teachPeriod, Detail = "无", Remark = "无", Code = "无", Order = 4 });
+            //    db.SaveChanges();
+            //}
+            //var teachSubject = "MainTeachSubject2";//t_dm_subject
+            //if (!db.Set<DictionaryItem>().AsNoTracking().Any(o => o.Category == teachSubject))
+            //{
+            //    var subjects = new string[] {
+            //        "语文",
+            //        "数学",
+            //        "英语",
+            //        "音乐",
+            //        "体育",
+            //        "美术",
+            //        "科学",
+            //        "书法",
+            //        "信息技术",
+            //        "政治",
+            //        "历史",
+            //        "地理",
+            //        "物理",
+            //        "化学",
+            //        "生物",
+            //        "幼教全科",
+            //        "心理健康",
+            //        "综合实践课",
+            //        "无",
+            //    };
+            //    for (int i = 0; i < subjects.Length; i++)
+            //    {
+            //        var item = subjects[i];
+            //        db.Set<DictionaryItem>().Add(new DictionaryItem { Category = teachSubject, Detail = item, Remark = item, Code = item, Order = i + 1 });
+            //    }
+            //    db.SaveChanges();
+            //}
         }
     }
-}
+}

labs/Teacher/TeacherExt/teacher.sql

@@ -1,218 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : localhost
- Source Server Type    : MySQL
- Source Server Version : 80021
- Source Host           : localhost:3306
- Source Schema         : teacher
-
- Target Server Type    : MySQL
- Target Server Version : 80021
- File Encoding         : 65001
-
- Date: 20/01/2021 12:19:19
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for t_base_organization
--- ----------------------------
-DROP TABLE IF EXISTS `t_base_organization`;
-CREATE TABLE `t_base_organization`  (
-  `ORG_ID` int(0) NOT NULL AUTO_INCREMENT,
-  `AREA_ID` int(0) NOT NULL,
-  `ORG_TYPE` int(0) NOT NULL,
-  `ORG_NAME` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `B_USE` int(0) NOT NULL,
-  PRIMARY KEY (`ORG_ID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for t_base_person
--- ----------------------------
-DROP TABLE IF EXISTS `t_base_person`;
-CREATE TABLE `t_base_person`  (
-  `PERSON_ID` int(0) NOT NULL AUTO_INCREMENT,
-  `B_USE` int(0) NOT NULL,
-  `PERSON_NAME` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
-  `XB_NAME` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `BUREAU_ID` int(0) NOT NULL,
-  `ORG_ID` int(0) NOT NULL,
-  `IDENTITY_ID` int(0) NOT NULL,
-  `IDENTITY_NUM` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `TEL` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `DISTRICT_ID` int(0) NOT NULL,
-  `create_time` datetime(6) NOT NULL,
-  `NATION` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `placeofbirth` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `birthday` datetime(6) NULL DEFAULT NULL,
-  `nationality` int(0) NOT NULL,
-  `person_status` int(0) NOT NULL,
-  `post_category` int(0) NOT NULL,
-  `marital_status` int(0) NOT NULL,
-  `working_time` datetime(6) NULL DEFAULT NULL,
-  `working_place` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `political_status` int(0) NOT NULL,
-  `professional_title` int(0) NOT NULL,
-  `academic_degree` int(0) NOT NULL,
-  `highest_major` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `STAGE_NAME` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `SUBJECT_NAME` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `address` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `first_degree` int(0) NOT NULL,
-  `first_graduate_school` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `first_major` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `highest_degree` int(0) NOT NULL,
-  `EMAIL` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `administrative_post` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `highest_graduate_school` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `academic_degree_graduschool` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `join_zggcd` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `join_zggqt` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `join_mzdp` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  PRIMARY KEY (`PERSON_ID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for t_base_person_log
--- ----------------------------
-DROP TABLE IF EXISTS `t_base_person_log`;
-CREATE TABLE `t_base_person_log`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
-  `UpdateBy` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `UpdateAt` datetime(6) NULL DEFAULT NULL,
-  `PersonId` int(0) NOT NULL,
-  `LoginName` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `RealName` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `FromStatus` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `ToStatus` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for t_sys_dic_item
--- ----------------------------
-DROP TABLE IF EXISTS `t_sys_dic_item`;
-CREATE TABLE `t_sys_dic_item`  (
-  `DIC_ITEM_ID` int(0) NOT NULL AUTO_INCREMENT,
-  `CODE` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `DETAIL` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `REMARK` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `B_USE` int(0) NOT NULL,
-  `KIND` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `SORT` bigint(0) NOT NULL,
-  PRIMARY KEY (`DIC_ITEM_ID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for t_sys_loginperson
--- ----------------------------
-DROP TABLE IF EXISTS `t_sys_loginperson`;
-CREATE TABLE `t_sys_loginperson`  (
-  `ID` int(0) NOT NULL AUTO_INCREMENT,
-  `B_USE` int(0) NOT NULL,
-  `person_id` int(0) NOT NULL,
-  `PERSON_NAME` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `LOGIN_NAME` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for t_sys_person_role
--- ----------------------------
-DROP TABLE IF EXISTS `t_sys_person_role`;
-CREATE TABLE `t_sys_person_role`  (
-  `ID` int(0) NOT NULL AUTO_INCREMENT,
-  `IsUsed` tinyint(1) NOT NULL,
-  `person_id` int(0) NOT NULL,
-  `IDENTITY_ID` int(0) NOT NULL,
-  `ROLE_ID` int(0) NOT NULL,
-  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for t_sys_role
--- ----------------------------
-DROP TABLE IF EXISTS `t_sys_role`;
-CREATE TABLE `t_sys_role`  (
-  `ROLE_ID` int(0) NOT NULL AUTO_INCREMENT,
-  `ROLE_NAME` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  PRIMARY KEY (`ROLE_ID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for Teacher
--- ----------------------------
-DROP TABLE IF EXISTS `Teacher`;
-CREATE TABLE `Teacher`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
-  `RequestEditStatus` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `CheckStatus` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `TeachDate` datetime(6) NULL DEFAULT NULL,
-  `CurrentJobStart` datetime(6) NULL DEFAULT NULL,
-  `CurrentJobStartChecked` tinyint(1) NOT NULL,
-  `JoinPartyDate` datetime(6) NULL DEFAULT NULL,
-  `MaxTitleChecked` tinyint(1) NOT NULL,
-  `MaxTitleStart` datetime(6) NULL DEFAULT NULL,
-  `MaxTitleStartChecked` tinyint(1) NOT NULL,
-  `IsJobAsMaxTitle` tinyint(1) NOT NULL,
-  `JobAsMaxTitleDate` datetime(6) NULL DEFAULT NULL,
-  `JobAsMaxTitleDateChecked` tinyint(1) NOT NULL,
-  `JobAsNotMaxTitleReason` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `JobAsNotMaxTitleReasonChecked` tinyint(1) NOT NULL,
-  `NotMaxTitle` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `NotMaxTitleChecked` tinyint(1) NOT NULL,
-  `NotMaxTitleStart` datetime(6) NULL DEFAULT NULL,
-  `NotMaxTitleStartChecked` tinyint(1) NOT NULL,
-  `JobAsNotMaxTitleDate` datetime(6) NULL DEFAULT NULL,
-  `JobAsNotMaxTitleDateChecked` tinyint(1) NOT NULL,
-  `PostGrade` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `PostGradeChecked` tinyint(1) NOT NULL,
-  `CurrentPostGradeStart` datetime(6) NULL DEFAULT NULL,
-  `CurrentPostGradeStartChecked` tinyint(1) NOT NULL,
-  `EducationGrade` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `EducationGradeChecked` tinyint(1) NOT NULL,
-  `EducationGradeDate` datetime(6) NULL DEFAULT NULL,
-  `EducationGradeDateChecked` tinyint(1) NOT NULL,
-  `FullTimeSchoolType` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `FullTimeSchool` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `FullTimeSchoolMajor` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `FullTimeSchoolEducation` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `FullTimeSchoolEducationDate` datetime(6) NULL DEFAULT NULL,
-  `JobTimeSchoolType` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `JobTimeSchool` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `JobTimeSchoolMajor` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `JobTimeSchoolEducation` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `JobTimeSchoolEducationDate` datetime(6) NULL DEFAULT NULL,
-  `IsClassTeacher` tinyint(1) NOT NULL,
-  `IsClassTeacherChecked` tinyint(1) NOT NULL,
-  `MainTeachPeriodChecked` tinyint(1) NOT NULL,
-  `MainTeachSubjectChecked` tinyint(1) NOT NULL,
-  `MainTeachGrade` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `MainTeachGradeChecked` tinyint(1) NOT NULL,
-  `OtherTeachPeriod` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `OtherTeachPeriodChecked` tinyint(1) NOT NULL,
-  `OtherTeachSubject` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `OtherTeachSubjectChecked` tinyint(1) NOT NULL,
-  `HasPosition` tinyint(1) NOT NULL,
-  `IsMiddleLevel` tinyint(1) NOT NULL,
-  `PositionChecked` tinyint(1) NOT NULL,
-  `PositionStart` datetime(6) NULL DEFAULT NULL,
-  `PositionStartChecked` tinyint(1) NOT NULL,
-  `FrontTeacher` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `NotOnPostReason` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `NotOnPostReasonChecked` tinyint(1) NOT NULL,
-  `NotOnPostReasonDate` datetime(6) NULL DEFAULT NULL,
-  `NotOnPostReasonDateChecked` tinyint(1) NOT NULL,
-  `TeacherCardType` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `TeacherCardSubject` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `TeacherCardLangLevel` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `CurrentAddressArea` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  `Comment` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;

labs/Teacher/TeacherExt/update.sql

@@ -15,7 +15,8 @@ CREATE TABLE `t_base_person_log2`  (
   PRIMARY KEY (`Id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
-
+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_base_person set STAGE_NAME='普通初中' where STAGE_NAME='初中';
 update t_base_person set SUBJECT_NAME='无' where SUBJECT_NAME='通用';
 
@@ -83,4 +84,6 @@ alter table `t_base_person` add column  `TeacherCardLangLevel` longtext CHARACTE
 alter table `t_base_person` add column  `CurrentAddressArea` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL;
 alter table `t_base_person` add column  `Comment` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL;
 
+update t_base_person set RequestEditStatus = '未申请'
+update t_base_person set CheckStatus = '未提交';
 commit;