【修改】教师证书管理，教师培训信息管理：关联到教师信息管理；教师信息管理-查看表单页面：增加证书信息、培训信息选项卡；

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

@@ -16,14 +16,14 @@
         font-size: 14px;
     }
 
-    #tab2 > .lr-scroll-box,
-    #tab3 > .lr-scroll-box,
-    #tab4 > .lr-scroll-box,
-    #tab5 > .lr-scroll-box,
-    #tab6 > .lr-scroll-box {
+    .tabClass > .lr-scroll-box {
         height: 100%;
         width: 100%;
     }
+
+    .lr-form-tabs li.showInViewLi {
+        display: none !important;
+    }
 </style>
 <script>
     var NewEmpId = "@ViewBag.NewEmpId";
@@ -36,13 +36,15 @@
         <li><a data-value="tab4">工人技术等级经历</a></li>
         <li><a data-value="tab5">工作简历</a></li>
         <li><a data-value="tab6">家庭情况</a></li>
+        <li class="showInViewLi"><a data-value="tab7">证书信息</a></li>
+        <li class="showInViewLi"><a data-value="tab8">培训信息</a></li>
     </ul>
 </div>
 <div class="tab-content lr-tab-content" id="lr_tab_content">
-    <div class="lr-form-wrap tab-pane"  id="tab1">
-        <div class="col-xs-12  lr-form-item" style="text-align: right;" >
+    <div class="lr-form-wrap tab-pane" id="tab1">
+        <div class="col-xs-12  lr-form-item" style="text-align: right;">
             <div class="lr-form-item-title lr-title">个人信息</div>
-            <a id="lr_print"class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+            <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
@@ -148,9 +150,9 @@
             <div id="F_DepartmentId" checkexpession="NotNull"></div>
         </div>
         @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">系部</div>
-            <div id="DeptNo"></div>
-        </div>*@
+                <div class="lr-form-item-title">系部</div>
+                <div id="DeptNo"></div>
+            </div>*@
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">岗位类别</div>
             <div id="EmpSortNo"></div>
@@ -358,9 +360,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>
@@ -368,21 +370,27 @@
             </script>
         </div>
     </div>
-    <div class="lr-form-wrap tab-pane" id="tab2" style="overflow-y: auto;">
+    <div class="lr-form-wrap tab-pane tabClass" id="tab2" style="overflow-y: auto;">
         <iframe id="PM_EducationExperience" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
     </div>
-    <div class="lr-form-wrap tab-pane" id="tab3">
+    <div class="lr-form-wrap tab-pane tabClass" id="tab3">
         <iframe id="PM_TechnicalPost" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
     </div>
-    <div class="lr-form-wrap tab-pane" id="tab4">
+    <div class="lr-form-wrap tab-pane tabClass" id="tab4">
         <iframe id="PM_WorkerTechnology" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
     </div>
-    <div class="lr-form-wrap tab-pane" id="tab5">
+    <div class="lr-form-wrap tab-pane tabClass" id="tab5">
         <iframe id="PM_Resume" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
     </div>
-    <div class="lr-form-wrap tab-pane" id="tab6">
+    <div class="lr-form-wrap tab-pane tabClass" id="tab6">
         <iframe id="PM_FamilySituation" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
     </div>
+    <div class="lr-form-wrap tab-pane tabClass" id="tab7">
+        <iframe id="TeacherCertificate" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+    </div>
+    <div class="lr-form-wrap tab-pane tabClass" id="tab8">
+        <iframe id="TeacherTrain" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+    </div>
 </div>
 
 <script src="~/Content/ueditor/ueditor.config.js"></script>

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

@@ -21,6 +21,9 @@ var bootstrap = function ($, learun) {
                 $.each($("[data-table=EmpInfo]"), function (i, item) {
                     $(item).children('div,input').attr('readonly', 'readonly');
                 });
+                //选项卡显示证书信息、培训信息、
+                $('.lr-form-tabs').find('li.showInViewLi').removeClass();
+
             }
             page.bind();
             page.initData();
@@ -62,6 +65,8 @@ var bootstrap = function ($, learun) {
             $("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId);
             $("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId);
             $("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId);
+            $("#TeacherCertificate").attr("src", "/PersonnelManagement/TeacherCertificate/Index?empId=" + NewEmpId);
+            $("#TeacherTrain").attr("src", "/PersonnelManagement/TeacherTrain/Index?empId=" + NewEmpId);
             $('#lr_form_tabs').lrFormTab();
             $('#lr_form_tabs ul li').eq(0).trigger('click');
             //校区

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

@@ -27,9 +27,9 @@
                                     <div id="GenderNo"></div>
                                 </div>
                                 @*<div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>*@
+            <div class="lr-form-item-title">系部</div>
+            <div id="DeptNo"></div>
+        </div>*@
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_CompanyId"></div>
@@ -66,6 +66,10 @@
                                     <div class="lr-form-item-title">是否审核</div>
                                     <div id="CheckMark"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">员工状态</div>
+                                    <div id="IsInActiveStatus"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -85,6 +85,9 @@ var bootstrap = function ($, learun) {
             $('#F_DepartmentId').lrselect();
             //人员身份
             $('#CompilationCategory').lrDataItemSelect({ code: 'CompilationCategory' });
+            //员工状态
+            $('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' });
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherCertificateController.cs

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -69,8 +69,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var TeacherCertificateData = teacherCertificateIBLL.GetTeacherCertificateEntity( keyValue );
-            var jsonData = new {
+            var TeacherCertificateData = teacherCertificateIBLL.GetTeacherCertificateEntity(keyValue);
+            var jsonData = new
+            {
                 TeacherCertificate = TeacherCertificateData,
             };
             return Success(jsonData);
@@ -102,9 +103,22 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             TeacherCertificateEntity entity = strEntity.ToObject<TeacherCertificateEntity>();
-            teacherCertificateIBLL.SaveEntity(keyValue,entity);
+            teacherCertificateIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
+
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCheck(string keyValue, string status)
+        {
+            teacherCertificateIBLL.DoCheck(keyValue, status);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml

@@ -8,12 +8,12 @@
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
                     @*<div class="lr-layout-tool-item">
-                        <div id="datesearch"></div>
-                    </div>*@
+                            <div id="datesearch"></div>
+                        </div>*@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-12 lr-form-item" id="TCNameDiv">
                                     <div class="lr-form-item-title">教师姓名</div>
                                     <div id="TCName"></div>
                                 </div>
@@ -33,11 +33,12 @@
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes" id="btnDiv">
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_checkYes" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;审核通过</a>
+                        <a id="lr_checkNo" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;审核不通过</a>
                     </div>
                 </div>
             </div>

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

@@ -5,12 +5,17 @@
  * 描  述：教师证书信息
  */
 var refreshGirdData;
+var empId = request('empId');
 var bootstrap = function ($, learun) {
     "use strict";
     var startTime;
     var endTime;
     var page = {
         init: function () {
+            if (!!empId) {
+                $('#TCNameDiv').hide();
+                $('#btnDiv > a').hide();
+            }
             page.initGird();
             page.bind();
         },
@@ -60,7 +65,7 @@ var bootstrap = function ($, learun) {
             // 新增
             $('#lr_add').on('click', function () {
                 learun.layerForm({
-                    id: 'form',
+                    id: 'formInTeacherCertificate',
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/Form',
                     width: 600,
@@ -74,8 +79,13 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('TCID');
                 if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1" || CheckStatus == "2") {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
                     learun.layerForm({
-                        id: 'form',
+                        id: 'formInTeacherCertificate',
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/Form?keyValue=' + keyValue,
                         width: 600,
@@ -90,6 +100,11 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('TCID');
                 if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1" || CheckStatus == "2") {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/DeleteForm', { keyValue: keyValue }, function () {
@@ -99,9 +114,41 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 打印
-            $('#lr_print').on('click', function () {
-                $('#gridtable').jqprintTable();
+            // 审核通过
+            $('#lr_checkYes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('TCID');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1" || CheckStatus == "2") {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/DoCheck', { keyValue: keyValue, status: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 审核不通过
+            $('#lr_checkNo').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('TCID');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1" || CheckStatus == "2") {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核不通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/DoCheck', { keyValue: keyValue, status: "2" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
             });
         },
         // 初始化列表
@@ -138,10 +185,15 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "任教学科", name: "TCClass", width: 100, align: "left" },
                     { label: "取得时间", name: "TCTime", width: 100, align: "left" },
+                    {
+                        label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">已通过</span>" : cellvalue == "2" ? "<span class=\"label label-danger\">未通过</span>" : "<span class=\"label label-default\">未审核</span>";
+                        }
+                    },
                 ],
                 mainId: 'TCID',
                 isPage: true,
-                sidx:'TCTime desc'
+                sidx: 'TCTime desc'
             });
             page.search();
         },
@@ -149,6 +201,10 @@ var bootstrap = function ($, learun) {
             param = param || {};
             //param.StartTime = startTime;
             //param.EndTime = endTime;
+            if (!!empId) {
+                param.TCName = empId;
+                param.CheckStatus = "1";
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -15,11 +15,12 @@ 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').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname"
             });
             $("#TTLevel").lrDataItemSelect({ code: 'TrainLevel' });
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.cshtml

@@ -22,7 +22,7 @@
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes" id="btnDiv">
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>

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

@@ -5,10 +5,15 @@
  * 描  述：教师培训信息
  */
 var refreshGirdData;
+var empId = request('empId');
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            if (!!empId) {
+                $('#multiple_condition_query').hide();
+                $('#btnDiv > a').hide();
+            }
             page.initGird();
             page.bind();
         },
@@ -16,7 +21,13 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#EID').lrUserSelect(0);
+            $('#EID').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname"
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -24,7 +35,7 @@ var bootstrap = function ($, learun) {
             // 新增
             $('#lr_add').on('click', function () {
                 learun.layerForm({
-                    id: 'form',
+                    id: 'formInTeacherTrain',
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/TeacherTrain/Form',
                     width: 800,
@@ -39,7 +50,7 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('TTID');
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
-                        id: 'form',
+                        id: 'formInTeacherTrain',
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/TeacherTrain/Form?keyValue=' + keyValue,
                         width: 800,
@@ -72,10 +83,12 @@ var bootstrap = function ($, learun) {
                     {
                         label: "教师姓名", name: "EID", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
                                 key: value,
+                                keyId: 'empid',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['empname']);
                                 }
                             });
                         }
@@ -107,6 +120,9 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            if (!!empId) {
+                param.EID = empId;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -133,6 +133,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("CheckMark", queryParam["CheckMark"].ToString(), DbType.String);
                     strSql.Append(" AND t.CheckMark = @CheckMark ");
                 }
+                if (!queryParam["IsInActiveStatus"].IsEmpty())//员工状态
+                {
+                    dp.Add("IsInActiveStatus", queryParam["IsInActiveStatus"].ToString(), DbType.String);
+                    strSql.Append(" AND t.IsInActiveStatus = @IsInActiveStatus ");
+                }
                 var result = new List<EmpInfoEntity>();
                 result = this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>(strSql.ToString(), dp, pagination).ToList();
                 foreach (var item in result)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateBLL.cs

@@ -118,6 +118,29 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoCheck(string keyValue, string status)
+        {
+            try
+            {
+                teacherCertificateService.DoCheck(keyValue, status);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs

@@ -49,6 +49,23 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("TCTIME")]
         public DateTime? TCTime { get; set; }
+        /// <summary>
+        /// 审核状态（0未审核，1审核通过，2审核不通过）
+        /// </summary>
+        [Column("CHECKSTATUS")]
+        public string CheckStatus { get; set; }
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        [Column("CHECKTIME")]
+        public DateTime? CheckTime { get; set; }
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        [Column("CHECKUSER")]
+        public string CheckUser { get; set; }
+
+
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateIBLL.cs

@@ -43,6 +43,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         void SaveEntity(string keyValue, TeacherCertificateEntity entity);
+
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DoCheck(string keyValue, string status);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateService.cs

@@ -56,6 +56,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("TCTypeID", queryParam["TCTypeID"].ToString(), DbType.String);
                     strSql.Append(" AND t.TCTypeID=@TCTypeID ");
                 }
+                if (!queryParam["CheckStatus"].IsEmpty())
+                {
+                    dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CheckStatus=@CheckStatus ");
+                }
                 return this.BaseRepository().FindList<TeacherCertificateEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -156,6 +161,38 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoCheck(string keyValue, string status)
+        {
+            try
+            {
+                var userInfo = LoginUserInfo.Get();
+                if (status == "1")
+                {
+                    this.BaseRepository().ExecuteBySql("update TeacherCertificate set CheckStatus='" + status + "',CheckTime='" + DateTime.Now + "',CheckUser='" + userInfo.userId + "' where TCID='" + keyValue + "' ");
+                }
+                else if (status == "2")
+                {
+                    this.BaseRepository().ExecuteBySql("update TeacherCertificate set CheckStatus='" + status + "',CheckTime=null,CheckUser=null where TCID='" + keyValue + "' ");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainService.cs

@@ -31,19 +31,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.TTID,
-                t.EID,
-                t.TTStartTime,
-                t.TTEndTime,
-                t.TTContent,
-                t.TTOrganization,
-                t.TTWay,
-                t.TTCertificates,
-                t.TTComment,
-                t.TTLevel
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM TeacherTrain t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -102,17 +90,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                var data = new List<TeacherTrainEntity>();
-                var empInfoEntity = this.BaseRepository("CollegeMIS").FindEntity<EmpInfoEntity>(empId);
-                if (empInfoEntity != null)
-                {
-                    var userEntity = this.BaseRepository().FindEntity<UserEntity>(x => x.F_Account == empInfoEntity.EmpNo);
-                    if (userEntity != null)
-                    {
-                        return this.BaseRepository().FindList<TeacherTrainEntity>(x => x.EID == userEntity.F_UserId);
-                    }
-                }
-                return data;
+                return this.BaseRepository().FindList<TeacherTrainEntity>(x => x.EID == empId);
             }
             catch (Exception ex)
             {