教师信息中教师聘任、年度考核、资格证获取，学生奖励统计，学生处分统计相关功能迁移

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_CertificateController.cs

@@ -0,0 +1,164 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-07 14:08
+    /// 描 述：资格证获取情况
+    /// </summary>
+    public class PM_CertificateController : MvcControllerBase
+    {
+        private PM_CertificateIBLL pM_CertificateIBLL = new PM_CertificateBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+
+        /// <summary>
+        /// 主页面-统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticIndex()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pM_CertificateIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PM_CertificateData = pM_CertificateIBLL.GetPM_CertificateEntity( keyValue );
+            var jsonData = new {
+                PM_Certificate = PM_CertificateData,
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageStatisticList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pM_CertificateIBLL.GetPageStatisticList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pM_CertificateIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var loginUserInfo = LoginUserInfo.Get();
+            PM_CertificateEntity entity = strEntity.ToObject<PM_CertificateEntity>();
+            entity.Updater = loginUserInfo.userId;
+            entity.UpdateTime = DateTime.Now;
+            pM_CertificateIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="empId"></param>
+        /// <returns></returns>
+        public ActionResult Submit(string empId,bool status)
+        {
+            pM_CertificateIBLL.Submit(empId,status);
+            if (status)
+            {
+                return Success("提交成功！");
+            }
+            else
+            {
+                return Success("取消提交成功");
+            }
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_PositionChangeController.cs

@@ -0,0 +1,164 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-04 14:08
+    /// 描 述：教师聘任变更记录
+    /// </summary>
+    public class PM_PositionChangeController : MvcControllerBase
+    {
+        private PM_PositionChangeIBLL pM_PositionChangeIBLL = new PM_PositionChangeBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+
+        /// <summary>
+        /// 主页面-统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticIndex()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pM_PositionChangeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PM_PositionChangeData = pM_PositionChangeIBLL.GetPM_PositionChangeEntity( keyValue );
+            var jsonData = new {
+                PM_PositionChange = PM_PositionChangeData,
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageStatisticList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pM_PositionChangeIBLL.GetPageStatisticList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pM_PositionChangeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var loginUserInfo = LoginUserInfo.Get();
+            PM_PositionChangeEntity entity = strEntity.ToObject<PM_PositionChangeEntity>();
+            entity.Updater = loginUserInfo.userId;
+            entity.UpdateTime = DateTime.Now;
+            pM_PositionChangeIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="empId"></param>
+        /// <returns></returns>
+        public ActionResult Submit(string empId,bool status)
+        {
+            pM_PositionChangeIBLL.Submit(empId,status);
+            if (status)
+            {
+                return Success("提交成功！");
+            }
+            else
+            {
+                return Success("取消提交成功");
+            }
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_YearAssessController.cs

@@ -0,0 +1,164 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public class PM_YearAssessController : MvcControllerBase
+    {
+        private PM_YearAssessIBLL pM_YearAssessIBLL = new PM_YearAssessBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+
+        /// <summary>
+        /// 主页面-统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticIndex()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pM_YearAssessIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PM_YearAssessData = pM_YearAssessIBLL.GetPM_YearAssessEntity( keyValue );
+            var jsonData = new {
+                PM_YearAssess = PM_YearAssessData,
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageStatisticList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pM_YearAssessIBLL.GetPageStatisticList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pM_YearAssessIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var loginUserInfo = LoginUserInfo.Get();
+            PM_YearAssessEntity entity = strEntity.ToObject<PM_YearAssessEntity>();
+            entity.Updater = loginUserInfo.userId;
+            entity.UpdateTime = DateTime.Now;
+            pM_YearAssessIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="empId"></param>
+        /// <returns></returns>
+        public ActionResult Submit(string empId,bool status)
+        {
+            pM_YearAssessIBLL.Submit(empId,status);
+            if (status)
+            {
+                return Success("提交成功！");
+            }
+            else
+            {
+                return Success("取消提交成功");
+            }
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEncourgementController.cs

@@ -3,6 +3,7 @@ using System.Data;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 {
@@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +36,43 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult DeptIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult MajorIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ClassIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StuIndex()
+        {
+            return View();
         }
         #endregion
 
@@ -61,6 +98,97 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             };
             return Success(jsonData);
         }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListOne(string queryJson)
+        {
+            var data = stuEncourgementIBLL.GetPageList(queryJson);
+            var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.DeptNo, x.Num }).Select(x => new
+            {
+                AcademicYearNo = x.Key.AcademicYearNo,
+                Semester = x.Key.Semester,
+                DeptNo = x.Key.DeptNo,
+                Num = x.Count(),
+            });
+            return Success(data1);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListTwo(string queryJson)
+        {
+            var data = stuEncourgementIBLL.GetPageList(queryJson);
+            var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.DeptNo, x.Grade, x.Num }).Select(x => new
+            {
+                AcademicYearNo = x.Key.AcademicYearNo,
+                Semester = x.Key.Semester,
+                DeptNo = x.Key.DeptNo,
+                Grade = x.Key.Grade,
+                Num = x.Count(),
+            });
+            return Success(data1);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListThree(string queryJson)
+        {
+            var data = stuEncourgementIBLL.GetPageList(queryJson);
+            var data1 = data.GroupBy(x => new
+            {
+                x.AcademicYearNo,
+                x.Semester,
+                x.DeptNo,
+                x.MajorNo,
+                x.ClassNo,
+                x.Grade,
+                x.Num
+            }).Select(x => new
+            {
+                AcademicYearNo = x.Key.AcademicYearNo,
+                Semester = x.Key.Semester,
+                DeptNo = x.Key.DeptNo,
+                MajorNo = x.Key.MajorNo,
+                ClassNo = x.Key.ClassNo,
+                Grade = x.Key.Grade,
+                Num = x.Count(),
+            });
+            return Success(data1);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListStu(string queryJson)
+        {
+            var data = stuEncourgementIBLL.GetPageList(queryJson);
+            var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.StuNo, x.StuName, x.Num }).Select(x => new
+            {
+                AcademicYearNo = x.Key.AcademicYearNo,
+                Semester = x.Key.Semester,
+                StuNo = x.Key.StuNo,
+                StuName = x.Key.StuName,
+                Num = x.Count(),
+            });
+            return Success(data1);
+        }
+
         /// <summary>
         /// 获取表单数据
         /// <summary>
@@ -69,8 +197,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var StuEncourgementData = stuEncourgementIBLL.GetStuEncourgementEntity( keyValue );
-            var jsonData = new {
+            var StuEncourgementData = stuEncourgementIBLL.GetStuEncourgementEntity(keyValue);
+            var jsonData = new
+            {
                 StuEncourgement = StuEncourgementData,
             };
             return Success(jsonData);
@@ -102,7 +231,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             StuEncourgementEntity entity = strEntity.ToObject<StuEncourgementEntity>();
-            stuEncourgementIBLL.SaveEntity(keyValue,entity);
+            stuEncourgementIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs

@@ -3,6 +3,7 @@ using System.Data;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 {
@@ -38,15 +39,41 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
-        /// 解除处分表单页
+        /// 表页面
         /// <summary>
         /// <returns></returns>
         [HttpGet]
-        public ActionResult CancelForm()
+        public ActionResult DeptIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult MajorIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ClassIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StuIndex()
         {
             return View();
         }
-        
         #endregion
 
         #region  获取数据
@@ -86,6 +113,96 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             };
             return Success(jsonData);
         }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListOne(string queryJson)
+        {
+            var data = stuPunishmentIBLL.GetPageList(queryJson);
+            var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.DeptNo, x.Num }).Select(x => new
+            {
+                AcademicYearNo = x.Key.AcademicYearNo,
+                Semester = x.Key.Semester,
+                DeptNo = x.Key.DeptNo,
+                Num = x.Count(),
+            });
+            return Success(data1);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListTwo(string queryJson)
+        {
+            var data = stuPunishmentIBLL.GetPageList(queryJson);
+            var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.DeptNo, x.Grade, x.Num }).Select(x => new
+            {
+                AcademicYearNo = x.Key.AcademicYearNo,
+                Semester = x.Key.Semester,
+                DeptNo = x.Key.DeptNo,
+                Grade = x.Key.Grade,
+                Num = x.Count(),
+            });
+            return Success(data1);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListThree(string queryJson)
+        {
+            var data = stuPunishmentIBLL.GetPageList(queryJson);
+            var data1 = data.GroupBy(x => new
+            {
+                x.AcademicYearNo,
+                x.Semester,
+                x.DeptNo,
+                x.MajorNo,
+                x.ClassNo,
+                x.Grade,
+                x.Num
+            }).Select(x => new
+            {
+                AcademicYearNo = x.Key.AcademicYearNo,
+                Semester = x.Key.Semester,
+                DeptNo = x.Key.DeptNo,
+                MajorNo = x.Key.MajorNo,
+                ClassNo = x.Key.ClassNo,
+                Grade = x.Key.Grade,
+                Num = x.Count(),
+            });
+            return Success(data1);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListStu(string queryJson)
+        {
+            var data = stuPunishmentIBLL.GetPageList(queryJson);
+            var data1 = data.GroupBy(x => new { x.AcademicYearNo, x.Semester, x.StuNo, x.StuName, x.Num }).Select(x => new
+            {
+                AcademicYearNo = x.Key.AcademicYearNo,
+                Semester = x.Key.Semester,
+                StuNo = x.Key.StuNo,
+                StuName = x.Key.StuName,
+                Num = x.Count(),
+            });
+            return Success(data1);
+        }
         #endregion
 
         #region  提交数据
@@ -124,9 +241,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// <returns></returns>
         [HttpPost]
         [AjaxOnly]
-        public ActionResult DoCancelPunish(string keyValue, bool status, string File,string CancelFileNo)
+        public ActionResult DoCancelPunish(string keyValue, bool status)
         {
-            stuPunishmentIBLL.DoCancelPunish(keyValue, status, File,CancelFileNo);
+            stuPunishmentIBLL.DoCancelPunish(keyValue, status);
             return Success("操作成功！");
         }
         #endregion

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

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "资格证获取情况";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="PM_Certificate">
+        <div class="lr-form-item-title">证书编号</div>
+        <input id="TeacherQualificationsNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_Certificate">
+        <div class="lr-form-item-title">教师资格证种类</div>
+        <div id="TeacherQualifications"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_Certificate">
+        <div class="lr-form-item-title">其他职业资格证</div>
+        <input id="OtherTeacherQualifications" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_Certificate">
+        <div class="lr-form-item-title">普通话等级</div>
+        <div id="MandarinLevel"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_Certificate">
+        <div class="lr-form-item-title">备注<font face="宋体">*</font></div>
+        <textarea id="Remark" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_Certificate">
+        <div class="lr-form-item-title">是否同步</div>
+        <div id="IsSync"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_Certificate/Form.js")

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

@@ -0,0 +1,56 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-07 14:08
+ * 描  述：资格证获取情况
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var empId = request('empId');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#IsSync').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#TeacherQualifications').lrDataItemSelect({ code: 'TeacherQualifications' });
+            $('#MandarinLevel').lrDataItemSelect({ code: 'MandarinLevel' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/PM_Certificate/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var data = $('body').lrGetFormData();
+        data["EmpId"] = empId;
+        var postData = {
+            strEntity: JSON.stringify(data)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PM_Certificate/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,58 @@
+@{
+    ViewBag.Title = "资格证获取情况";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-form-item-title{
+        width:100px;
+    }
+    .lr-form-item{
+        padding-left:100px;
+    }
+</style>
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">证书编号</div>
+                                    <input id="TeacherQualificationsNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教师资格证种类</div>
+                                    <div id="TeacherQualifications"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">其他职业资格证</div>
+                                    <input id="OtherTeacherQualifications" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">普通话等级</div>
+                                    <div id="MandarinLevel"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <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">
+                        <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_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;提交</a>
+                        <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;取消提交</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtableInPM_Qualification"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_Certificate/Index.js")

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

@@ -0,0 +1,175 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-07 14:08
+ * 描  述：资格证获取情况
+ */
+var refreshGirdData;
+var empId = request('empId');
+var status = false;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.refreshStatus();
+            page.initGird();
+            page.bind();
+        },
+        refreshStatus: function () {
+            //获取主表状态
+            learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/EmpInfo/GetFormData?keyValue=' + empId, function (res) {
+                if (res.code == 200) {
+                    if (res.data.EmpInfo != null) {
+                        status = res.data.EmpInfo.CertificateStatus;
+                    }
+                }
+            });
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#TeacherQualifications').lrDataItemSelect({ code: 'TeacherQualifications' });
+            $('#MandarinLevel').lrDataItemSelect({ code: 'MandarinLevel' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                learun.layerForm({
+                    id: 'formInPM_Certificate',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/PM_Certificate/Form?empId=' + empId,
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                var keyValue = $('#gridtableInPM_Qualification').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formInPM_Certificate',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/PM_Certificate/Form?keyValue=' + keyValue + '&empId=' + empId,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                var keyValue = $('#gridtableInPM_Qualification').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/PM_Certificate/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 提交
+            $('#lr_check').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                learun.layerConfirm('是否确认提交！', function (res) {
+                    if (res) {
+                        learun.postForm( top.$.rootUrl + '/EducationalAdministration/PM_Certificate/Submit', { empId: empId, status: true }, function (info) {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+            // 取消提交
+            $('#lr_uncheck').on('click', function () {
+                learun.layerConfirm('是否取消提交！', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/EducationalAdministration/PM_Certificate/Submit', { empId: empId, status: false }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtableInPM_Qualification').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/PM_Certificate/GetPageList',
+                headData: [
+                    { label: "证书编号", name: "TeacherQualificationsNo", width: 100, align: "left" },
+                    {
+                        label: "教师资格证种类", name: "TeacherQualifications", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'TeacherQualifications',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "其他职业资格证", name: "OtherTeacherQualifications", width: 100, align: "left" },
+                    {
+                        label: "普通话等级", name: "MandarinLevel", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'MandarinLevel',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                    { label: "是否同步", name: "IsSync", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == true ? "是" : "否" } },
+                    {
+                        label: "提交状态", name: "SubmitStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            //return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                            return cellvalue == true ? "<span class=\"label label-success\">已提交</span>" : "<span class=\"label label-danger\">未提交</span>";
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx:'UpdateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.EmpId = empId;
+            $('#gridtableInPM_Qualification').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+        page.refreshStatus();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Certificate/StatisticIndex.cshtml

@@ -0,0 +1,56 @@
+@{
+    ViewBag.Title = "资格证获取情况";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-form-item-title {
+        width: 100px;
+    }
+
+    .lr-form-item {
+        padding-left: 100px;
+    }
+</style>
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">教师姓名</div>
+                                    <input id="EmpName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">证书编号</div>
+                                    <input id="TeacherQualificationsNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教师资格证种类</div>
+                                    <div id="TeacherQualifications"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">其他职业资格证</div>
+                                    <input id="OtherTeacherQualifications" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">普通话等级</div>
+                                    <div id="MandarinLevel"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_Certificate/StatisticIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Certificate/StatisticIndex.js

@@ -0,0 +1,98 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-07 14:08
+ * 描  述：资格证获取情况
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#TeacherQualifications').lrDataItemSelect({ code: 'TeacherQualifications' });
+            $('#MandarinLevel').lrDataItemSelect({ code: 'MandarinLevel' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/PM_Certificate/GetPageStatisticList',
+                headData: [
+                    {
+                        label: "教师", name: "EmpId", 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: "TeacherQualificationsNo", width: 100, align: "left" },
+                    {
+                        label: "教师资格证种类", name: "TeacherQualifications", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'TeacherQualifications',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "其他职业资格证", name: "OtherTeacherQualifications", width: 100, align: "left" },
+                    {
+                        label: "普通话等级", name: "MandarinLevel", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'MandarinLevel',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "变更时间", name: "UpdateTime", width: 130, align: "left" },
+                    {
+                        label: "变更人", name: "Updater", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (item) {
+                                    callback(item.name);
+                                }
+                            });
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx:'UpdateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "教师聘任变更记录";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="PM_PositionChange">
+        <div class="lr-form-item-title">原聘任等级<font face="宋体">*</font></div>
+        <div id="OldLevel" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_PositionChange">
+        <div class="lr-form-item-title">现聘任等级<font face="宋体">*</font></div>
+        <div id="NewLevel" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_PositionChange">
+        <div class="lr-form-item-title">变更原因</div>
+        <textarea id="ChangeReason" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_PositionChange">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_PositionChange">
+        <div class="lr-form-item-title">是否同步</div>
+        <div id="IsSync"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_PositionChange/Form.js")

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

@@ -0,0 +1,56 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-04 14:08
+ * 描  述：教师聘任变更记录
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var empId = request('empId');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#OldLevel').lrDataItemSelect({ code: 'PositionLevel' });
+            $('#NewLevel').lrDataItemSelect({ code: 'PositionLevel' });
+            $('#IsSync').lrDataItemSelect({ code: 'YesOrNoBit' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var data = $('body').lrGetFormData();
+        data["EmpId"] = empId;
+        var postData = {
+            strEntity: JSON.stringify(data)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,42 @@
+@{
+    ViewBag.Title = "教师聘任变更记录";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">原聘任等级</div>
+                                    <div id="OldLevel"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">现聘任等级</div>
+                                    <div id="NewLevel"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <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">
+                        <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_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;提交</a>
+                        <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;取消提交</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtableInPM_Jsprbg"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_PositionChange/Index.js")

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

@@ -0,0 +1,174 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-04 14:08
+ * 描  述：教师聘任变更记录
+ */
+var refreshGirdData;
+var empId = request('empId');
+var status = false;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.refreshStatus();
+            page.initGird();
+            page.bind();
+        },
+        refreshStatus: function () {
+            //获取主表状态
+            learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/EmpInfo/GetFormData?keyValue=' + empId, function (res) {
+                if (res.code == 200) {
+                    if (res.data.EmpInfo != null) {
+                        status = res.data.EmpInfo.PositionLevelStatus;
+                    }
+                }
+            });
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#OldLevel').lrDataItemSelect({ code: 'PositionLevel' });
+            $('#NewLevel').lrDataItemSelect({ code: 'PositionLevel' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                learun.layerForm({
+                    id: 'formInPM_PositionChange',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/Form?empId=' + empId,
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                var keyValue = $('#gridtableInPM_Jsprbg').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formInPM_PositionChange',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/Form?keyValue=' + keyValue + '&empId=' + empId,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                var keyValue = $('#gridtableInPM_Jsprbg').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 提交
+            $('#lr_check').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                learun.layerConfirm('是否确认提交！', function (res) {
+                    if (res) {
+                        learun.postForm( top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/Submit', { empId: empId, status: true }, function (info) {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+            // 取消提交
+            $('#lr_uncheck').on('click', function () {
+                learun.layerConfirm('是否取消提交！', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/Submit', { empId: empId, status: false }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtableInPM_Jsprbg').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/GetPageList',
+                headData: [
+                    {
+                        label: "原聘任等级", name: "OldLevel", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'PositionLevel',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "现聘任等级", name: "NewLevel", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'PositionLevel',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "变更原因", name: "ChangeReason", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                    { label: "是否同步", name: "IsSync", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == true ? "是" : "否" } },
+                    {
+                        label: "提交状态", name: "SubmitStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            //return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                            return cellvalue == true ? "<span class=\"label label-success\">已提交</span>" : "<span class=\"label label-danger\">未提交</span>";
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx:'UpdateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.EmpId = empId;
+            $('#gridtableInPM_Jsprbg').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+        page.refreshStatus();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "教师聘任变更记录";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">教师姓名</div>
+                                    <input id="EmpName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">原聘任等级</div>
+                                    <div id="OldLevel"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">现聘任等级</div>
+                                    <div id="NewLevel"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.js

@@ -0,0 +1,96 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-04 14:08
+ * 描  述：教师聘任变更记录
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#OldLevel').lrDataItemSelect({ code: 'PositionLevel' });
+            $('#NewLevel').lrDataItemSelect({ code: 'PositionLevel' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/GetPageStatisticList',
+                headData: [
+                    {
+                        label: "教师", name: "EmpId", 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: "OldLevel", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'PositionLevel',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "现聘任等级", name: "NewLevel", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'PositionLevel',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "变更时间", name: "UpdateTime", width: 130, align: "left" },
+                    {
+                        label: "变更人", name: "Updater", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (item) {
+                                    callback(item.name);
+                                }
+                            });
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx:'UpdateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "年度考核结果管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="PM_YearAssess">
+        <div class="lr-form-item-title">考核时间<font face="宋体">*</font></div>
+        <input id="AssessTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AssessTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_YearAssess">
+        <div class="lr-form-item-title">考核年度<font face="宋体">*</font></div>
+        <input id="AssessYear" type="text" class="form-control"  isvalid="yes" checkexpession="NotNull"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_YearAssess">
+        <div class="lr-form-item-title">考核结果</div>
+        <textarea id="AssessResult" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_YearAssess">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_YearAssess">
+        <div class="lr-form-item-title">是否同步</div>
+        <div id="IsSync"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_YearAssess/Form.js")

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

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-06 14:08
+ * 描  述：年度考核结果管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var empId = request('empId');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#IsSync').lrDataItemSelect({ code: 'YesOrNoBit' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var data = $('body').lrGetFormData();
+        data["EmpId"] = empId;
+        var postData = {
+            strEntity: JSON.stringify(data)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,42 @@
+@{
+    ViewBag.Title = "年度考核结果管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">考核时间</div>
+                                    <input id="AssessTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AssessTime').trigger('change'); } })" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">考核年度</div>
+                                    <input id="AssessYear" type="text" class="form-control"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <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">
+                        <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_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;提交</a>
+                        <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;取消提交</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtableInPM_YearAssess"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js")

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

@@ -0,0 +1,150 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-06 14:08
+ * 描  述：年度考核结果管理
+ */
+var refreshGirdData;
+var empId = request('empId');
+var status = false;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.refreshStatus();
+            page.initGird();
+            page.bind();
+        },
+        refreshStatus: function () {
+            //获取主表状态
+            learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/EmpInfo/GetFormData?keyValue=' + empId, function (res) {
+                if (res.code == 200) {
+                    if (res.data.EmpInfo != null) {
+                        status = res.data.EmpInfo.YearAssessStatus;
+                    }
+                }
+            });
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                learun.layerForm({
+                    id: 'formInPM_YearAssess',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Form?empId=' + empId,
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                var keyValue = $('#gridtableInPM_YearAssess').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formInPM_YearAssess',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Form?keyValue=' + keyValue + '&empId=' + empId,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                var keyValue = $('#gridtableInPM_YearAssess').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 提交
+            $('#lr_check').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                learun.layerConfirm('是否确认提交！', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Submit', { empId: empId, status: true }, function (info) {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+            // 取消提交
+            $('#lr_uncheck').on('click', function () {
+                learun.layerConfirm('是否取消提交！', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Submit', { empId: empId, status: false }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtableInPM_YearAssess').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/GetPageList',
+                headData: [
+                    { label: "考核时间", name: "AssessTime", width: 100, align: "left" },
+                    { label: "考核年度", name: "AssessYear", width: 100, align: "left" },
+                    { label: "考核结果", name: "AssessResult", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                    { label: "是否同步", name: "IsSync", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == true ? "是" : "否" } },
+                    {
+                        label: "提交状态", name: "SubmitStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            //return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                            return cellvalue == true ? "<span class=\"label label-success\">已提交</span>" : "<span class=\"label label-danger\">未提交</span>";
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'UpdateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.EmpId = empId;
+            $('#gridtableInPM_YearAssess').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+        page.refreshStatus();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "年度考核结果管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">教师姓名</div>
+                                    <input id="EmpName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">考核时间</div>
+                                    <input id="AssessTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AssessTime').trigger('change'); } })" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">考核年度</div>
+                                    <input id="AssessYear" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.js

@@ -0,0 +1,73 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-06 14:08
+ * 描  述：年度考核结果管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/GetPageStatisticList',
+                headData: [
+                    {
+                        label: "教师", name: "EmpId", 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: "AssessTime", width: 100, align: "left" },
+                    { label: "考核年度", name: "AssessYear", width: 100, align: "left" },
+                    { label: "考核结果", name: "AssessResult", width: 100, align: "left" },
+                    { label: "变更时间", name: "UpdateTime", width: 130, align: "left" },
+                    {
+                        label: "变更人", name: "Updater", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (item) {
+                                    callback(item.name);
+                                }
+                            });
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx:'UpdateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/ClassIndex.cshtml

@@ -0,0 +1,51 @@
+@{
+    ViewBag.Title = "学生奖励管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">年级</div>
+                                    <div id="Grade"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEncourgement/ClassIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/ClassIndex.js

@@ -0,0 +1,157 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-18 10:08
+ * 描  述：学生奖励管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                value: "classno",
+                text: "classname"
+            });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageListThree',
+                headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 200, align: "left" },
+                    { label: "学期", name: "Semester", width: 200, align: "left" },
+                    {
+                        label: "系别", name: "DeptNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "年级", name: "Grade", width: 200, align: "left" },
+                    { label: "次数", name: "Num", width: 200, align: "left" },
+                ],
+                mainId: 'ID',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/DeptIndex.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "学生奖励管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEncourgement/DeptIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/DeptIndex.js

@@ -0,0 +1,80 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-18 10:08
+ * 描  述：学生奖励管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+            });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageListOne',
+                headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 400, align: "left" },
+                    { label: "学期", name: "Semester", width: 400, align: "left" },
+                    {
+                        label: "系别", name: "DeptNo", width: 400, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "次数", name: "Num", width: 400, align: "left" },
+                ],
+                mainId: 'ID',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -10,6 +10,10 @@
     <div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
         <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
         <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+        <input id="ClassNo" hidden="hidden"/>
+        <input id="MajorNo" hidden="hidden"/>
+        <input id="DeptNo" hidden="hidden"/>
+        <input id="Grade" hidden="hidden"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
         <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
@@ -23,10 +27,6 @@
         <div class="lr-form-item-title">奖励名称<font face="宋体">*</font></div>
         <input id="EncourgeName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
-        <div class="lr-form-item-title">奖励类型<font face="宋体">*</font></div>
-        <div id="AwardType" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
     <div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
         <div class="lr-form-item-title">奖励原因<font face="宋体">*</font></div>
         <input id="Reason" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -39,9 +39,5 @@
         <div class="lr-form-item-title">奖励日期<font face="宋体">*</font></div>
         <input id="EncourgeDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd' })" isvalid="yes" checkexpession="NotNull" value="@Learun.Util.Time.GetToday("yyyy/MM/dd")" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuEncourgement">
-        <div class="lr-form-item-title">附件</div>
-        <div id="FilePath"></div>
-    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEncourgement/Form.js")

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

@@ -25,7 +25,7 @@ var bootstrap = function ($, learun) {
             });
             //学期
             $('#Semester').lrselect({
-                placeholder: "请选择学年",
+                placeholder: "请选择学期",
                 allowSearch: true,
                 url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
                 value: 'value',
@@ -90,18 +90,20 @@ var bootstrap = function ($, learun) {
                 ],
                 select: function (item) {
                     $("#StuName").val(item.stuname);
+                    $("#ClassNo").val(item.classno);
+                    $("#MajorNo").val(item.majorno);
+                    $("#DeptNo").val(item.deptno);
+                    $("#Grade").val(item.grade);
                 }
 
             });
-            $('#FilePath').lrUploader();
-            $("#AwardType").lrDataItemSelect({ code: 'TLMAwardType' });
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);

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

@@ -7,6 +7,27 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <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="lr-form-item-title">学号</div>
+                                    <input id="StuNo" type="text" class="form-control"/>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control"/>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">奖励名称</div>
+                                    <input id="EncourgeName" type="text" class="form-control"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">

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

@@ -7,24 +7,56 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '3',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
             // 新增
             $('#lr_add').on('click', function () {
-                learun.layerForm({
+               learun.layerForm({
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/Form',
                     width: 600,
-                    height: 500,
+                    height: 400,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -39,7 +71,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/Form?keyValue=' + keyValue,
                         width: 600,
-                        height: 500,
+                        height: 400,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -50,9 +82,9 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                   learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/DeleteForm', { keyValue: keyValue }, function () {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/DeleteForm', { keyValue: keyValue}, function () {
                                 refreshGirdData();
                             });
                         }
@@ -65,33 +97,23 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
-                    { label: "姓名", name: "StuName", width: 100, align: "left" },
-                    { label: "奖励名称", name: "EncourgeName", width: 200, align: "left" },
-                    {
-                        label: "奖励类型", name: "AwardType", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'TLMAwardType',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    { label: "奖励原因", name: "Reason", width: 200, align: "left" },
-                    { label: "奖励金额", name: "Fee", width: 100, align: "left" },
-                    { label: "奖励日期", name: "EncourgeDate", width: 100, align: "left" },
+                    { label: "学号", name: "StuNo", width: 200, align: "left"},
+                    { label: "姓名", name: "StuName", width: 200, align: "left"},
+                    { label: "奖励名称", name: "EncourgeName", width: 200, align: "left"},
+                    { label: "奖励原因", name: "Reason", width: 200, align: "left"},
+                    { label: "奖励金额", name: "Fee", width: 200, align: "left"},
+                    { label: "奖励日期", name: "EncourgeDate", width: 200, align: "left"},
                 ],
-                mainId: 'ID',
+                mainId:'ID',
                 isPage: true
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/MajorIndex.cshtml

@@ -0,0 +1,43 @@
+@{
+    ViewBag.Title = "学生奖励管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">年级</div>
+                                    <div id="Grade"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEncourgement/MajorIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/MajorIndex.js

@@ -0,0 +1,86 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-18 10:08
+ * 描  述：学生奖励管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+            });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageListTwo',
+                headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 300, align: "left" },
+                    { label: "学期", name: "Semester", width: 300, align: "left" },
+                    {
+                        label: "系别", name: "DeptNo", width: 300, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "年级", name: "Grade", width: 300, align: "left" },
+                    { label: "次数", name: "Num", width: 300, align: "left" },
+                ],
+                mainId: 'ID',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/StuIndex.cshtml

@@ -0,0 +1,43 @@
+@{
+    ViewBag.Title = "学生奖励管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="StuNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEncourgement/StuIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/StuIndex.js

@@ -0,0 +1,63 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-18 10:08
+ * 描  述：学生奖励管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageListStu',
+                headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 300, align: "left" },
+                    { label: "学期", name: "Semester", width: 300, align: "left" },
+                    { label: "学号", name: "StuNo", width: 300, align: "left" },
+                    { label: "姓名", name: "StuName", width: 300, align: "left" },
+                    { label: "次数", name: "Num", width: 300, align: "left" },
+                ],
+                mainId: 'ID',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/ClassIndex.cshtml

@@ -0,0 +1,51 @@
+@{
+    ViewBag.Title = "学生奖励管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">年级</div>
+                                    <div id="Grade"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuPunishment/ClassIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/ClassIndex.js

@@ -0,0 +1,157 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-18 10:08
+ * 描  述：学生奖励管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                value: "classno",
+                text: "classname"
+            });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuPunishment/GetPageListThree',
+                headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 200, align: "left" },
+                    { label: "学期", name: "Semester", width: 200, align: "left" },
+                    {
+                        label: "系别", name: "DeptNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "年级", name: "Grade", width: 200, align: "left" },
+                    { label: "次数", name: "Num", width: 200, align: "left" },
+                ],
+                mainId: 'ID',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/DeptIndex.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "学生奖励管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuPunishment/DeptIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/DeptIndex.js

@@ -0,0 +1,80 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-18 10:08
+ * 描  述：学生奖励管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+            });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuPunishment/GetPageListOne',
+                headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 400, align: "left" },
+                    { label: "学期", name: "Semester", width: 400, align: "left" },
+                    {
+                        label: "系别", name: "DeptNo", width: 400, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "次数", name: "Num", width: 400, align: "left" },
+                ],
+                mainId: 'ID',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -10,6 +10,10 @@
     <div class="col-xs-12 lr-form-item" data-table="StuPunishment">
         <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
         <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="ClassNo" hidden="hidden" />
+        <input id="MajorNo" hidden="hidden" />
+        <input id="DeptNo" hidden="hidden" />
+        <input id="Grade" hidden="hidden" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuPunishment">
         <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
@@ -39,9 +43,5 @@
         <div class="lr-form-item-title">处分文号<font face="宋体">*</font></div>
         <input id="FileNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuPunishment">
-        <div class="lr-form-item-title">附件</div>
-        <div id="FilePatch"></div>
-    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuPunishment/Form.js")

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

@@ -25,7 +25,7 @@ var bootstrap = function ($, learun) {
             });
             //学期
             $('#Semester').lrselect({
-                placeholder: "请选择学年",
+                placeholder: "请选择学期",
                 allowSearch: true,
                 url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
                 value: 'value',
@@ -34,7 +34,7 @@ var bootstrap = function ($, learun) {
             $('#StuNo').lrGirdSelect({
                 // 字段
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
-                selectWord: 'stuno',
+                selectWord: 'stuname',
                 value: 'stuno',
                 text: 'stuno',
                 headData: [
@@ -90,8 +90,11 @@ var bootstrap = function ($, learun) {
                 ],
                 select: function (item) {
                     $("#StuName").val(item.stuname);
+                    $("#ClassNo").val(item.classno);
+                    $("#MajorNo").val(item.majorno);
+                    $("#DeptNo").val(item.deptno);
+                    $("#Grade").val(item.grade);
                 }
-
             });
             $("#PunishNo").lrDataItemSelect({
                 code: 'Punishment', select: function (item) {
@@ -105,7 +108,6 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            $('#FilePatch').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -7,6 +7,27 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <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="lr-form-item-title">学号</div>
+                                    <input id="StuNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">处分名称</div>
+                                    <div id="PunishNo"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">

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

@@ -7,12 +7,46 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '3',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
+            $('#PunishNo').lrDataItemSelect({ code: 'Punishment' });
+            
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -68,17 +102,10 @@ var bootstrap = function ($, learun) {
                         learun.alert.warning("该项已解除处分！");
                         return false;
                     }
-                    learun.layerConfirm('是否确认解除处分该项！', function (res, index) {
+                    learun.layerConfirm('是否确认解除处分该项！', function (res) {
                         if (res) {
-                            learun.layerForm({
-                                id: 'form',
-                                title: '解除处分',
-                                url: top.$.rootUrl + '/EducationalAdministration/StuPunishment/CancelForm?keyValue=' + keyValue,
-                                width: 600,
-                                height: 450,
-                                callBack: function (id) {
-                                    return top[id].acceptClick(refreshGirdData);
-                                }
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DoCancelPunish', { keyValue: keyValue, status: true }, function () {
+                                refreshGirdData();
                             });
                         }
                     });
@@ -95,7 +122,7 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerConfirm('是否确认取消解除处分该项！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DoCancelPunish', { keyValue: keyValue, status: false, File: null }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DoCancelPunish', { keyValue: keyValue, status: false }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -108,19 +135,29 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuPunishment/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
-                    { label: "姓名", name: "StuName", width: 100, align: "left" },
-                    { label: "处分名称", name: "PunishName", width: 100, align: "left" },
-                    { label: "处分原因", name: "PunishReason", width: 100, align: "left" },
-                    { label: "处分日期", name: "PunishDate", width: 100, align: "left" },
-                    { label: "处分文号", name: "FileNo", width: 100, align: "left" },
+                    { label: "学号", name: "StuNo", width: 200, align: "left" },
+                    { label: "姓名", name: "StuName", width: 200, align: "left" },
+                    {
+                        label: "处分名称", name: "PunishNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'Punishment',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "处分原因", name: "PunishReason", width: 300, align: "left" },
+                    { label: "处分日期", name: "PunishDate", width: 200, align: "left" },
+                    { label: "处分文号", name: "FileNo", width: 200, align: "left" },
                     {
                         label: "是否解除处分", name: "IsCancelPunish", width: 100, align: "left", formatter: function (cellvalue) {
                             return cellvalue == true ? "是" : "否";
                         }
                     },
-                    { label: "解除文号", name: "CancelFileNo", width: 100, align: "left" },
-                    { label: "解除处分日期", name: "CancelPunishDate", width: 100, align: "left" },
+                    { label: "解除处分日期", name: "CancelPunishDate", width: 200, align: "left" },
                 ],
                 mainId: 'Id',
                 isPage: true
@@ -129,6 +166,8 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/MajorIndex.cshtml

@@ -0,0 +1,43 @@
+@{
+    ViewBag.Title = "学生奖励管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">年级</div>
+                                    <div id="Grade"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuPunishment/MajorIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/MajorIndex.js

@@ -0,0 +1,86 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-18 10:08
+ * 描  述：学生奖励管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+            });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuPunishment/GetPageListTwo',
+                headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 300, align: "left" },
+                    { label: "学期", name: "Semester", width: 300, align: "left" },
+                    {
+                        label: "系别", name: "DeptNo", width: 300, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "年级", name: "Grade", width: 300, align: "left" },
+                    { label: "次数", name: "Num", width: 300, align: "left" },
+                ],
+                mainId: 'ID',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/StuIndex.cshtml

@@ -0,0 +1,43 @@
+@{
+    ViewBag.Title = "学生奖励管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="StuNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuPunishment/StuIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/StuIndex.js

@@ -0,0 +1,63 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-18 10:08
+ * 描  述：学生奖励管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuPunishment/GetPageListStu',
+                headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 300, align: "left" },
+                    { label: "学期", name: "Semester", width: 300, align: "left" },
+                    { label: "学号", name: "StuNo", width: 300, align: "left" },
+                    { label: "姓名", name: "StuName", width: 300, align: "left" },
+                    { label: "次数", name: "Num", width: 300, align: "left" },
+                ],
+                mainId: 'ID',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -344,6 +344,9 @@
     <Compile Include="Areas\AssetManagementSystem\Controllers\FundsApplyController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\FundsApplyDetailController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ElectiveMajorOnlineController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\PM_CertificateController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\PM_PositionChangeController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\PM_YearAssessController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuScoreOnlineController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuSelectLessonListOfElectiveOnlineController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\DoorController.cs" />
@@ -1053,6 +1056,15 @@
     <Content Include="Areas\EducationalAdministration\Views\LessonInfoOfElectiveOnline\FormNum.js" />
     <Content Include="Areas\EducationalAdministration\Views\LessonInfoOfElectiveOnline\SetIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\LessonInfoOfElectiveOnline\StudentIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_Certificate\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_Certificate\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_Certificate\StatisticIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_PositionChange\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_PositionChange\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_PositionChange\StatisticIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\StatisticIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\PsychologyInfo\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\FormOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\FormView.js" />
@@ -1061,6 +1073,10 @@
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfThree.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfTwo.js" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexInStuScore.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEncourgement\ClassIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEncourgement\DeptIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEncourgement\MajorIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEncourgement\StuIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\FormOfStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfStudent.js" />
@@ -1069,6 +1085,10 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\IndexCenter.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\SoonGraduateIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\IndexCenter.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuPunishment\ClassIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuPunishment\DeptIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuPunishment\MajorIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuPunishment\StuIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\IndexUnpassTwoOfElective.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\InputScoreIndexOfElectiveInTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\InputScoreIndexOfElective.js" />
@@ -8375,6 +8395,23 @@
     <Content Include="Areas\Ask\Views\Notice_TrainTeam\FormView.cshtml" />
     <Content Include="Areas\Ask\Views\Notice_Train_Sum\FormView.cshtml" />
     <Content Include="Areas\Ask\Views\Notice_Train_Sum_level\FormView.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_Certificate\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_Certificate\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_Certificate\StatisticIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_PositionChange\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_PositionChange\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_PositionChange\StatisticIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\StatisticIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEncourgement\ClassIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEncourgement\DeptIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEncourgement\MajorIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEncourgement\StuIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuPunishment\ClassIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuPunishment\DeptIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuPunishment\MajorIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuPunishment\StuIndex.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Certificate/PM_CertificateBLL.cs

@@ -0,0 +1,171 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-07 14:08
+    /// 描 述：资格证获取情况
+    /// </summary>
+    public class PM_CertificateBLL : PM_CertificateIBLL
+    {
+        private PM_CertificateService pM_CertificateService = new PM_CertificateService();
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_CertificateEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return pM_CertificateService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取PM_Certificate表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public PM_CertificateEntity GetPM_CertificateEntity(string keyValue)
+        {
+            try
+            {
+                return pM_CertificateService.GetPM_CertificateEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_CertificateEntity> GetPageStatisticList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return pM_CertificateService.GetPageStatisticList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                pM_CertificateService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, PM_CertificateEntity entity)
+        {
+            try
+            {
+                pM_CertificateService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 修改提交状态
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void Submit(string keyValue, bool status)
+        {
+            try
+            {
+                pM_CertificateService.Submit(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/EducationalAdministration/PM_Certificate/PM_CertificateEntity.cs

@@ -0,0 +1,95 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-07 14:08
+    /// 描 述：资格证获取情况
+    /// </summary>
+    public class PM_CertificateEntity 
+    {
+        #region  实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 人员ID
+        /// </summary>
+        [Column("EMPID")]
+        public string EmpId { get; set; }
+        /// <summary>
+        /// 证书编号
+        /// </summary>
+        [Column("TEACHERQUALIFICATIONSNO")]
+        public string TeacherQualificationsNo { get; set; }
+        /// <summary>
+        ///  教师资格证种类
+        /// </summary>
+        [Column("TEACHERQUALIFICATIONS")]
+        public string TeacherQualifications { get; set; }
+        /// <summary>
+        ///  其他职业资格证
+        /// </summary>
+        [Column("OTHERTEACHERQUALIFICATIONS")]
+        public string OtherTeacherQualifications { get; set; }
+        /// <summary>
+        /// 普通话等级
+        /// </summary>
+        [Column("MANDARINLEVEL")]
+        public string MandarinLevel { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 是否同步
+        /// </summary>
+        [Column("ISSYNC")]
+        public bool? IsSync { get; set; }
+        /// <summary>
+        /// 最后修改人
+        /// </summary>
+        [Column("UPDATER")]
+        public string Updater { get; set; }
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        [Column("UPDATETIME")]
+        public DateTime? UpdateTime { get; set; }
+        #endregion
+
+        #region  扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+        }
+        #endregion
+        #region  扩展字段
+        /// <summary>
+        /// 提交状态
+        /// </summary>
+        [NotMapped]
+        public bool? SubmitStatus { get; set; }
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Certificate/PM_CertificateIBLL.cs

@@ -0,0 +1,57 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-07 14:08
+    /// 描 述：资格证获取情况
+    /// </summary>
+    public interface PM_CertificateIBLL
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<PM_CertificateEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取PM_Certificate表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        PM_CertificateEntity GetPM_CertificateEntity(string keyValue);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<PM_CertificateEntity> GetPageStatisticList(Pagination pagination, string queryJson);
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void SaveEntity(string keyValue, PM_CertificateEntity entity);
+        void Submit(string keyValue, bool status);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Certificate/PM_CertificateService.cs

@@ -0,0 +1,267 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-07 14:08
+    /// 描 述：资格证获取情况
+    /// </summary>
+    public class PM_CertificateService : RepositoryFactory
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_CertificateEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,e.CertificateStatus as SubmitStatus ");
+                strSql.Append("  FROM PM_Certificate t ");
+                strSql.Append("  left join EmpInfo e on t.EmpId=e.EmpId ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["TeacherQualificationsNo"].IsEmpty())
+                {
+                    dp.Add("TeacherQualificationsNo", "%"+queryParam["TeacherQualificationsNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.TeacherQualificationsNo like @TeacherQualificationsNo ");
+                }
+                if (!queryParam["TeacherQualifications"].IsEmpty())
+                {
+                    dp.Add("TeacherQualifications", queryParam["TeacherQualifications"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND t.TeacherQualifications = @TeacherQualifications ");
+                }
+                if (!queryParam["OtherTeacherQualifications"].IsEmpty())
+                {
+                    dp.Add("OtherTeacherQualifications", "%" + queryParam["OtherTeacherQualifications"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.OtherTeacherQualifications like @OtherTeacherQualifications ");
+                }
+                if (!queryParam["MandarinLevel"].IsEmpty())
+                {
+                    dp.Add("MandarinLevel", queryParam["MandarinLevel"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND t.MandarinLevel = @MandarinLevel ");
+                }
+                if (!queryParam["EmpId"].IsEmpty())
+                {
+                    dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpId = @EmpId ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<PM_CertificateEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取PM_Certificate表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public PM_CertificateEntity GetPM_CertificateEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<PM_CertificateEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_CertificateEntity> GetPageStatisticList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM PM_Certificate t ");
+                strSql.Append("  left join EmpInfo e on t.EmpId=e.EmpId ");
+                strSql.Append("  WHERE 1=1 and t.IsSync=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["TeacherQualificationsNo"].IsEmpty())
+                {
+                    dp.Add("TeacherQualificationsNo", "%" + queryParam["TeacherQualificationsNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.TeacherQualificationsNo like @TeacherQualificationsNo ");
+                }
+                if (!queryParam["TeacherQualifications"].IsEmpty())
+                {
+                    dp.Add("TeacherQualifications", queryParam["TeacherQualifications"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND t.TeacherQualifications = @TeacherQualifications ");
+                }
+                if (!queryParam["OtherTeacherQualifications"].IsEmpty())
+                {
+                    dp.Add("OtherTeacherQualifications", "%" + queryParam["OtherTeacherQualifications"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.OtherTeacherQualifications like @OtherTeacherQualifications ");
+                }
+                if (!queryParam["MandarinLevel"].IsEmpty())
+                {
+                    dp.Add("MandarinLevel", queryParam["MandarinLevel"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND t.MandarinLevel = @MandarinLevel ");
+                }
+                if (!queryParam["EmpId"].IsEmpty())
+                {
+                    dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpId = @EmpId ");
+                }
+                if (!queryParam["EmpName"].IsEmpty())
+                {
+                    dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND e.EmpName like @EmpName ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<PM_CertificateEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<PM_CertificateEntity>(t => t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, PM_CertificateEntity entity)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    db.Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    db.Insert(entity);
+                }
+
+                //“是否同步”：选是，则更新教师表；
+                if (entity.IsSync.HasValue && entity.IsSync.Value == true)
+                {
+                    db.ExecuteBySql("update EmpInfo set TeacherQualificationsNo='" + entity.TeacherQualificationsNo + "',TeacherQualifications='" + entity.TeacherQualifications + "',OtherTeacherQualifications='" + entity.OtherTeacherQualifications + "',MandarinLevel='"+entity.MandarinLevel + "' where EmpId='" + entity.EmpId + "' ");
+                }
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 修改提交状态
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void Submit(string keyValue, bool status)
+        {
+            try
+            {
+                var empEntity = this.BaseRepository("CollegeMIS").FindEntity<EmpInfoEntity>(a => a.EmpId == keyValue);
+                if (empEntity != null)
+                {
+                    empEntity.CertificateStatus = status;
+                    this.BaseRepository("CollegeMIS").Update(empEntity);
+                }
+            }
+            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/EducationalAdministration/PM_PositionChange/PM_PositionChangeBLL.cs

@@ -0,0 +1,171 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-04 14:08
+    /// 描 述：教师聘任变更记录
+    /// </summary>
+    public class PM_PositionChangeBLL : PM_PositionChangeIBLL
+    {
+        private PM_PositionChangeService pM_PositionChangeService = new PM_PositionChangeService();
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_PositionChangeEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return pM_PositionChangeService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取PM_PositionChange表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public PM_PositionChangeEntity GetPM_PositionChangeEntity(string keyValue)
+        {
+            try
+            {
+                return pM_PositionChangeService.GetPM_PositionChangeEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_PositionChangeEntity> GetPageStatisticList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return pM_PositionChangeService.GetPageStatisticList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                pM_PositionChangeService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, PM_PositionChangeEntity entity)
+        {
+            try
+            {
+                pM_PositionChangeService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 修改提交状态
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void Submit(string keyValue, bool status)
+        {
+            try
+            {
+                pM_PositionChangeService.Submit(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/EducationalAdministration/PM_PositionChange/PM_PositionChangeEntity.cs

@@ -0,0 +1,95 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-04 14:08
+    /// 描 述：教师聘任变更记录
+    /// </summary>
+    public class PM_PositionChangeEntity 
+    {
+        #region  实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 人员ID
+        /// </summary>
+        [Column("EMPID")]
+        public string EmpId { get; set; }
+        /// <summary>
+        /// 原聘任等级
+        /// </summary>
+        [Column("OLDLEVEL")]
+        public string OldLevel { get; set; }
+        /// <summary>
+        /// 现聘任等级
+        /// </summary>
+        [Column("NEWLEVEL")]
+        public string NewLevel { get; set; }
+        /// <summary>
+        /// 变更时间
+        /// </summary>
+        [Column("CHANGETIME")]
+        public DateTime? ChangeTime { get; set; }
+        /// <summary>
+        /// 变更原因
+        /// </summary>
+        [Column("CHANGEREASON")]
+        public string ChangeReason { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 是否同步
+        /// </summary>
+        [Column("ISSYNC")]
+        public bool? IsSync { get; set; }
+        /// <summary>
+        /// 最后修改人
+        /// </summary>
+        [Column("UPDATER")]
+        public string Updater { get; set; }
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        [Column("UPDATETIME")]
+        public DateTime? UpdateTime { get; set; }
+        #endregion
+
+        #region  扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+        }
+        #endregion
+        #region  扩展字段
+        /// <summary>
+        /// 提交状态
+        /// </summary>
+        [NotMapped]
+        public bool? SubmitStatus { get; set; }
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeIBLL.cs

@@ -0,0 +1,57 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-04 14:08
+    /// 描 述：教师聘任变更记录
+    /// </summary>
+    public interface PM_PositionChangeIBLL
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<PM_PositionChangeEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取PM_PositionChange表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        PM_PositionChangeEntity GetPM_PositionChangeEntity(string keyValue);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<PM_PositionChangeEntity> GetPageStatisticList(Pagination pagination, string queryJson);
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void SaveEntity(string keyValue, PM_PositionChangeEntity entity);
+        void Submit(string keyValue, bool status);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeService.cs

@@ -0,0 +1,247 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-04 14:08
+    /// 描 述：教师聘任变更记录
+    /// </summary>
+    public class PM_PositionChangeService : RepositoryFactory
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_PositionChangeEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,e.PositionLevelStatus as SubmitStatus ");
+                strSql.Append("  FROM PM_PositionChange t ");
+                strSql.Append("  left join EmpInfo e on t.EmpId=e.EmpId ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["OldLevel"].IsEmpty())
+                {
+                    dp.Add("OldLevel", queryParam["OldLevel"].ToString(), DbType.String);
+                    strSql.Append(" AND t.OldLevel = @OldLevel ");
+                }
+                if (!queryParam["NewLevel"].IsEmpty())
+                {
+                    dp.Add("NewLevel", queryParam["NewLevel"].ToString(), DbType.String);
+                    strSql.Append(" AND t.NewLevel = @NewLevel ");
+                }
+                if (!queryParam["EmpId"].IsEmpty())
+                {
+                    dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpId = @EmpId ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<PM_PositionChangeEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取PM_PositionChange表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public PM_PositionChangeEntity GetPM_PositionChangeEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<PM_PositionChangeEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_PositionChangeEntity> GetPageStatisticList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM PM_PositionChange t ");
+                strSql.Append("  left join EmpInfo e on t.EmpId=e.EmpId ");
+                strSql.Append("  WHERE 1=1 and t.IsSync=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["OldLevel"].IsEmpty())
+                {
+                    dp.Add("OldLevel", queryParam["OldLevel"].ToString(), DbType.String);
+                    strSql.Append(" AND t.OldLevel = @OldLevel ");
+                }
+                if (!queryParam["NewLevel"].IsEmpty())
+                {
+                    dp.Add("NewLevel", queryParam["NewLevel"].ToString(), DbType.String);
+                    strSql.Append(" AND t.NewLevel = @NewLevel ");
+                }
+                if (!queryParam["EmpId"].IsEmpty())
+                {
+                    dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpId = @EmpId ");
+                }
+                if (!queryParam["EmpName"].IsEmpty())
+                {
+                    dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND e.EmpName like @EmpName ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<PM_PositionChangeEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<PM_PositionChangeEntity>(t => t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, PM_PositionChangeEntity entity)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    db.Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    db.Insert(entity);
+                }
+
+                //“是否同步”：选是，则更新教师表；
+                if (entity.IsSync.HasValue && entity.IsSync.Value == true)
+                {
+                    db.ExecuteBySql("update EmpInfo set PositionLevel='" + entity.NewLevel + "' where EmpId='" + entity.EmpId + "' ");
+                }
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 修改提交状态
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void Submit(string keyValue, bool status)
+        {
+            try
+            {
+                var empEntity = this.BaseRepository("CollegeMIS").FindEntity<EmpInfoEntity>(a => a.EmpId == keyValue);
+                if (empEntity != null)
+                {
+                    empEntity.PositionLevelStatus = status;
+                    this.BaseRepository("CollegeMIS").Update(empEntity);
+                }
+            }
+            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/EducationalAdministration/PM_YearAssess/PM_YearAssessBLL.cs

@@ -0,0 +1,171 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public class PM_YearAssessBLL : PM_YearAssessIBLL
+    {
+        private PM_YearAssessService pM_YearAssessService = new PM_YearAssessService();
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_YearAssessEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return pM_YearAssessService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取PM_YearAssess表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public PM_YearAssessEntity GetPM_YearAssessEntity(string keyValue)
+        {
+            try
+            {
+                return pM_YearAssessService.GetPM_YearAssessEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_YearAssessEntity> GetPageStatisticList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return pM_YearAssessService.GetPageStatisticList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                pM_YearAssessService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, PM_YearAssessEntity entity)
+        {
+            try
+            {
+                pM_YearAssessService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 修改提交状态
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void Submit(string keyValue, bool status)
+        {
+            try
+            {
+                pM_YearAssessService.Submit(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/EducationalAdministration/PM_YearAssess/PM_YearAssessEntity.cs

@@ -0,0 +1,90 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public class PM_YearAssessEntity 
+    {
+        #region  实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 人员ID
+        /// </summary>
+        [Column("EMPID")]
+        public string EmpId { get; set; }
+        /// <summary>
+        /// 考核时间
+        /// </summary>
+        [Column("ASSESSTIME")]
+        public DateTime? AssessTime { get; set; }
+        /// <summary>
+        /// 考核年度
+        /// </summary>
+        [Column("ASSESSYEAR")]
+        public string AssessYear { get; set; }
+        /// <summary>
+        /// 考核结果
+        /// </summary>
+        [Column("ASSESSRESULT")]
+        public string AssessResult { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 是否同步
+        /// </summary>
+        [Column("ISSYNC")]
+        public bool? IsSync { get; set; }
+        /// <summary>
+        /// 最后修改人
+        /// </summary>
+        [Column("UPDATER")]
+        public string Updater { get; set; }
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        [Column("UPDATETIME")]
+        public DateTime? UpdateTime { get; set; }
+        #endregion
+
+        #region  扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+        }
+        #endregion
+        #region  扩展字段
+        /// <summary>
+        /// 提交状态
+        /// </summary>
+        [NotMapped]
+        public bool? SubmitStatus { get; set; }
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessIBLL.cs

@@ -0,0 +1,57 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public interface PM_YearAssessIBLL
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<PM_YearAssessEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取PM_YearAssess表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        PM_YearAssessEntity GetPM_YearAssessEntity(string keyValue);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<PM_YearAssessEntity> GetPageStatisticList(Pagination pagination, string queryJson);
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void SaveEntity(string keyValue, PM_YearAssessEntity entity);
+        void Submit(string keyValue, bool status);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessService.cs

@@ -0,0 +1,247 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public class PM_YearAssessService : RepositoryFactory
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_YearAssessEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,e.YearAssessStatus as SubmitStatus ");
+                strSql.Append("  FROM PM_YearAssess t ");
+                strSql.Append("  left join EmpInfo e on t.EmpId=e.EmpId ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["AssessYear"].IsEmpty())
+                {
+                    dp.Add("AssessYear", queryParam["AssessYear"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AssessYear = @AssessYear ");
+                }
+                if (!queryParam["AssessTime"].IsEmpty())
+                {
+                    dp.Add("AssessTime", queryParam["AssessTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND t.AssessTime = @AssessTime ");
+                }
+                if (!queryParam["EmpId"].IsEmpty())
+                {
+                    dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpId = @EmpId ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<PM_YearAssessEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取PM_YearAssess表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public PM_YearAssessEntity GetPM_YearAssessEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<PM_YearAssessEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_YearAssessEntity> GetPageStatisticList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM PM_YearAssess t ");
+                strSql.Append("  left join EmpInfo e on t.EmpId=e.EmpId ");
+                strSql.Append("  WHERE 1=1 and t.IsSync=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["AssessYear"].IsEmpty())
+                {
+                    dp.Add("AssessYear", queryParam["AssessYear"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AssessYear = @AssessYear ");
+                }
+                if (!queryParam["AssessTime"].IsEmpty())
+                {
+                    dp.Add("AssessTime", queryParam["AssessTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND t.AssessTime = @AssessTime ");
+                }
+                if (!queryParam["EmpId"].IsEmpty())
+                {
+                    dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpId = @EmpId ");
+                }
+                if (!queryParam["EmpName"].IsEmpty())
+                {
+                    dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND e.EmpName like @EmpName ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<PM_YearAssessEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<PM_YearAssessEntity>(t => t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, PM_YearAssessEntity entity)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    db.Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    db.Insert(entity);
+                }
+
+                //“是否同步”：选是，则更新教师表；
+                if (entity.IsSync.HasValue && entity.IsSync.Value == true)
+                {
+                    db.ExecuteBySql("update EmpInfo set AssessTime='" + entity.AssessTime + "',AssessYear='"+entity.AssessYear+"',AssessResult='"+entity.AssessResult+"' where EmpId='" + entity.EmpId + "' ");
+                }
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 修改提交状态
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void Submit(string keyValue, bool status)
+        {
+            try
+            {
+                var empEntity = this.BaseRepository("CollegeMIS").FindEntity<EmpInfoEntity>(a => a.EmpId == keyValue);
+                if (empEntity != null)
+                {
+                    empEntity.YearAssessStatus = status;
+                    this.BaseRepository("CollegeMIS").Update(empEntity);
+                }
+            }
+            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/EducationalAdministration/StuEncourgement/StuEncourgementBLL.cs

@@ -41,6 +41,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuEncourgementEntity> GetPageList(string queryJson)
+        {
+            try
+            {
+                return stuEncourgementService.GetPageList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         public IEnumerable<StuEncourgementEntity> GetAllList()
         {
             try

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementEntity.cs

@@ -107,16 +107,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("CHECKMARK")]
         public string CheckMark { get; set; }
         /// <summary>
-        /// 附件路径
+        /// 年级
         /// </summary>
-        [Column("FILEPATH")]
-        public string FilePath { get; set; }
+        [Column("GRADE")]
+        public string Grade { get; set; }
         /// <summary>
-        /// 奖励类型
+        /// 系所代码
         /// </summary>
-        [Column("AWARDTYPE")]
-        public string AwardType { get; set; }
-
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 专业代码
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// 行政班号
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
         #endregion
 
         #region  扩展操作
@@ -136,6 +145,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region  扩展字段
+        [NotMapped]
+        public int Num { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<StuEncourgementEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<StuEncourgementEntity> GetPageList(string queryJson);
         IEnumerable<StuEncourgementEntity> GetAllList();
         /// <summary>
         /// 获取StuEncourgement表实体数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs

@@ -31,22 +31,63 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.StuNo,
-                t.StuName,
-                t.EncourgeName,
-                t.Reason,
-                t.Fee,
-                t.EncourgeDate,
-                t.FilePath,
-                t.AwardType
-                ");
+                strSql.Append(@" * ");
                 strSql.Append("  FROM StuEncourgement t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Semester = @Semester ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuNo Like @StuNo ");
+                }
+                if (!queryParam["Sex"].IsEmpty())
+                {
+                    dp.Add("Sex", queryParam["Sex"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Sex = @Sex ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["EncourgeName"].IsEmpty())
+                {
+                    dp.Add("EncourgeName", "%" + queryParam["EncourgeName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.EncourgeName Like @EncourgeName ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.EncourgeDate >= @startTime AND t.EncourgeDate <= @endTime ) ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<StuEncourgementEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -61,6 +102,82 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuEncourgementEntity> GetPageList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" * ");
+                strSql.Append("  FROM StuEncourgement t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Semester = @Semester ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuNo Like @StuNo ");
+                }
+                if (!queryParam["Sex"].IsEmpty())
+                {
+                    dp.Add("Sex", queryParam["Sex"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Sex = @Sex ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Grade = @Grade ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuEncourgementEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         public IEnumerable<StuEncourgementEntity> GetAllList()
         {
             try

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs

@@ -41,6 +41,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuPunishmentEntity> GetPageList(string queryJson)
+        {
+            try
+            {
+                return stuPunishmentService.GetPageList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
 
         public IEnumerable<StuPunishmentEntity> GetAllList()
         {
@@ -216,11 +239,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void DoCancelPunish(string keyValue, bool status,string File, string CancelFileNo)
+        public void DoCancelPunish(string keyValue, bool status)
         {
             try
             {
-                stuPunishmentService.DoCancelPunish(keyValue, status, File, CancelFileNo);
+                stuPunishmentService.DoCancelPunish(keyValue, status);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentEntity.cs

@@ -67,11 +67,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("FILENO")]
         public string FileNo { get; set; }
         /// <summary>
-        /// 取消处分文号
-        /// </summary>
-        [Column("CANCELFILENO")]
-        public string CancelFileNo { get; set; }
-        /// <summary>
         /// 处分撤消日期
         /// </summary>
         [Column("WITHDRAWDATE")]
@@ -111,23 +106,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("CANCELPUNISHDATE")]
         public DateTime? CancelPunishDate { get; set; }
-
         /// <summary>
-        /// 附件路径
+        /// 年级
         /// </summary>
-        [Column("FilePatch")]
-        public string FilePatch { get; set; }
+        [Column("GRADE")]
+        public string Grade { get; set; }
         /// <summary>
-        /// 取消文件路径
+        /// 系所代码
         /// </summary>
-        [Column("CANCELFILEPATCH")]
-        public string CancelFilePatch { get; set; }
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
         /// <summary>
-        /// 取消用户
+        /// 专业代码
         /// </summary>
-        [Column("CANCELUSER")]
-        public string CancelUser { get; set; }
-
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// 行政班号
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
         #endregion
 
         #region  扩展操作
@@ -147,6 +145,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region  扩展字段
+        [NotMapped]
+        public int Num { get; set; }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<StuPunishmentEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<StuPunishmentEntity> GetPageList(string queryJson);
         IEnumerable<StuPunishmentEntity> GetAllList();
         /// <summary>
         /// 获取StuPunishment表实体数据
@@ -73,7 +74,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        void DoCancelPunish(string keyValue, bool status, string File,string CancelFileNo);
+        void DoCancelPunish(string keyValue, bool status);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs

@@ -36,6 +36,53 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Semester = @Semester ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuNo Like @StuNo ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+
+                if (!queryParam["PunishNo"].IsEmpty())
+                {
+                    dp.Add("PunishNo", queryParam["PunishNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.PunishNo = @PunishNo ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.PunishDate >= @startTime AND t.PunishDate <= @endTime ) ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<StuPunishmentEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -50,6 +97,71 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuPunishmentEntity> GetPageList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM StuPunishment t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Semester = @Semester ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuNo Like @StuNo ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuPunishmentEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         public IEnumerable<StuPunishmentEntity> GetAllList()
         {
             try
@@ -244,21 +356,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void DoCancelPunish(string keyValue, bool status, string File, string CancelFileNo)
+        public void DoCancelPunish(string keyValue, bool status)
         {
             try
             {
-                var userList = LoginUserInfo.Get();
-                //var keyvalue = Convert.ToInt32(keyValue);
+                var keyvalue = Convert.ToInt32(keyValue);
                 if (status)
                 {
                     //解除处分
-                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=1,CancelUser='" + userList.realName + "',CancelPunishDate='" + DateTime.Now + "',CancelFilePatch='" + File + "',CancelFileNo = '" + CancelFileNo + "' where Id= " + keyValue);
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=1,CancelPunishDate='" + DateTime.Now + "' where Id= " + keyValue);
                 }
                 else
                 {
                     //取消解除处分
-                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=0,CancelPunishDate=null,CancelUser=null,CancelFilePatch=null where Id= " + keyValue);
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuPunishment set IsCancelPunish=0,CancelPunishDate=null where Id= " + keyValue);
                 }
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -107,6 +107,18 @@
     <Compile Include="EducationalAdministration\ElectiveMajorOnline\ElectiveMajorOnlineEntity.cs" />
     <Compile Include="EducationalAdministration\ElectiveMajorOnline\ElectiveMajorOnlineIBLL.cs" />
     <Compile Include="EducationalAdministration\ElectiveMajorOnline\ElectiveMajorOnlineService.cs" />
+    <Compile Include="EducationalAdministration\PM_Certificate\PM_CertificateBLL.cs" />
+    <Compile Include="EducationalAdministration\PM_Certificate\PM_CertificateEntity.cs" />
+    <Compile Include="EducationalAdministration\PM_Certificate\PM_CertificateIBLL.cs" />
+    <Compile Include="EducationalAdministration\PM_Certificate\PM_CertificateService.cs" />
+    <Compile Include="EducationalAdministration\PM_PositionChange\PM_PositionChangeBLL.cs" />
+    <Compile Include="EducationalAdministration\PM_PositionChange\PM_PositionChangeEntity.cs" />
+    <Compile Include="EducationalAdministration\PM_PositionChange\PM_PositionChangeIBLL.cs" />
+    <Compile Include="EducationalAdministration\PM_PositionChange\PM_PositionChangeService.cs" />
+    <Compile Include="EducationalAdministration\PM_YearAssess\PM_YearAssessBLL.cs" />
+    <Compile Include="EducationalAdministration\PM_YearAssess\PM_YearAssessEntity.cs" />
+    <Compile Include="EducationalAdministration\PM_YearAssess\PM_YearAssessIBLL.cs" />
+    <Compile Include="EducationalAdministration\PM_YearAssess\PM_YearAssessService.cs" />
     <Compile Include="EducationalAdministration\SignUpOnlineHelper.cs" />
     <Compile Include="EducationalAdministration\StuScoreOnline\StuScoreOnlineBLL.cs" />
     <Compile Include="EducationalAdministration\StuScoreOnline\StuScoreOnlineEntity.cs" />