Merge branch '新疆体育高职分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 新疆体育高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.cshtml

@@ -34,7 +34,7 @@
                                 <input id="AICode" type="text" class="form-control" />
                             </div>*@
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">金隅编号</div>
+                                    <div class="lr-form-item-title">编号</div>
                                     <input id="AICodeNumJY" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.cshtml

@@ -30,7 +30,7 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">金隅编号</div>
+                                    <div class="lr-form-item-title">编号</div>
                                     <input id="AICodeNumJY" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js

@@ -50,7 +50,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetPageList',
                 headData: [
                     { label: "明细编号", name: "AICode", width: 200, align: "left" },
-                    { label: "金隅编号", name: "AICodeNumJY", width: 200, align: "left" },
+                    { label: "编号", name: "AICodeNumJY", width: 200, align: "left" },
                     { label: "名称", name: "AIASSName", width: 200, align: "left" },
                     {
                         label: "部门", name: "AIDepartment", width: 100, align: "left",

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

@@ -119,6 +119,18 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             teacherCertificateIBLL.DoCheck(keyValue, status);
             return Success("操作成功！");
         }
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeptForm(string keyValue, string status)
+        {
+            teacherCertificateIBLL.DeptEntity(keyValue, status);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

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

@@ -37,6 +37,8 @@
                         <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_deptyes" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;部门审核通过</a>
+                        <a id="lr_deptno" class="btn btn-default"><i class="fa fa-unlock"></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>

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

@@ -84,6 +84,11 @@ var bootstrap = function ($, learun) {
                         learun.alert.warning("当前项已审核！");
                         return false;
                     }
+                    var DeptStatus = $('#gridtable').jfGridValue('DeptStatus');
+                    if (DeptStatus == "1" || DeptStatus == "2") {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'formInTeacherCertificate',
                         title: '编辑',
@@ -105,6 +110,11 @@ var bootstrap = function ($, learun) {
                         learun.alert.warning("当前项已审核！");
                         return false;
                     }
+                    var DeptStatus = $('#gridtable').jfGridValue('DeptStatus');
+                    if (DeptStatus == "1" || DeptStatus == "2") {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/DeleteForm', { keyValue: keyValue }, function () {
@@ -150,6 +160,42 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 审核通过
+            $('#lr_deptyes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('TCID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('DeptStatus');
+                    if (Status == "1" || Status == "2") {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/DeptForm', { keyValue: keyValue, status: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 审核不通过
+            $('#lr_deptno').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('TCID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('DeptStatus');
+                    if (Status == "1" || Status == "2") {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核不通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/DeptForm', { keyValue: keyValue, status: "2" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -213,7 +259,12 @@ 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) {
+                        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>";
+                        }
+                    },
+                    {
+                        label: "审核状态", name: "DeptStatus", 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>";
                         }
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml

@@ -759,26 +759,27 @@
                 </div>
             }
 
-            @if (ViewBag.UserType == "学生" || ViewBag.UserType == "教师")
-            {
-                <div class="lr-layout-tool-right">
-                    <div class="btn-group btn-group-sm">
-                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+            @*@if (ViewBag.UserType == "学生" || ViewBag.UserType == "教师")*@
+                @if (ViewBag.UserType == "学生" )
+                {
+                    <div class="lr-layout-tool-right">
+                        <div class="btn-group btn-group-sm">
+                            <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        </div>
                     </div>
-                </div>
 
-            }
+                }
 
-            <div class="lr-layout-wrap-item" id="lr_layout_item7">
-                <div class="title">
-                    <div>语言设置</div>
-                </div>
-                <div class="content" style="padding-top:20px;">
-                    <iframe class="lr-layout-iframe" frameborder="0" src="~/UserCenter/LanguageForm"></iframe>
+                <div class="lr-layout-wrap-item" id="lr_layout_item7">
+                    <div class="title">
+                        <div>语言设置</div>
+                    </div>
+                    <div class="content" style="padding-top:20px;">
+                        <iframe class="lr-layout-iframe" frameborder="0" src="~/UserCenter/LanguageForm"></iframe>
+                    </div>
                 </div>
+                <audio id="sound" autoplay="autoplay"></audio>
             </div>
-            <audio id="sound" autoplay="autoplay"></audio>
-        </div>
     </div>
 </div>
 

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

@@ -141,6 +141,25 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
+
+        public void DeptEntity(string keyValue, string status)
+        {
+            try
+            {
+                teacherCertificateService.DeptEntity(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

@@ -74,6 +74,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("FilePath")]
         public string FilePath { get; set; }
+
+        [Column("DEPTSTATUS")] public string DeptStatus { get; set; }
+        [Column("DEPTUSER")] public string DeptUser { get; set; }
+        [Column("DEPTDATE")] public string Deptdate { get; set; }
         #endregion
 
         #region  扩展操作

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

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

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

@@ -196,6 +196,32 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        public void DeptEntity(string keyValue, string status)
+        {
+            try
+            {
+                var userInfo = LoginUserInfo.Get();
+                if (status == "1")
+                {
+                    this.BaseRepository().ExecuteBySql("update TeacherCertificate set DeptStatus='" + status + "',Deptdate='" + DateTime.Now + "',DeptUser='" + userInfo.userId + "' where TCID='" + keyValue + "' ");
+                }
+                else if (status == "2")
+                {
+                    this.BaseRepository().ExecuteBySql("update TeacherCertificate set DeptStatus='" + status + "',Deptdate=null,DeptUser=null where TCID='" + keyValue + "' ");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
     }