diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuCancelDisciplineManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuCancelDisciplineManagementController.cs
new file mode 100644
index 000000000..c9b82a7bf
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuCancelDisciplineManagementController.cs	
@@ -0,0 +1,153 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using Learun.Application.TwoDevelopment.LR_CodeDemo;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-04-14 11:52
+    /// 描 述：学生撤销违纪管理
+    /// </summary>
+    public class StuCancelDisciplineManagementController : MvcControllerBase
+    {
+        private StuCancelDisciplineManagementIBLL stuCancelDisciplineManagementIBLL = new StuCancelDisciplineManagementBLL();
+
+        #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 FormView()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuCancelDisciplineManagementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var StuCancelDisciplineManagementData = stuCancelDisciplineManagementIBLL.GetStuCancelDisciplineManagementEntity( keyValue );
+            var jsonData = new {
+                StuCancelDisciplineManagement = StuCancelDisciplineManagementData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="processId">流程实例主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDataByProcessId(string processId)
+        {
+            var StuCancelDisciplineManagementData = stuCancelDisciplineManagementIBLL.GetEntityByProcessId( processId );
+            var jsonData = new {
+                StuCancelDisciplineManagement = StuCancelDisciplineManagementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuCancelDisciplineManagementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            StuCancelDisciplineManagementEntity entity = strEntity.ToObject<StuCancelDisciplineManagementEntity>();
+            entity.CheckStatus = "0";
+            stuCancelDisciplineManagementIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 提交实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoSubmit(string keyValue, string status, string processId)
+        {
+            stuCancelDisciplineManagementIBLL.DoSubmit(keyValue, status, processId);
+            return Success("提交成功！");
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuCancelLeaveManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuCancelLeaveManagementController.cs
new file mode 100644
index 000000000..c239d9a7e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuCancelLeaveManagementController.cs	
@@ -0,0 +1,158 @@
+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 V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 11:35
+    /// 描 述：学生销假管理
+    /// </summary>
+    public class StuCancelLeaveManagementController : MvcControllerBase
+    {
+        private StuCancelLeaveManagementIBLL stuCancelLeaveManagementIBLL = new StuCancelLeaveManagementBLL();
+
+        #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 CheckIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页【学工信息管理】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult CheckForm()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuCancelLeaveManagementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var StuCancelLeaveManagementData = stuCancelLeaveManagementIBLL.GetStuCancelLeaveManagementEntity( keyValue );
+            var jsonData = new {
+                StuCancelLeaveManagement = StuCancelLeaveManagementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuCancelLeaveManagementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            StuCancelLeaveManagementEntity entity = strEntity.ToObject<StuCancelLeaveManagementEntity>();
+            entity.CreateUserId = loginInfo.userId;
+            entity.CreateUserNo = loginInfo.account;
+            entity.CreateTime = DateTime.Now;
+            stuCancelLeaveManagementIBLL.SaveEntity(keyValue,entity);
+            
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveCheckForm(string keyValue, string strEntity)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            StuCancelLeaveManagementEntity entity = strEntity.ToObject<StuCancelLeaveManagementEntity>();
+            entity.CheckUserId = loginInfo.userId;
+            entity.CheckUserNo = loginInfo.account;
+            entity.CheckTime = DateTime.Now;
+            stuCancelLeaveManagementIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Form.cshtml
new file mode 100644
index 000000000..ef4717d42
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Form.cshtml	
@@ -0,0 +1,23 @@
+@{
+    ViewBag.Title = "学生撤销违纪管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item"  data-table="StuCancelDisciplineManagement" >
+        <div class="lr-form-item-title">申请人</div>
+        <input id="CreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="StuCancelDisciplineManagement" >
+        <div class="lr-form-item-title">申请时间</div>
+        <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuCancelDisciplineManagement" >
+        <div class="lr-form-item-title">事情经过</div>
+        <textarea id="Things" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuCancelDisciplineManagement" >
+        <div class="lr-form-item-title">撤销原因</div>
+        <textarea id="Reason" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Form.js
new file mode 100644
index 000000000..3eea3b2d7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Form.js	
@@ -0,0 +1,107 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-04-14 11:52
+ * 描  述：学生撤销违纪管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
+            $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/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]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'StuCancelDisciplineManagement' && data[id]) {
+                            keyValue = data[id].Id;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if (!!processId) {
+            formData.ProcessId = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/FormView.cshtml
new file mode 100644
index 000000000..9484d6089
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/FormView.cshtml	
@@ -0,0 +1,23 @@
+@{
+    ViewBag.Title = "学生撤销违纪管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="StuCancelDisciplineManagement">
+        <div class="lr-form-item-title">申请人</div>
+        <input id="CreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuCancelDisciplineManagement">
+        <div class="lr-form-item-title">申请时间</div>
+        <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelDisciplineManagement">
+        <div class="lr-form-item-title">事情经过</div>
+        <textarea id="Things" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelDisciplineManagement">
+        <div class="lr-form-item-title">撤销原因</div>
+        <textarea id="Reason" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/FormView.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/FormView.js
new file mode 100644
index 000000000..0a7cdd8e0
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/FormView.js	
@@ -0,0 +1,107 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-04-14 11:52
+ * 描  述：学生撤销违纪管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+                            if(!!data)
+                            {
+                                for (var field in data) {
+                                    if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                                        $('#' + data[field].fieldId).parent().remove();
+                                    }
+                                    else {
+                                        if (data[field].isEdit != 1) {
+                                            $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                                            if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                                                $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                                                $('#' + data[field].fieldId).find('.btn-success').remove();
+                                            }
+                                        }
+                                    }
+                                }
+                                }
+                            };    
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
+            $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/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]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId,param,callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                        if(id == 'StuCancelDisciplineManagement' && data[id] ){
+                            keyValue = data[id].Id;
+                        }
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+                callback && callback();        }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if(!!processId){
+            formData.ProcessId =processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Index.cshtml
new file mode 100644
index 000000000..e7161b238
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/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="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 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>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查看</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Index.js
new file mode 100644
index 000000000..11e31e4ba
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelDisciplineManagement/Index.js	
@@ -0,0 +1,181 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-04-14 11:52
+ * 描  述：学生撤销违纪管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    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();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/Form',
+                    width: 1000,
+                    height: 600,
+                    callBack: function (id) {
+                        var res = false;
+                        // 验证数据
+                        res = top[id].validForm();
+                        // 保存数据
+                        if (res) {
+                            res = top[id].save('', function () {
+                                page.search();
+                            });
+                        }
+                        return res;
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus != "0") {
+                        learun.alert.warning("当前项已提交！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/Form?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 600,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus != "0") {
+                        learun.alert.warning("当前项已提交！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //  查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 600,
+                        btn: null
+                    });
+                }
+            });
+            //  提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus != "0") {
+                        learun.alert.warning("当前项已提交！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            processId = learun.newGuid();
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/DoSubmit', { keyValue: keyValue, status: "1", processId: processId }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuCancelDisciplineManagement/GetPageList',
+                headData: [
+                    {
+                        label: "申请人", name: "CreateUserId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "申请时间", name: "CreateTime", width: 120, align: "left" },
+                    { label: "事情经过", name: "Things", width: 150, align: "left" },
+                    { label: "撤销原因", name: "Reason", width: 150, align: "left" },
+                    {
+                        label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-warning\">审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">审核通过</span>" : cellvalue == "3" ? "<span class=\"label label-danger\">审核未通过</span>" : "<span class=\"label label-default\">草稿</span>";
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: "CreateTime desc"
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function (res, postData) {
+        if (!!res) {
+            if (res.code == 200) {
+                // 发起流程
+                var postData = {
+                    schemeCode: 'StuCancelDisciplineManagement',// 填写流程对应模板编号
+                    processId: processId,
+                    level: '1',
+                };
+                learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                    learun.loading(false);
+                });
+            }
+            page.search();
+        }
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckForm.cshtml
new file mode 100644
index 000000000..2be032c2b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckForm.cshtml	
@@ -0,0 +1,32 @@
+@{
+    ViewBag.Title = "学生销假管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelLeaveManagement">
+        <div class="lr-form-item-title">销假类型<font face="宋体">*</font></div>
+        <div id="CancelLeaveType" readonly isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelLeaveManagement">
+        <div class="lr-form-item-title">到校时间<font face="宋体">*</font></div>
+        <input id="WorkTime" readonly type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelLeaveManagement">
+        <div class="lr-form-item-title">销假事由</div>
+        <textarea id="CancelLeaveReason" class="form-control" readonly style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelLeaveManagement">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" readonly style="height:100px;"></textarea>
+    </div>
+
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelLeaveManagement">
+        <div class="lr-form-item-title">审核状态<font face="宋体">*</font></div>
+        <div id="CheckStatus" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuCancelLeaveManagement">
+        <div class="lr-form-item-title">审核备注</div>
+        <textarea id="CheckRemark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckForm.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckForm.js
new file mode 100644
index 000000000..adc66aefa
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckForm.js	
@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-26 11:35
+ * 描  述：学生销假管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#CancelLeaveType').lrDataItemSelect({ code: 'LeaveType' });
+            $('#CheckStatus').lrDataItemSelect({ code: 'LeaveCheck' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuCancelLeaveManagement/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 postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuCancelLeaveManagement/SaveCheckForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckIndex.cshtml
new file mode 100644
index 000000000..3fff28f36
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckIndex.cshtml	
@@ -0,0 +1,38 @@
+@{
+    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="CancelLeaveType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="CheckStatus"></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_check" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;审核</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckIndex.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckIndex.js
new file mode 100644
index 000000000..2ce3e800f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/CheckIndex.js	
@@ -0,0 +1,171 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-26 11:35
+ * 描  述：学生销假管理
+ */
+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);
+            $('#CancelLeaveType').lrDataItemSelect({ code: 'LeaveType' });
+            $('#CheckStatus').lrDataItemSelect({ code: 'LeaveCheck' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 审核
+            $('#lr_check').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'checkform',
+                        title: '审核',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuCancelLeaveManagement/CheckForm?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuCancelLeaveManagement/GetPageList',
+                headData: [
+                    {
+                        label: "审核状态", name: "CheckStatus", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'LeaveCheck',
+                                callback: function (_data) {
+                                    callback(_data.text ? _data.text : "申请中");
+                                }
+                            });
+                        }
+                    },
+                    { label: "审核备注", name: "CheckRemark", width: 100, align: "left" },
+                    { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
+                    {
+                        label: "审核人", name: "CheckUserNo", 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: 'empno',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "销假类型", name: "CancelLeaveType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'LeaveType',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "到校时间", name: "WorkTime", width: 120, align: "left"},
+                    { label: "销假事由", name: "CancelLeaveReason", width: 100, align: "left" },
+                    { label: "学号", name: "CreateUserNo", width: 100, align: "left" },
+                    { label: "姓名", name: "CreateUserName", width: 100, align: "left" },
+                    { label: "申请时间", name: "CreateTime", width: 130, align: "left" },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, 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: "DeptNo", width: 100, 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: 100, 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: "ClassDiredctorNo", 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: 'empno',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "辅导员", name: "ClassTutorNo", 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: 'empno',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    },
+                ],
+                mainId:'Id',
+                isPage: true,
+                sord: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.ClassManagerNo = learun.clientdata.get(['userinfo']).account;
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Form.cshtml
new file mode 100644
index 000000000..ab19cd831
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Form.cshtml	
@@ -0,0 +1,23 @@
+@{
+    ViewBag.Title = "学生销假管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="StuCancelLeaveManagement" >
+        <div class="lr-form-item-title">销假类型<font face="宋体">*</font></div>
+        <div id="CancelLeaveType" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuCancelLeaveManagement" >
+        <div class="lr-form-item-title">到校时间<font face="宋体">*</font></div>
+        <input id="WorkTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#WorkTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuCancelLeaveManagement" >
+        <div class="lr-form-item-title">销假事由</div>
+        <textarea id="CancelLeaveReason" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuCancelLeaveManagement" >
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Form.js
new file mode 100644
index 000000000..a00dd2c37
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Form.js	
@@ -0,0 +1,51 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-26 11:35
+ * 描  述：学生销假管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#CancelLeaveType').lrDataItemSelect({ code: 'LeaveType' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuCancelLeaveManagement/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 postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuCancelLeaveManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Index.cshtml
new file mode 100644
index 000000000..b6437f748
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Index.cshtml	
@@ -0,0 +1,40 @@
+@{
+    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="CancelLeaveType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="CheckStatus"></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>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Index.js
new file mode 100644
index 000000000..8bcc525a9
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelLeaveManagement/Index.js	
@@ -0,0 +1,207 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-26 11:35
+ * 描  述：学生销假管理
+ */
+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);
+            $('#CancelLeaveType').lrDataItemSelect({ code: 'LeaveType' });
+            $('#CheckStatus').lrDataItemSelect({ code: 'LeaveCheck' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuCancelLeaveManagement/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var status = $('#gridtable').jfGridValue('CheckStatus');
+                    if (status == "1" || status == "2") {
+                        learun.alert.warning("该项已审核无法编辑！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuCancelLeaveManagement/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var status = $('#gridtable').jfGridValue('CheckStatus');
+                    if (status == "1") {
+                        learun.alert.warning("该项已审核通过无法删除！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuCancelLeaveManagement/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuCancelLeaveManagement/GetPageList',
+                headData: [
+                    {
+                        label: "审核状态", name: "CheckStatus", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'LeaveCheck',
+                                callback: function (_data) {
+                                    callback(_data.text ? _data.text : "申请中");
+                                }
+                            });
+                        }
+                    },
+                    { label: "审核备注", name: "CheckRemark", width: 100, align: "left" },
+                    { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
+                    {
+                        label: "审核人", name: "CheckUserNo", 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: 'empno',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "销假类型", name: "CancelLeaveType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'LeaveType',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "到校时间", name: "WorkTime", width: 120, align: "left"},
+                    { label: "销假事由", name: "CancelLeaveReason", width: 100, align: "left" },
+                    { label: "学号", name: "CreateUserNo", width: 100, align: "left" },
+                    { label: "姓名", name: "CreateUserName", width: 100, align: "left" },
+                    { label: "申请时间", name: "CreateTime", width: 130, align: "left" },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, 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: "DeptNo", width: 100, 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: 100, 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: "ClassDiredctorNo", 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: 'empno',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "辅导员", name: "ClassTutorNo", 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: 'empno',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    },
+                ],
+                mainId:'Id',
+                isPage: true,
+                sord: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StuNo = learun.clientdata.get(['userinfo']).account;
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 7b8df0faa..bef4345b9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -334,6 +334,8 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\ScholarshipxjController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ScoreStatisticsController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuAttendanceController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuCancelDisciplineManagementController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuCancelLeaveManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuGrantController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuInfoBasicChangeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuInfoSemsterController.cs" />
@@ -1029,7 +1031,14 @@
     <Content Include="Areas\EducationalAdministration\Views\StuAttendanceLeave\IndexInStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuAttendance\IndexOfUnrecord.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuAttendance\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\FormView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuCancelExam\Detail.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\CheckForm.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\CheckIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuConsumption\IndexForStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuConsumption\IndexForTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\AmountForm.js" />
@@ -7463,6 +7472,13 @@
     <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\IndexManage.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoSemster\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoSemster\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\FormView.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\CheckForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\CheckIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\Index.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuCancelLeaveManagementMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuCancelLeaveManagementMap.cs
new file mode 100644
index 000000000..9445f5782
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuCancelLeaveManagementMap.cs	
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 11:35
+    /// 描 述：学生销假管理
+    /// </summary>
+    public class StuCancelLeaveManagementMap : EntityTypeConfiguration<StuCancelLeaveManagementEntity>
+    {
+        public StuCancelLeaveManagementMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("STUCANCELLEAVEMANAGEMENT");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuDisciplineManagementMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuDisciplineManagementMap.cs
new file mode 100644
index 000000000..4cbc63932
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuDisciplineManagementMap.cs	
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 15:23
+    /// 描 述：学生违纪管理
+    /// </summary>
+    public class StuDisciplineManagementMap : EntityTypeConfiguration<StuDisciplineManagementEntity>
+    {
+        public StuDisciplineManagementMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("STUDISCIPLINEMANAGEMENT");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
index 4213a275e..624778c98 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
@@ -87,6 +87,8 @@
     <Compile Include="EducationalAdministration\R_EnterSchoolMap.cs" />
     <Compile Include="EducationalAdministration\ScholarshipMap.cs" />
     <Compile Include="EducationalAdministration\ScoreStatisticsMap.cs" />
+    <Compile Include="EducationalAdministration\StuCancelLeaveManagementMap.cs" />
+    <Compile Include="EducationalAdministration\StuDisciplineManagementMap.cs" />
     <Compile Include="EducationalAdministration\StuGrantMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoBasicChangeMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoFreshMap.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementBLL.cs
new file mode 100644
index 000000000..675abd0ac
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementBLL.cs	
@@ -0,0 +1,194 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-04-14 11:52
+    /// 描 述：学生撤销违纪管理
+    /// </summary>
+    public class StuCancelDisciplineManagementBLL : StuCancelDisciplineManagementIBLL
+    {
+        private StuCancelDisciplineManagementService stuCancelDisciplineManagementService = new StuCancelDisciplineManagementService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuCancelDisciplineManagementEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return stuCancelDisciplineManagementService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StuCancelDisciplineManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuCancelDisciplineManagementEntity GetStuCancelDisciplineManagementEntity(string keyValue)
+        {
+            try
+            {
+                return stuCancelDisciplineManagementService.GetStuCancelDisciplineManagementEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        public StuCancelDisciplineManagementEntity GetEntityByProcessId(string processId)
+        {
+            try
+            {
+                return stuCancelDisciplineManagementService.GetEntityByProcessId(processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                stuCancelDisciplineManagementService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, StuCancelDisciplineManagementEntity entity)
+        {
+            try
+            {
+                stuCancelDisciplineManagementService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 提交实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoSubmit(string keyValue, string status, string processId)
+        {
+            try
+            {
+                stuCancelDisciplineManagementService.DoSubmit(keyValue, status, processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 审核实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void ChangeStatusByProcessId(string status, string processId, string userId)
+        {
+            try
+            {
+                stuCancelDisciplineManagementService.ChangeStatusByProcessId(status, processId, userId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementEntity.cs
new file mode 100644
index 000000000..a8d46b088
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementEntity.cs	
@@ -0,0 +1,90 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-04-14 11:52
+    /// 描 述：学生撤销违纪管理
+    /// </summary>
+    public class StuCancelDisciplineManagementEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 事情经过
+        /// </summary>
+        [Column("THINGS")]
+        public string Things { get; set; }
+        /// <summary>
+        /// 撤销原因
+        /// </summary>
+        [Column("REASON")]
+        public string Reason { get; set; }
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 审核状态
+        /// </summary>
+        [Column("CHECKSTATUS")]
+        public string CheckStatus { get; set; }
+        /// <summary>
+        /// 审核备注
+        /// </summary>
+        [Column("CHECKREMARK")]
+        public string CheckRemark { get; set; }
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        [Column("CHECKUSERID")]
+        public string CheckUserId { get; set; }
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        [Column("CHECKTIME")]
+        public DateTime? CheckTime { get; set; }
+        /// <summary>
+        /// 流程Id
+        /// </summary>
+        [Column("PROCESSID")]
+        public string ProcessId { 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 扩展字段
+        #endregion
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementIBLL.cs
new file mode 100644
index 000000000..10de74b7b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementIBLL.cs	
@@ -0,0 +1,66 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-04-14 11:52
+    /// 描 述：学生撤销违纪管理
+    /// </summary>
+    public interface StuCancelDisciplineManagementIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StuCancelDisciplineManagementEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取StuCancelDisciplineManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        StuCancelDisciplineManagementEntity GetStuCancelDisciplineManagementEntity(string keyValue);
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        StuCancelDisciplineManagementEntity GetEntityByProcessId(string processId);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, StuCancelDisciplineManagementEntity entity);
+
+        /// <summary>
+        /// 提交实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DoSubmit(string keyValue, string status, string processId);
+        /// <summary>
+        /// 审核实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void ChangeStatusByProcessId(string status, string processId, string userId);
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementService.cs
new file mode 100644
index 000000000..ebb8800e9
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelDisciplineManagement/StuCancelDisciplineManagementService.cs	
@@ -0,0 +1,218 @@
+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 V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-04-14 11:52
+    /// 描 述：学生撤销违纪管理
+    /// </summary>
+    public class StuCancelDisciplineManagementService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuCancelDisciplineManagementEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var basedbname = BaseRepository().getDbConnection().Database;
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM StuCancelDisciplineManagement t ");
+                strSql.Append(" left join " + basedbname + ".dbo.LR_Base_User u on t.CreateUserId=u.F_UserId ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND u.F_RealName like @StuName ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuCancelDisciplineManagementEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StuCancelDisciplineManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuCancelDisciplineManagementEntity GetStuCancelDisciplineManagementEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuCancelDisciplineManagementEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        public StuCancelDisciplineManagementEntity GetEntityByProcessId(string processId)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuCancelDisciplineManagementEntity>(t => t.ProcessId == processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<StuCancelDisciplineManagementEntity>(t => t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, StuCancelDisciplineManagementEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 提交实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoSubmit(string keyValue, string status, string processId)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").ExecuteBySql("update StuCancelDisciplineManagement set CheckStatus='" + status + "',ProcessId='" + processId + "' where Id='" + keyValue + "' ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 审核实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void ChangeStatusByProcessId(string status, string processId, string userId)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").ExecuteBySql("update StuCancelDisciplineManagement set CheckStatus='" + status + "',CheckUserId='" + userId + "',CheckTime='" + DateTime.Now + "' where ProcessId='" + processId + "' ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementBLL.cs
new file mode 100644
index 000000000..9819c68d8
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementBLL.cs	
@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 11:35
+    /// 描 述：学生销假管理
+    /// </summary>
+    public class StuCancelLeaveManagementBLL : StuCancelLeaveManagementIBLL
+    {
+        private StuCancelLeaveManagementService stuCancelLeaveManagementService = new StuCancelLeaveManagementService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuCancelLeaveManagementEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return stuCancelLeaveManagementService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StuCancelLeaveManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuCancelLeaveManagementEntity GetStuCancelLeaveManagementEntity(string keyValue)
+        {
+            try
+            {
+                return stuCancelLeaveManagementService.GetStuCancelLeaveManagementEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                stuCancelLeaveManagementService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, StuCancelLeaveManagementEntity entity)
+        {
+            try
+            {
+                stuCancelLeaveManagementService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementEntity.cs
new file mode 100644
index 000000000..258efd80e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementEntity.cs	
@@ -0,0 +1,117 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 11:35
+    /// 描 述：学生销假管理
+    /// </summary>
+    public class StuCancelLeaveManagementEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 销假类型
+        /// </summary>
+        [Column("CANCELLEAVETYPE")]
+        public string CancelLeaveType { get; set; }
+        /// <summary>
+        /// 到岗时间
+        /// </summary>
+        [Column("WORKTIME")]
+        public DateTime? WorkTime { get; set; }
+        /// <summary>
+        /// 销假事由
+        /// </summary>
+        [Column("CANCELLEAVEREASON")]
+        public string CancelLeaveReason { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 申请人
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// 申请用户编号
+        /// </summary>
+        [Column("CREATEUSERNO")]
+        public string CreateUserNo { get; set; }
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 审核状态
+        /// </summary>
+        [Column("CHECKSTATUS")]
+        public string CheckStatus { get; set; }
+        /// <summary>
+        /// 审核备注
+        /// </summary>
+        [Column("CHECKREMARK")]
+        public string CheckRemark { get; set; }
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        [Column("CHECKUSERID")]
+        public string CheckUserId { get; set; }
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        [Column("CHECKTIME")]
+        public DateTime? CheckTime { get; set; }
+        /// <summary>
+        /// 审核用户编号
+        /// </summary>
+        [Column("CHECKUSERNO")]
+        public string CheckUserNo { 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 扩展字段
+        [NotMapped]
+        public string CreateUserName { get; set; }
+        [NotMapped]
+        public string ClassNo { get; set; }
+        [NotMapped]
+        public string DeptNo { get; set; }
+        [NotMapped]
+        public string MajorNo { get; set; }
+        [NotMapped]
+        public string ClassDiredctorNo { get; set; }
+        [NotMapped]
+        public string ClassTutorNo { get; set; }
+        #endregion
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementIBLL.cs
new file mode 100644
index 000000000..ddbdd751a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementIBLL.cs	
@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 11:35
+    /// 描 述：学生销假管理
+    /// </summary>
+    public interface StuCancelLeaveManagementIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StuCancelLeaveManagementEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取StuCancelLeaveManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        StuCancelLeaveManagementEntity GetStuCancelLeaveManagementEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, StuCancelLeaveManagementEntity entity);
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementService.cs
new file mode 100644
index 000000000..bfeb8a4cd
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelLeaveManagement/StuCancelLeaveManagementService.cs	
@@ -0,0 +1,162 @@
+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 V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 11:35
+    /// 描 述：学生销假管理
+    /// </summary>
+    public class StuCancelLeaveManagementService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuCancelLeaveManagementEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,s.StuName as CreateUserName,s.ClassNo,s.DeptNo,s.MajorNo,c.ClassDiredctorNo,c.ClassTutorNo ");
+                strSql.Append("  FROM StuCancelLeaveManagement t  left join StuInfoBasic s on t.CreateUserNo=s.StuNo left join ClassInfo c on s.ClassNo=c.ClassNo ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["CancelLeaveType"].IsEmpty())
+                {
+                    dp.Add("CancelLeaveType",queryParam["CancelLeaveType"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CancelLeaveType = @CancelLeaveType ");
+                }
+                if (!queryParam["CheckStatus"].IsEmpty())
+                {
+                    dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CheckStatus = @CheckStatus ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CreateUserNo = @StuNo ");
+                }
+                //班级班主任/辅导员
+                if (!queryParam["ClassManagerNo"].IsEmpty())
+                {
+                    dp.Add("ClassManagerNo", queryParam["ClassManagerNo"].ToString(), DbType.String);
+                    strSql.Append(" AND (c.ClassDiredctorNo = @ClassManagerNo or c.ClassTutorNo = @ClassManagerNo ) ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuCancelLeaveManagementEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StuCancelLeaveManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuCancelLeaveManagementEntity GetStuCancelLeaveManagementEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuCancelLeaveManagementEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<StuCancelLeaveManagementEntity>(t=>t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, StuCancelLeaveManagementEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
index 78221f19f..06c406a1a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
@@ -184,6 +184,14 @@
     <Compile Include="EducationalAdministration\ScoreStatistics\ScoreStatisticsIBLL.cs" />
     <Compile Include="EducationalAdministration\ScoreStatistics\ScoreStatisticsService.cs" />
     <Compile Include="EducationalAdministration\SignUpHelper.cs" />
+    <Compile Include="EducationalAdministration\StuCancelDisciplineManagement\StuCancelDisciplineManagementBLL.cs" />
+    <Compile Include="EducationalAdministration\StuCancelDisciplineManagement\StuCancelDisciplineManagementEntity.cs" />
+    <Compile Include="EducationalAdministration\StuCancelDisciplineManagement\StuCancelDisciplineManagementIBLL.cs" />
+    <Compile Include="EducationalAdministration\StuCancelDisciplineManagement\StuCancelDisciplineManagementService.cs" />
+    <Compile Include="EducationalAdministration\StuCancelLeaveManagement\StuCancelLeaveManagementBLL.cs" />
+    <Compile Include="EducationalAdministration\StuCancelLeaveManagement\StuCancelLeaveManagementEntity.cs" />
+    <Compile Include="EducationalAdministration\StuCancelLeaveManagement\StuCancelLeaveManagementIBLL.cs" />
+    <Compile Include="EducationalAdministration\StuCancelLeaveManagement\StuCancelLeaveManagementService.cs" />
     <Compile Include="EducationalAdministration\StuEnrollAmountRecord\StuEnrollAmountRecordBLL.cs" />
     <Compile Include="EducationalAdministration\StuEnrollAmountRecord\StuEnrollAmountRecordEntity.cs" />
     <Compile Include="EducationalAdministration\StuEnrollAmountRecord\StuEnrollAmountRecordIBLL.cs" />