学生请假PC端

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

@@ -170,6 +170,20 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuLeaveManagementIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
+        
+
+        /// <summary>
+        /// 提交--修改状态
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult ModifyStatus(string keyValue,string CheckStatus,string processId)
+        {
+            stuLeaveManagementIBLL.ModifyStatus(keyValue, CheckStatus, processId);
+            return Success("保存成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js

@@ -377,7 +377,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
-                                key: value,
+                                key: row.EmpNo,
                                 keyId: 'empno',
                                 callback: function (_data) {
                                     callback(_data['empname']);

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

@@ -27,8 +27,9 @@
                         <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_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_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
                 </div>

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

@@ -1,212 +1,254 @@
-/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
- * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
- * 创建人：超级管理员
- * 日  期：2020-11-27 10:05
- * 描  述：学生请假管理
- */
-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);
-            $('#LeaveType').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/StuLeaveManagement/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/StuLeaveManagement/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/StuLeaveManagement/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
-        },
-        // 初始化列表
-        initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/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: "LeaveType", 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: "StartTime", width: 100, align: "left" },
-                    { label: "结束时间", name: "EndTime", width: 100, align: "left" },
-                    { label: "请假天数", name: "LeaveDay", width: 100, align: "left" },
-                    { label: "请假事由", name: "LeaveReason", 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();
-}
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-11-27 10:05
+ * 描  述：学生请假管理
+ */
+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);
+            $('#LeaveType').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/StuLeaveManagement/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") {
+                        learun.alert.warning("该项已提交无法编辑！");
+                        return false;
+                    }
+                    if (status == "2") {
+                        learun.alert.warning("该项已审核无法编辑！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/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;
+                    }
+                    if (status == "2") {
+                        learun.alert.warning("该项已审核无法删除！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var status = $('#gridtable').jfGridValue('CheckStatus');
+                    if (status == "1") {
+                        learun.alert.warning("当前项目已提交，请耐心等待审批！");
+                        return;
+                    }
+                    if (status == "2") {
+                        learun.alert.warning("当前项目已审核！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            processId = learun.newGuid();
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/ModifyStatus', { keyValue: keyValue, CheckStatus: "1", processId: processId }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/GetPageList',
+                headData: [
+                    {
+                        label: "审核状态", name: "CheckStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue == 2) {
+                                return "<span class=\"label label-success\">审核通过</span>";
+                            } else if (cellvalue == 1) {
+                                return "<span class=\"label label-danger\">已提交</span>";
+                            } else if (cellvalue == 0) {
+                                return "<span class=\"label label-default\">草稿</span>";
+                            }
+                        }
+                    },
+                    { 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: "LeaveType", 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: "StartTime", width: 100, align: "left" },
+                    { label: "结束时间", name: "EndTime", width: 100, align: "left" },
+                    { label: "请假天数", name: "LeaveDay", width: 100, align: "left" },
+                    { label: "请假事由", name: "LeaveReason", 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 (res, postData) {
+        if (res.code == 200) {
+            // 发起流程
+            var postData = {
+                schemeCode: 'StuLeaveManagement',// 填写流程对应模板编号 
+                processId: processId,
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
+            });
+
+            page.search();
+        }
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config

@@ -38,6 +38,7 @@
     <typeAlias alias="StuLeaveManagementMethod" type="Learun.Application.WorkFlow.StuLeaveManagementMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StuCancelLeaveManageMethod" type="Learun.Application.WorkFlow.StuCancelLeaveManageMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="Acc_DormitoryChangeMethod" type="Learun.Application.WorkFlow.Acc_DormitoryChangeMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="StuLeaveManagementMethod" type="Learun.Application.WorkFlow.StuLeaveManagementMethod,Learun.Application.WorkFlow" />
 
 
     <!--任务调度器-->
@@ -87,6 +88,7 @@
       <type type="IWorkFlowMethod" mapTo="StuLeaveManagementMethod" name="StuLeaveManagementMethod"></type>
       <type type="IWorkFlowMethod" mapTo="StuCancelLeaveManageMethod" name="StuCancelLeaveManageMethod"></type>
       <type type="IWorkFlowMethod" mapTo="Acc_DormitoryChangeMethod" name="Acc_DormitoryChangeMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="StuLeaveManagementMethod" name="StuLeaveManagementMethod"></type>
 
     </container>
 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config

@@ -10,10 +10,11 @@
     <!--工作流接口-->
     <typeAlias alias="INodeMethod" type=" Learun.Application.WorkFlow.INodeMethod, Learun.Application.WorkFlow" />
     <typeAlias alias="NodeMethod" type=" Learun.Application.WorkFlow.NodeMethod, Learun.Application.WorkFlow" />
+    <typeAlias alias="StuLeaveManagementMethod" type="Learun.Application.WorkFlow.StuLeaveManagementMethod,Learun.Application.WorkFlow" />
 
     <!--任务调度器-->
     <typeAlias alias="ITSMethod" type="Learun.Application.Extention.TaskScheduling.ITsMethod,Learun.Application.Extention" />
-
+    
   </typeAliases>
   <containers>
     <container name="IOCcontainer">
@@ -24,6 +25,8 @@
 
     <container name="WfIOCcontainer">
       <type type="INodeMethod" mapTo="NodeMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="StuLeaveManagementMethod" name="StuLeaveManagementMethod"></type>
+
     </container>
     <container name="TsIOCcontainer">
       <!--<type type="ITSMethod" mapTo="TestTask" name="taskioc"></type>-->

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs

@@ -144,6 +144,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public void ModifyStatus(string keyValue, string CheckStatus, string processId)
+        {
+            try
+            {
+                stuLeaveManagementService.ModifyStatus(keyValue, CheckStatus, processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementEntity.cs

@@ -60,11 +60,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("CREATETIME")]
         public DateTime? CreateTime { get; set; }
         /// <summary>
-        /// 审核状态
+        /// 审核状态 0草稿，1已提交，2审核通过
         /// </summary>
         [Column("CHECKSTATUS")]
         public string CheckStatus { get; set; }
         /// <summary>
+        /// 流程Id
+        /// </summary>
+        [Column("PROCESSID")]
+        public string ProcessId { get; set; }
+        /// <summary>
         /// 审核备注
         /// </summary>
         [Column("CHECKREMARK")]
@@ -93,6 +98,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            var loginInfo = LoginUserInfo.Get();
+            this.CreateUserId = loginInfo.userId;
+            this.CreateUserNo = loginInfo.account;
+            this.CreateTime = DateTime.Now;
+            this.CheckStatus = "0";
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementIBLL.cs

@@ -43,6 +43,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, StuLeaveManagementEntity entity);
+        void ModifyStatus(string keyValue, string CheckStatus, string processId);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs

@@ -206,8 +206,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         data.ClassNo = studentlist.ClassNo;
                         data.CreateUserName = studentlist.StuName;
                     }
-                    var classlist = this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>(x =>x.ClassNo == data.ClassNo).FirstOrDefault();
-                    if (classlist!=null)
+                    var classlist = this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>(x => x.ClassNo == data.ClassNo).FirstOrDefault();
+                    if (classlist != null)
                     {
                         data.ClassDiredctorNo = classlist.ClassDiredctorNo;
                         data.ClassTutorNo = classlist.ClassTutorNo;
@@ -270,8 +270,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     entity.Modify(keyValue);
                     db.Update(entity);
-                    
-                    if (entity.CheckStatus.Trim() == "1" && entity.StartTime != null)
+
+                    if (entity.CheckStatus.Trim() == "2" && entity.StartTime != null)
                     {
                         //请假审核通过后，该学生的对应日期的课表改为请假
                         var model = this.BaseRepository("CollegeMIS").FindList<StuLeaveManagementEntity>(
@@ -324,12 +324,12 @@ and a.lessondate between '{startTime}' and '{endTime}'");
                             stuAttendanceLeave.ClassRoomName = classRoomList.FirstOrDefault(x => x.ClassroomNo == arrangeLessonTerm.ClassroomNo)?.ClassroomName;
                             //去重
                             var isExistModel = this.BaseRepository("CollegeMIS").FindEntity<StuAttendanceLeaveEntity>(x =>
-                                x.AcademicYearNo == stuAttendanceLeave.AcademicYearNo && x.Semester == stuAttendanceLeave.Semester && 
-                                x.StuNo == stuAttendanceLeave.StuNo &&x.LessonNo == stuAttendanceLeave.LessonNo && x.TeachClassNo == stuAttendanceLeave.TeachClassNo && 
-                                x.LessonSortNo == stuAttendanceLeave.LessonSortNo &&x.LessonDate == stuAttendanceLeave.LessonDate && x.LessonTime == stuAttendanceLeave.LessonTime && 
-                                x.EmpNo == stuAttendanceLeave.EmpNo &&x.ClassRoomNo == stuAttendanceLeave.ClassRoomNo
+                                x.AcademicYearNo == stuAttendanceLeave.AcademicYearNo && x.Semester == stuAttendanceLeave.Semester &&
+                                x.StuNo == stuAttendanceLeave.StuNo && x.LessonNo == stuAttendanceLeave.LessonNo && x.TeachClassNo == stuAttendanceLeave.TeachClassNo &&
+                                x.LessonSortNo == stuAttendanceLeave.LessonSortNo && x.LessonDate == stuAttendanceLeave.LessonDate && x.LessonTime == stuAttendanceLeave.LessonTime &&
+                                x.EmpNo == stuAttendanceLeave.EmpNo && x.ClassRoomNo == stuAttendanceLeave.ClassRoomNo
                             );
-                            if (isExistModel!=null)
+                            if (isExistModel != null)
                             {
                                 stuAttendanceLeave.Modify(isExistModel.ID);
                                 db.Update(stuAttendanceLeave);
@@ -339,14 +339,14 @@ and a.lessondate between '{startTime}' and '{endTime}'");
                                 stuAttendanceLeave.Create();
                                 db.Insert(stuAttendanceLeave);
                             }
-                            
+
                             //学生考勤
                             StuAttendanceEntity stuAttendanceEntity = new StuAttendanceEntity();
                             stuAttendanceEntity.AcademicYearNo = arrangeLessonTerm.AcademicYearNo;
                             stuAttendanceEntity.Semester = arrangeLessonTerm.Semester;
                             stuAttendanceEntity.StuNo = model.CreateUserNo;
                             stuAttendanceEntity.StuName = arrangeLessonTerm.StuName;
-                            stuAttendanceEntity.Gender = arrangeLessonTerm.GenderNo.ToLower()=="true"?"男":"女";
+                            stuAttendanceEntity.Gender = arrangeLessonTerm.GenderNo.ToLower() == "true" ? "男" : "女";
                             stuAttendanceEntity.Grade = arrangeLessonTerm.Grade;
                             stuAttendanceEntity.DeptNo = arrangeLessonTerm.DeptNo;
                             stuAttendanceEntity.DeptName = deptList.Where(x => x.DeptNo == arrangeLessonTerm.DeptNo)
@@ -414,6 +414,38 @@ and a.lessondate between '{startTime}' and '{endTime}'");
             }
         }
 
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="CheckStatus"></param>
+        /// <param name="processId"></param>
+        public void ModifyStatus(string keyValue, string CheckStatus, string processId)
+        {
+            var db = this.BaseRepository("CollegeMIS");
+            try
+            {
+                db.BeginTrans();
+                var entity = db.FindEntity<StuLeaveManagementEntity>(keyValue);
+                entity.CheckStatus = CheckStatus;
+                entity.ProcessId = processId;
+                db.Update(entity);
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }