【修改】教师信息管理：表单页面增加职称、职称岗位等级、职称获得时间；教师职称变更管理：与教师信息管理数据进行同步；

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

@@ -234,6 +234,18 @@
             <div class="lr-form-item-title">从教三十年表彰年度</div>
             <input id="CommendationYear" type="text" class="form-control" />
         </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">职称</div>
+            <div id="ProfessionalTitle"></div>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">职称岗位等级</div>
+            <div id="ProfessionalTitleLevel"></div>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">职称获得时间</div>
+            <input id="ProfessionalTitleGetTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ProfessionalTitleGetTime').trigger('change'); } })" />
+        </div>
         <div class="col-xs-12 lr-form-item">
             <div class="lr-form-item-title lr-title">学历学位信息</div>
         </div>
@@ -345,9 +357,9 @@
             <div id="Photo"></div>
         </div>
         @*<div class="col-xs-12 lr-form-item" data-table="EmpInfo">
-                <div class="lr-form-item-title">教师简介</div>
-                <textarea id="resume" class="form-control" style="height:200px;"></textarea>
-            </div>*@
+            <div class="lr-form-item-title">教师简介</div>
+            <textarea id="resume" class="form-control" style="height:200px;"></textarea>
+        </div>*@
 
         <div class="col-xs-12 lr-form-item">
             <div class="lr-form-item-title">教师简介</div>

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

@@ -134,6 +134,8 @@ var bootstrap = function ($, learun) {
             $('#WorkLevel').lrDataItemSelect({ code: 'TechnicalLevelOfWorker' });
             $('#CompilationCategory').lrDataItemSelect({ code: 'CompilationCategory' });
             $('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' });
+            $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
+            $('#ProfessionalTitleLevel').lrDataItemSelect({ code: 'TeacherTitlePostLevel' });
 
             //内容编辑器
             ue = UE.getEditor('editor');

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleChange/Form.cshtml

@@ -8,34 +8,34 @@
         <div id="EID" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeacherTitleChange">
-        <div class="lr-form-item-title">原职称<font face="宋体">*</font></div>
-        <div id="TCTitlesID" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">原职称</div>
+        <div id="TCTitlesID" readonly="readonly"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="TeacherTitleEvaluation">
-        <div class="lr-form-item-title">原岗位等级<font face="宋体">*</font></div>
-        <div id="TCTitlesPostLevel" isvalid="yes" checkexpession="NotNull"></div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherTitleChange">
+        <div class="lr-form-item-title">原职称岗位等级</div>
+        <div id="TCTitlesPostLevel" readonly="readonly"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeacherTitleChange">
-        <div class="lr-form-item-title">获得时间<font face="宋体">*</font></div>
-        <input id="TCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TCTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">获得时间</div>
+        <input id="TCTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeacherTitleChange">
         <div class="lr-form-item-title">现职称<font face="宋体">*</font></div>
         <div id="TCTitlesNewID" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="TeacherTitleEvaluation">
-        <div class="lr-form-item-title">现岗位等级<font face="宋体">*</font></div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherTitleChange">
+        <div class="lr-form-item-title">现职称岗位等级<font face="宋体">*</font></div>
         <div id="TCTitlesPostLevelNew" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeacherTitleChange">
         <div class="lr-form-item-title">变更日期<font face="宋体">*</font></div>
-        <input id="TCChangeTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TCChangeTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <input id="TCChangeTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#TCChangeTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="TeacherTitleEvaluation">
+    <div class="col-xs-12 lr-form-item" data-table="TeacherTitleChange">
         <div class="lr-form-item-title">变更原因<font face="宋体">*</font></div>
         <input id="TCChangeReason" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="TeacherTitleEvaluation">
+    <div class="col-xs-12 lr-form-item" data-table="TeacherTitleChange">
         <div class="lr-form-item-title">备注</div>
         <textarea id="TCRemark" class="form-control" style="height:100px;"></textarea>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleChange/Form.js

@@ -15,11 +15,21 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#EID').lrformselect({
-                layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
-                layerUrlW: 400,
-                layerUrlH: 300,
-                dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
+            //$('#EID').lrformselect({
+            //    layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
+            //    layerUrlW: 400,
+            //    layerUrlH: 300,
+            //    dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
+            //});
+            $('#EID').lrDataSourceSelect({
+                code: 'EmpInfo', value: 'empid', text: 'empname',
+                select: function (item) {
+                    if (!!item) {
+                        $('#TCTitlesID').lrselectSet(item.professionaltitle);
+                        $('#TCTitlesPostLevel').lrselectSet(item.professionaltitlelevel);
+                        $('#TCTime').val(item.professionaltitlegettime);
+                    }
+                }
             });
             $('#TCTitlesID').lrDataItemSelect({ code: 'jszc' });
             $('#TCTitlesNewID').lrDataItemSelect({ code: 'jszc' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleChange/Index.js

@@ -69,24 +69,19 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/TeacherTitleChange/GetPageList',
                 headData: [
-                    { label: "教师姓名", name: "EID", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('user', {
-                                 key: value,
-                                 callback: function (_data) {
-                                     callback(_data.name);
-                                 }
-                             });
-                        }
-                    },
                     {
-                        label: "性别", name: "Sex", width: 100, align: "left", formatter: function (cellvalue) {
-                            return cellvalue == 1 ? "男" : "女"
+                        label: "教师姓名", name: "EID", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                key: value,
+                                keyId: 'empid',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
                         }
                     },
-                    {
-                        label: "出生年月", name: "Birthday", width: 100, align: "left"
-                    },
                     { label: "原职称", name: "TCTitlesID", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('dataItem', {
@@ -99,7 +94,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "原岗位等级", name: "TCTitlesPostLevel", width: 150, align: "left",
+                        label: "原职称岗位等级", name: "TCTitlesPostLevel", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -123,7 +118,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "现岗位等级", name: "TCTitlesPostLevelNew", width: 150, align: "left",
+                        label: "现职称岗位等级", name: "TCTitlesPostLevelNew", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,

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

@@ -108,7 +108,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("GRADUATESCHOOLNAME")]
         public string GraduateSchoolName { get; set; }
         /// <summary>
-        /// 岗位名称
+        /// 岗位名称（即职位）
         /// </summary>
         [Column("TITLEOFTECHPOSTNO")]
         public string TitleOfTechPostNo { get; set; }
@@ -564,6 +564,22 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("PASSPORT")]
         public string PassPort { get; set; }
 
+        /// <summary>
+        /// 职称
+        /// </summary>
+        [Column("PROFESSIONALTITLE")]
+        public string ProfessionalTitle { get; set; }
+        /// <summary>
+        /// 职称岗位等级
+        /// </summary>
+        [Column("PROFESSIONALTITLELEVEL")]
+        public string ProfessionalTitleLevel { get; set; }
+        /// <summary>
+        /// 职称获得时间
+        /// </summary>
+        [Column("PROFESSIONALTITLEGETTIME")]
+        public DateTime? ProfessionalTitleGetTime { get; set; }
+
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleChange/TeacherTitleChangeEntity.cs

@@ -35,12 +35,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         [Column("TCTITLES")]
         public string TCTitles { get; set; }
         /// <summary>
-        /// TCTitlesID
+        /// 原职称
         /// </summary>
         [Column("TCTITLESID")]
         public string TCTitlesID { get; set; }
         /// <summary>
-        /// TCTime
+        /// 职称获得时间
         /// </summary>
         [Column("TCTIME")]
         public DateTime? TCTime { get; set; }
@@ -50,22 +50,22 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         [Column("TCTITLESNEW")]
         public string TCTitlesNew { get; set; }
         /// <summary>
-        /// TCTitlesNewID
+        /// 现职称
         /// </summary>
         [Column("TCTITLESNEWID")]
         public string TCTitlesNewID { get; set; }
         /// <summary>
-        /// TCChangeTime
+        /// 变更时间
         /// </summary>
         [Column("TCCHANGETIME")]
         public DateTime? TCChangeTime { get; set; }
         /// <summary>
-        /// 原岗位等级
+        /// 原职称岗位等级
         /// </summary>
         [Column("TCTITLESPOSTLEVEL")]
         public string TCTitlesPostLevel { get; set; }
         /// <summary>
-        /// 现岗位等级
+        /// 现职称岗位等级
         /// </summary>
         [Column("TCTITLESPOSTLEVELNEW")]
         public string TCTitlesPostLevelNew { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleChange/TeacherTitleChangeService.cs

@@ -1,4 +1,5 @@
 using Dapper;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
 using Learun.DataBase.Repository;
 using Learun.Util;
 using System;
@@ -51,10 +52,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["EID"].IsEmpty())
                 {
-                    dp.Add("EID",queryParam["EID"].ToString(), DbType.String);
+                    dp.Add("EID", queryParam["EID"].ToString(), DbType.String);
                     strSql.Append(" AND t.EID = @EID ");
                 }
-                return this.BaseRepository().FindList<TeacherTitleChangeEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository().FindList<TeacherTitleChangeEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -106,7 +107,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository().Delete<TeacherTitleChangeEntity>(t=>t.TCID == keyValue);
+                this.BaseRepository().Delete<TeacherTitleChangeEntity>(t => t.TCID == keyValue);
             }
             catch (Exception ex)
             {
@@ -140,6 +141,16 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     entity.Create();
                     this.BaseRepository().Insert(entity);
                 }
+                //更新教师信息
+                var empInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<EmpInfoEntity>(x => x.EmpId == entity.EID);
+                if (empInfoEntity != null)
+                {
+                    empInfoEntity.ProfessionalTitle = entity.TCTitlesNewID;
+                    empInfoEntity.ProfessionalTitleLevel = entity.TCTitlesPostLevelNew;
+                    empInfoEntity.ProfessionalTitleGetTime = entity.TCChangeTime;
+                    this.BaseRepository("CollegeMIS").Update(empInfoEntity);
+                }
+
             }
             catch (Exception ex)
             {