diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
index 0ba54724e..d2c2924ce 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
+++ b/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' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile5.pubxml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile5.pubxml
new file mode 100644
index 000000000..03728354a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile5.pubxml
@@ -0,0 +1,18 @@
+
+
+
+
+ FileSystem
+ FileSystem
+ Release
+ Any CPU
+
+ True
+ False
+ D:\Job-release\DigitalSchoolWeb
+ True
+
+
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs
index 4aaae7b41..c67b44f67 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs
+++ b/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
///
[Column("F_ORDER")]
public int? F_Order { get; set; }
-
+ ///
+ /// 教职工类别
+ ///
+ [Column("TEACHERCATEGORY")]
+ public string TeacherCategory { get; set; }
+ ///
+ /// 编制类别
+ ///
+ [Column("COMPILATIONSORT")]
+ public string CompilationSort { get; set; }
+ ///
+ /// 曾用名
+ ///
+ [Column("OLDEMPNAME")]
+ public string OldEmpName { get; set; }
+ ///
+ /// 职务层次
+ ///
+ [Column("JOBLEVEL")]
+ public string JobLevel { get; set; }
+ ///
+ /// 职务级别
+ ///
+ [Column("JOBGRADE")]
+ public string JobGrade { get; set; }
+ ///
+ /// 行政职务
+ ///
+ [Column("JOBNAME")]
+ public string JobName { get; set; }
+ ///
+ /// 工作岗位性质
+ ///
+ [Column("POSTPROPERTY")]
+ public string PostProperty { get; set; }
+ ///
+ /// 教职工来源
+ ///
+ [Column("TEACHERSOURCE")]
+ public string TeacherSource { get; set; }
+ ///
+ /// 聘任岗位级别
+ ///
+ [Column("RECRUITPOSTLEVEL")]
+ public string RecruitPostLevel { get; set; }
+ ///
+ /// 初始学历取得时间
+ ///
+ [Column("INITALRECORDGETTIME")]
+ public DateTime? InitalRecordGetTime { get; set; }
+ ///
+ /// 人事代理签订日期
+ ///
+ [Column("PERSONAGENTSIGNTIME")]
+ public DateTime? PersonAgentSignTime { get; set; }
+ ///
+ /// 有教师资格证书
+ ///
+ [Column("ISTEACHERCERTIFICATE")]
+ public bool? IsTeacherCertificate { get; set; }
+ ///
+ /// 是否双师教师
+ ///
+ [Column("ISDOUBLETEACHER")]
+ public bool? IsDoubleTeacher { get; set; }
+ ///
+ /// 教学名师
+ ///
+ [Column("TEACHMASTER")]
+ public string TeachMaster { get; set; }
+ ///
+ /// 骨干教师
+ ///
+ [Column("BACKBONETEACHER")]
+ public string BackboneTeacher { get; set; }
+ ///
+ /// 学术技术带头人
+ ///
+ [Column("ACADEMICTECHLEADER")]
+ public string AcademicTechLeader { get; set; }
#endregion