【修改】教师实体增加字段；表单页面最高学历、学位修改数据字典code；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -125,8 +125,8 @@ var bootstrap = function ($, learun) {
             $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese', allowSearch: true });
             $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus', allowSearch: true });
             //初始学历
-            $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });
-            $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
+            $('#CultureDegreeNo').lrDataItemSelect({ code: 'RecordInSchool', allowSearch: true });
+            $('#DegreeNo').lrDataItemSelect({ code: 'DegreeInSchool', allowSearch: true });
             $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true });
             $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'BCdSubjectSpecies', allowSearch: true });
             $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage', allowSearch: true });
@@ -136,9 +136,11 @@ var bootstrap = function ($, learun) {
             //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#PostRank').lrDataItemSelect({ code: 'BCdTitleOfTechPost', allowSearch: true });
             $('#Photo').lrUploader();
-            $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
+            //最高学历
+            //$('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
+            $('#HighestRecord').lrDataItemSelect({ code: 'RecordInSchool', allowSearch: true });
             $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWay' });
-            $('#InitialDegree').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
+            $('#InitialDegree').lrDataItemSelect({ code: 'DegreeInSchool', allowSearch: true });
             $('#ObtainWayOfInitialDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
             $('#ObtainWayOfHighestDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
             $('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile5.pubxml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
+自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>D:\Job-release\DigitalSchoolWeb</publishUrl>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs

@@ -590,7 +590,86 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("F_ORDER")]
         public int? F_Order { get; set; }
-
+        /// <summary>
+        /// 教职工类别
+        /// </summary>
+        [Column("TEACHERCATEGORY")]
+        public string TeacherCategory { get; set; }
+        /// <summary>
+        /// 编制类别
+        /// </summary>
+        [Column("COMPILATIONSORT")]
+        public string CompilationSort { get; set; }
+        /// <summary>
+        /// 曾用名
+        /// </summary>
+        [Column("OLDEMPNAME")]
+        public string OldEmpName { get; set; }
+        /// <summary>
+        /// 职务层次
+        /// </summary>
+        [Column("JOBLEVEL")]
+        public string JobLevel { get; set; }
+        /// <summary>
+        /// 职务级别
+        /// </summary>
+        [Column("JOBGRADE")]
+        public string JobGrade { get; set; }
+        /// <summary>
+        /// 行政职务
+        /// </summary>
+        [Column("JOBNAME")]
+        public string JobName { get; set; }
+        /// <summary>
+        /// 工作岗位性质
+        /// </summary>
+        [Column("POSTPROPERTY")]
+        public string PostProperty { get; set; }
+        /// <summary>
+        /// 教职工来源
+        /// </summary>
+        [Column("TEACHERSOURCE")]
+        public string TeacherSource { get; set; }
+        /// <summary>
+        /// 聘任岗位级别
+        /// </summary>
+        [Column("RECRUITPOSTLEVEL")]
+        public string RecruitPostLevel { get; set; }
+        /// <summary>
+        /// 初始学历取得时间
+        /// </summary>
+        [Column("INITALRECORDGETTIME")]
+        public DateTime? InitalRecordGetTime { get; set; }
+        /// <summary>
+        /// 人事代理签订日期
+        /// </summary>
+        [Column("PERSONAGENTSIGNTIME")]
+        public DateTime? PersonAgentSignTime { get; set; }
+        /// <summary>
+        /// 有教师资格证书
+        /// </summary>
+        [Column("ISTEACHERCERTIFICATE")]
+        public bool? IsTeacherCertificate { get; set; }
+        /// <summary>
+        /// 是否双师教师
+        /// </summary>
+        [Column("ISDOUBLETEACHER")]
+        public bool? IsDoubleTeacher { get; set; }
+        /// <summary>
+        /// 教学名师
+        /// </summary>
+        [Column("TEACHMASTER")]
+        public string TeachMaster { get; set; }
+        /// <summary>
+        /// 骨干教师
+        /// </summary>
+        [Column("BACKBONETEACHER")]
+        public string BackboneTeacher { get; set; }
+        /// <summary>
+        /// 学术技术带头人
+        /// </summary>
+        [Column("ACADEMICTECHLEADER")]
+        public string AcademicTechLeader { get; set; }
 
         #endregion