学生请假PC

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

@@ -39,7 +39,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
-
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+        
         /// <summary>
         /// 主页面【学工信息管理】
         /// <summary>
@@ -116,6 +125,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             };
             return Success(jsonData);
         }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDataByProcessId(string processId)
+        {
+            var StuLeaveManagementData = stuLeaveManagementIBLL.GetEntityByProcessId(processId);
+            var jsonData = new
+            {
+                StuLeaveManagement = StuLeaveManagementData,
+            };
+            return Success(jsonData);
+        }
         #endregion
 
         #region 提交数据
@@ -143,11 +164,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
-            var loginInfo = LoginUserInfo.Get();
             StuLeaveManagementEntity entity = strEntity.ToObject<StuLeaveManagementEntity>();
-            entity.CreateUserId = loginInfo.userId;
-            entity.CreateUserNo = loginInfo.account;
-            entity.CreateTime = DateTime.Now;
+            
             stuLeaveManagementIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }

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

@@ -27,7 +27,7 @@
                         <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>
+                        @*<a id="lr_check" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;审核</a>*@
                     </div>
                 </div>
             </div>

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

@@ -52,14 +52,16 @@ var bootstrap = function ($, learun) {
                 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 : "申请中");
-                                }
-                            });
+                        formatter: function (cellvalue) {
+                            if (cellvalue == 2) {
+                                return "<span class=\"label label-success\">审核通过</span>";
+                            } else if (cellvalue == 3) {
+                                return "<span class=\"label label-danger\">审核未通过</span>";
+                            } else if (cellvalue == 1) {
+                                return "<span class=\"label label-warning\">审核中</span>";
+                            } else if (cellvalue == 0) {
+                                return "<span class=\"label label-default\">草稿</span>";
+                            }
                         }
                     },
                     { label: "审核备注", name: "CheckRemark", width: 100, align: "left" },

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

@@ -15,14 +15,14 @@
         <div class="lr-form-item-title">返校时间<font face="宋体">*</font></div>
         <input id="EndTime" readonly type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuLeaveManagement">
+    <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
         <div class="lr-form-item-title">请假天数<font face="宋体">*</font></div>
         <input id="LeaveDay" readonly type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuLeaveManagement">
+    @*<div class="col-xs-6 lr-form-item" data-table="StuLeaveManagement">
         <div class="lr-form-item-title">未销假次数</div>
         <input id="num" readonly type="text" class="form-control" />
-    </div>
+    </div>*@
     <div class="col-xs-12 lr-form-item" data-table="StuLeaveManagement">
         <div class="lr-form-item-title">附件上传</div>
         <div id="Files" readonly></div>

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

@@ -1,254 +1,261 @@
-/* * 版 本 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-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 == 3) {
+                                return "<span class=\"label label-danger\">审核未通过</span>";
+                            } else if (cellvalue == 1) {
+                                return "<span class=\"label label-warning\">审核中</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 && 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,7 +38,6 @@
     <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" />
 
 
     <!--任务调度器-->
@@ -88,7 +87,6 @@
       <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.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementBLL.cs

@@ -91,7 +91,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
+        public StuLeaveManagementEntity GetEntityByProcessId(string processId)
+        {
+            try
+            {
+                return stuLeaveManagementService.GetEntityByProcessId(processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据
@@ -162,7 +179,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
+        public void ChangeStatusByProcessId(string status, string processId, string userId)
+        {
+            try
+            {
+                stuLeaveManagementService.ChangeStatusByProcessId(status, processId, userId);
+            }
+            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/StuLeaveManagementIBLL.cs

@@ -28,6 +28,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         StuLeaveManagementEntity GetStuLeaveManagementEntity(string keyValue);
+        StuLeaveManagementEntity GetEntityByProcessId(string processId);
         #endregion
 
         #region 提交数据
@@ -44,6 +45,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, StuLeaveManagementEntity entity);
         void ModifyStatus(string keyValue, string CheckStatus, string processId);
+        void ChangeStatusByProcessId(string status, string processId, string userId);
         #endregion
 
     }

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

@@ -228,6 +228,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取主表实体数据
+        /// <param name="processId">流程实例ID</param>
+        /// <summary>
+        /// <returns></returns>
+        public StuLeaveManagementEntity GetEntityByProcessId(string processId)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuLeaveManagementEntity>(t => t.ProcessId == processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据
@@ -271,126 +295,126 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     entity.Modify(keyValue);
                     db.Update(entity);
 
-                    if (entity.CheckStatus.Trim() == "2" && entity.StartTime != null)
-                    {
-                        //请假审核通过后，该学生的对应日期的课表改为请假
-                        var model = this.BaseRepository("CollegeMIS").FindList<StuLeaveManagementEntity>(
-                            $"select * from StuLeaveManagement where Id='{keyValue}'").FirstOrDefault();
-                        //请假开始时间和结束时间
-                        var startTime = Convert.ToDateTime(model.StartTime?.ToString("yyyy-MM-dd") + " 00:00:00");
-                        var endTime = Convert.ToDateTime(model.EndTime?.ToString("yyyy-MM-dd") + " 23:59:59");
+//                    if (entity.CheckStatus.Trim() == "2" && entity.StartTime != null)
+//                    {
+//                        //请假审核通过后，该学生的对应日期的课表改为请假
+//                        var model = this.BaseRepository("CollegeMIS").FindList<StuLeaveManagementEntity>(
+//                            $"select * from StuLeaveManagement where Id='{keyValue}'").FirstOrDefault();
+//                        //请假开始时间和结束时间
+//                        var startTime = Convert.ToDateTime(model.StartTime?.ToString("yyyy-MM-dd") + " 00:00:00");
+//                        var endTime = Convert.ToDateTime(model.EndTime?.ToString("yyyy-MM-dd") + " 23:59:59");
 
-                        //排课数据
-                        var arrangeLessonTermList = db.FindList<ArrangeLessonTermEntity>($@"select a.*,b.StuName,b.Grade,b.GenderNo from [dbo].[ArrangeLessonTerm] a
-join stuinfobasic b on a.teachclassno=b.classno
-where b.stuno='{model.CreateUserNo}'
-and a.lessondate between '{startTime}' and '{endTime}'");
+//                        //排课数据
+//                        var arrangeLessonTermList = db.FindList<ArrangeLessonTermEntity>($@"select a.*,b.StuName,b.Grade,b.GenderNo from [dbo].[ArrangeLessonTerm] a
+//join stuinfobasic b on a.teachclassno=b.classno
+//where b.stuno='{model.CreateUserNo}'
+//and a.lessondate between '{startTime}' and '{endTime}'");
 
-                        var deptList = this.BaseRepository("CollegeMIS").FindList<CdDeptEntity>();
-                        var majorList = this.BaseRepository("CollegeMIS").FindList<CdMajorEntity>();
-                        var classInfoList = this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>();
-                        var classRoomList = this.BaseRepository("CollegeMIS").FindList<ClassroomInfoEntity>().ToList();
-                        var lessonSortList = this.BaseRepository("CollegeMIS").FindList<CdLessonSortEntity>().ToList();
-                        foreach (var arrangeLessonTerm in arrangeLessonTermList)
-                        {
-                            StuAttendanceLeaveEntity stuAttendanceLeave = new StuAttendanceLeaveEntity();
-                            stuAttendanceLeave.AcademicYearNo = arrangeLessonTerm.AcademicYearNo;
-                            stuAttendanceLeave.Semester = arrangeLessonTerm.Semester;
-                            stuAttendanceLeave.StuNo = model.CreateUserNo;
-                            stuAttendanceLeave.StuName = arrangeLessonTerm.StuName;
-                            stuAttendanceLeave.Grade = arrangeLessonTerm.Grade;
-                            stuAttendanceLeave.DeptNo = arrangeLessonTerm.DeptNo;
-                            stuAttendanceLeave.DeptName = deptList.Where(x => x.DeptNo == arrangeLessonTerm.DeptNo)
-                                .FirstOrDefault()?.DeptName;
-                            stuAttendanceLeave.MajorNo = arrangeLessonTerm.MajorNo;
-                            stuAttendanceLeave.MajorName = majorList.Where(x => x.MajorNo == arrangeLessonTerm.MajorNo)
-                                .FirstOrDefault()?.MajorName;
-                            stuAttendanceLeave.ClassNo = arrangeLessonTerm.TeachClassNo;
-                            stuAttendanceLeave.ClassName = classInfoList
-                                .Where(x => x.ClassNo == arrangeLessonTerm.TeachClassNo).FirstOrDefault()?.ClassName;
-                            stuAttendanceLeave.LessonNo = arrangeLessonTerm.LessonNo;
-                            stuAttendanceLeave.LessonName = arrangeLessonTerm.LessonName;
-                            stuAttendanceLeave.TeachClassNo = arrangeLessonTerm.TeachClassNo;
-                            stuAttendanceLeave.LessonSortNo = arrangeLessonTerm.LessonSortNo;
-                            stuAttendanceLeave.LessonSortName = lessonSortList.Find(m => m.LessonSortNo == arrangeLessonTerm.LessonSortNo)?.LessonSortName;
-                            stuAttendanceLeave.LessonDate = arrangeLessonTerm.LessonDate;
-                            stuAttendanceLeave.LessonTime = arrangeLessonTerm.LessonTime;
-                            stuAttendanceLeave.LeaveType = entity.LeaveType;
-                            stuAttendanceLeave.EmpNo = arrangeLessonTerm.EmpNo;
-                            stuAttendanceLeave.TecRemark = "按天请假";
-                            stuAttendanceLeave.UpdateDate = DateTime.Now;
-                            stuAttendanceLeave.IsCheck = "1";
-                            stuAttendanceLeave.ClassRoomNo = arrangeLessonTerm.ClassroomNo;
-                            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
-                            );
-                            if (isExistModel != null)
-                            {
-                                stuAttendanceLeave.Modify(isExistModel.ID);
-                                db.Update(stuAttendanceLeave);
-                            }
-                            else
-                            {
-                                stuAttendanceLeave.Create();
-                                db.Insert(stuAttendanceLeave);
-                            }
+//                        var deptList = this.BaseRepository("CollegeMIS").FindList<CdDeptEntity>();
+//                        var majorList = this.BaseRepository("CollegeMIS").FindList<CdMajorEntity>();
+//                        var classInfoList = this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>();
+//                        var classRoomList = this.BaseRepository("CollegeMIS").FindList<ClassroomInfoEntity>().ToList();
+//                        var lessonSortList = this.BaseRepository("CollegeMIS").FindList<CdLessonSortEntity>().ToList();
+//                        foreach (var arrangeLessonTerm in arrangeLessonTermList)
+//                        {
+//                            StuAttendanceLeaveEntity stuAttendanceLeave = new StuAttendanceLeaveEntity();
+//                            stuAttendanceLeave.AcademicYearNo = arrangeLessonTerm.AcademicYearNo;
+//                            stuAttendanceLeave.Semester = arrangeLessonTerm.Semester;
+//                            stuAttendanceLeave.StuNo = model.CreateUserNo;
+//                            stuAttendanceLeave.StuName = arrangeLessonTerm.StuName;
+//                            stuAttendanceLeave.Grade = arrangeLessonTerm.Grade;
+//                            stuAttendanceLeave.DeptNo = arrangeLessonTerm.DeptNo;
+//                            stuAttendanceLeave.DeptName = deptList.Where(x => x.DeptNo == arrangeLessonTerm.DeptNo)
+//                                .FirstOrDefault()?.DeptName;
+//                            stuAttendanceLeave.MajorNo = arrangeLessonTerm.MajorNo;
+//                            stuAttendanceLeave.MajorName = majorList.Where(x => x.MajorNo == arrangeLessonTerm.MajorNo)
+//                                .FirstOrDefault()?.MajorName;
+//                            stuAttendanceLeave.ClassNo = arrangeLessonTerm.TeachClassNo;
+//                            stuAttendanceLeave.ClassName = classInfoList
+//                                .Where(x => x.ClassNo == arrangeLessonTerm.TeachClassNo).FirstOrDefault()?.ClassName;
+//                            stuAttendanceLeave.LessonNo = arrangeLessonTerm.LessonNo;
+//                            stuAttendanceLeave.LessonName = arrangeLessonTerm.LessonName;
+//                            stuAttendanceLeave.TeachClassNo = arrangeLessonTerm.TeachClassNo;
+//                            stuAttendanceLeave.LessonSortNo = arrangeLessonTerm.LessonSortNo;
+//                            stuAttendanceLeave.LessonSortName = lessonSortList.Find(m => m.LessonSortNo == arrangeLessonTerm.LessonSortNo)?.LessonSortName;
+//                            stuAttendanceLeave.LessonDate = arrangeLessonTerm.LessonDate;
+//                            stuAttendanceLeave.LessonTime = arrangeLessonTerm.LessonTime;
+//                            stuAttendanceLeave.LeaveType = entity.LeaveType;
+//                            stuAttendanceLeave.EmpNo = arrangeLessonTerm.EmpNo;
+//                            stuAttendanceLeave.TecRemark = "按天请假";
+//                            stuAttendanceLeave.UpdateDate = DateTime.Now;
+//                            stuAttendanceLeave.IsCheck = "1";
+//                            stuAttendanceLeave.ClassRoomNo = arrangeLessonTerm.ClassroomNo;
+//                            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
+//                            );
+//                            if (isExistModel != null)
+//                            {
+//                                stuAttendanceLeave.Modify(isExistModel.ID);
+//                                db.Update(stuAttendanceLeave);
+//                            }
+//                            else
+//                            {
+//                                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.Grade = arrangeLessonTerm.Grade;
-                            stuAttendanceEntity.DeptNo = arrangeLessonTerm.DeptNo;
-                            stuAttendanceEntity.DeptName = deptList.Where(x => x.DeptNo == arrangeLessonTerm.DeptNo)
-                                .FirstOrDefault()?.DeptName;
-                            stuAttendanceEntity.MajorNo = arrangeLessonTerm.MajorNo;
-                            stuAttendanceEntity.MajorName = majorList.Where(x => x.MajorNo == arrangeLessonTerm.MajorNo).FirstOrDefault()?.MajorName;
-                            stuAttendanceEntity.ClassNo = arrangeLessonTerm.TeachClassNo;
-                            stuAttendanceEntity.ClassName = classInfoList
-                                .Where(x => x.ClassNo == arrangeLessonTerm.TeachClassNo).FirstOrDefault()?.ClassName;
-                            stuAttendanceEntity.LessonNo = arrangeLessonTerm.LessonNo;
-                            stuAttendanceEntity.LessonName = arrangeLessonTerm.LessonName;
-                            stuAttendanceEntity.TeachClassNo = arrangeLessonTerm.TeachClassNo;
-                            stuAttendanceEntity.LessonSortNo = arrangeLessonTerm.LessonSortNo;
-                            stuAttendanceEntity.LessonSortName = lessonSortList.Find(m => m.LessonSortNo == arrangeLessonTerm.LessonSortNo)?.LessonSortName;
-                            stuAttendanceEntity.LessonDate = arrangeLessonTerm.LessonDate;
-                            stuAttendanceEntity.PlanWeek = null;
-                            stuAttendanceEntity.LessonTime = arrangeLessonTerm.LessonTime;
-                            stuAttendanceEntity.AttendOrNo = "否";
-                            stuAttendanceEntity.Sort = Convert.ToInt32(entity.LeaveType) == 2 ? "病假" : "事假";
-                            stuAttendanceEntity.EmpNo = arrangeLessonTerm.EmpNo;
-                            stuAttendanceEntity.Remark = "按天请假";
-                            stuAttendanceEntity.CheckMarkDept = "";
-                            stuAttendanceEntity.CheckMark = "";
-                            stuAttendanceEntity.InertDate = DateTime.Now;
-                            stuAttendanceEntity.ClassRoomNo = arrangeLessonTerm.ClassroomNo;
-                            stuAttendanceEntity.ClassRoomName = classRoomList.FirstOrDefault(x => x.ClassroomNo == arrangeLessonTerm.ClassroomNo)?.ClassroomName;
-                            //去重
-                            var isExistModel2 = this.BaseRepository("CollegeMIS").FindEntity<StuAttendanceEntity>(x =>
-                            x.AcademicYearNo == stuAttendanceEntity.AcademicYearNo && x.Semester == stuAttendanceEntity.Semester && x.StuNo == stuAttendanceEntity.StuNo &&
-                            x.LessonNo == stuAttendanceEntity.LessonNo && x.TeachClassNo == stuAttendanceEntity.TeachClassNo && x.LessonSortNo == stuAttendanceEntity.LessonSortNo &&
-                            x.LessonDate == stuAttendanceEntity.LessonDate && x.LessonTime == stuAttendanceEntity.LessonTime && x.EmpNo == stuAttendanceEntity.EmpNo && x.ClassRoomNo == stuAttendanceEntity.ClassRoomNo);
-                            if (isExistModel2 != null)
-                            {
-                                stuAttendanceEntity.Modify(isExistModel2.ID);
-                                db.Update(stuAttendanceEntity);
-                            }
-                            else
-                            {
-                                stuAttendanceEntity.Create();
-                                db.Insert(stuAttendanceEntity);
-                            }
+//                            //学生考勤
+//                            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.Grade = arrangeLessonTerm.Grade;
+//                            stuAttendanceEntity.DeptNo = arrangeLessonTerm.DeptNo;
+//                            stuAttendanceEntity.DeptName = deptList.Where(x => x.DeptNo == arrangeLessonTerm.DeptNo)
+//                                .FirstOrDefault()?.DeptName;
+//                            stuAttendanceEntity.MajorNo = arrangeLessonTerm.MajorNo;
+//                            stuAttendanceEntity.MajorName = majorList.Where(x => x.MajorNo == arrangeLessonTerm.MajorNo).FirstOrDefault()?.MajorName;
+//                            stuAttendanceEntity.ClassNo = arrangeLessonTerm.TeachClassNo;
+//                            stuAttendanceEntity.ClassName = classInfoList
+//                                .Where(x => x.ClassNo == arrangeLessonTerm.TeachClassNo).FirstOrDefault()?.ClassName;
+//                            stuAttendanceEntity.LessonNo = arrangeLessonTerm.LessonNo;
+//                            stuAttendanceEntity.LessonName = arrangeLessonTerm.LessonName;
+//                            stuAttendanceEntity.TeachClassNo = arrangeLessonTerm.TeachClassNo;
+//                            stuAttendanceEntity.LessonSortNo = arrangeLessonTerm.LessonSortNo;
+//                            stuAttendanceEntity.LessonSortName = lessonSortList.Find(m => m.LessonSortNo == arrangeLessonTerm.LessonSortNo)?.LessonSortName;
+//                            stuAttendanceEntity.LessonDate = arrangeLessonTerm.LessonDate;
+//                            stuAttendanceEntity.PlanWeek = null;
+//                            stuAttendanceEntity.LessonTime = arrangeLessonTerm.LessonTime;
+//                            stuAttendanceEntity.AttendOrNo = "否";
+//                            stuAttendanceEntity.Sort = Convert.ToInt32(entity.LeaveType) == 2 ? "病假" : "事假";
+//                            stuAttendanceEntity.EmpNo = arrangeLessonTerm.EmpNo;
+//                            stuAttendanceEntity.Remark = "按天请假";
+//                            stuAttendanceEntity.CheckMarkDept = "";
+//                            stuAttendanceEntity.CheckMark = "";
+//                            stuAttendanceEntity.InertDate = DateTime.Now;
+//                            stuAttendanceEntity.ClassRoomNo = arrangeLessonTerm.ClassroomNo;
+//                            stuAttendanceEntity.ClassRoomName = classRoomList.FirstOrDefault(x => x.ClassroomNo == arrangeLessonTerm.ClassroomNo)?.ClassroomName;
+//                            //去重
+//                            var isExistModel2 = this.BaseRepository("CollegeMIS").FindEntity<StuAttendanceEntity>(x =>
+//                            x.AcademicYearNo == stuAttendanceEntity.AcademicYearNo && x.Semester == stuAttendanceEntity.Semester && x.StuNo == stuAttendanceEntity.StuNo &&
+//                            x.LessonNo == stuAttendanceEntity.LessonNo && x.TeachClassNo == stuAttendanceEntity.TeachClassNo && x.LessonSortNo == stuAttendanceEntity.LessonSortNo &&
+//                            x.LessonDate == stuAttendanceEntity.LessonDate && x.LessonTime == stuAttendanceEntity.LessonTime && x.EmpNo == stuAttendanceEntity.EmpNo && x.ClassRoomNo == stuAttendanceEntity.ClassRoomNo);
+//                            if (isExistModel2 != null)
+//                            {
+//                                stuAttendanceEntity.Modify(isExistModel2.ID);
+//                                db.Update(stuAttendanceEntity);
+//                            }
+//                            else
+//                            {
+//                                stuAttendanceEntity.Create();
+//                                db.Insert(stuAttendanceEntity);
+//                            }
 
-                        }
-                    }
+//                        }
+//                    }
                 }
                 else
                 {
@@ -446,6 +470,154 @@ and a.lessondate between '{startTime}' and '{endTime}'");
             }
         }
 
+        /// <summary>
+        /// 审核实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void ChangeStatusByProcessId(string status, string processId, string userId)
+        {
+            var db = this.BaseRepository("CollegeMIS");
+            try
+            {
+                db.BeginTrans();
+                db.ExecuteBySql("update StuLeaveManagement set CheckStatus='" + status + "',CheckUserId='" + userId + "',CheckTime='" + DateTime.Now + "' where ProcessId='" + processId + "' ");
+                if (status.Trim() == "2")
+                {
+                    //请假审核通过后，该学生的对应日期的课表改为请假
+                    var model = db.FindList<StuLeaveManagementEntity>(
+                        $"select * from StuLeaveManagement where ProcessId='{processId}'").FirstOrDefault();
+                    //请假开始时间和结束时间
+                    var startTime = Convert.ToDateTime(model.StartTime?.ToString("yyyy-MM-dd") + " 00:00:00");
+                    var endTime = Convert.ToDateTime(model.EndTime?.ToString("yyyy-MM-dd") + " 23:59:59");
+
+                    //排课数据
+                    var arrangeLessonTermList = db.FindList<ArrangeLessonTermEntity>($@"select a.*,b.StuName,b.Grade,b.GenderNo from [dbo].[ArrangeLessonTerm] a
+join stuinfobasic b on a.teachclassno=b.classno
+where b.stuno='{model.CreateUserNo}'
+and a.lessondate between '{startTime}' and '{endTime}'");
+
+                    var deptList = this.BaseRepository("CollegeMIS").FindList<CdDeptEntity>();
+                    var majorList = this.BaseRepository("CollegeMIS").FindList<CdMajorEntity>();
+                    var classInfoList = this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>();
+                    var classRoomList = this.BaseRepository("CollegeMIS").FindList<ClassroomInfoEntity>().ToList();
+                    var lessonSortList = this.BaseRepository("CollegeMIS").FindList<CdLessonSortEntity>().ToList();
+                    foreach (var arrangeLessonTerm in arrangeLessonTermList)
+                    {
+                        StuAttendanceLeaveEntity stuAttendanceLeave = new StuAttendanceLeaveEntity();
+                        stuAttendanceLeave.AcademicYearNo = arrangeLessonTerm.AcademicYearNo;
+                        stuAttendanceLeave.Semester = arrangeLessonTerm.Semester;
+                        stuAttendanceLeave.StuNo = model.CreateUserNo;
+                        stuAttendanceLeave.StuName = arrangeLessonTerm.StuName;
+                        stuAttendanceLeave.Grade = arrangeLessonTerm.Grade;
+                        stuAttendanceLeave.DeptNo = arrangeLessonTerm.DeptNo;
+                        stuAttendanceLeave.DeptName = deptList.Where(x => x.DeptNo == arrangeLessonTerm.DeptNo)
+                            .FirstOrDefault()?.DeptName;
+                        stuAttendanceLeave.MajorNo = arrangeLessonTerm.MajorNo;
+                        stuAttendanceLeave.MajorName = majorList.Where(x => x.MajorNo == arrangeLessonTerm.MajorNo)
+                            .FirstOrDefault()?.MajorName;
+                        stuAttendanceLeave.ClassNo = arrangeLessonTerm.TeachClassNo;
+                        stuAttendanceLeave.ClassName = classInfoList
+                            .Where(x => x.ClassNo == arrangeLessonTerm.TeachClassNo).FirstOrDefault()?.ClassName;
+                        stuAttendanceLeave.LessonNo = arrangeLessonTerm.LessonNo;
+                        stuAttendanceLeave.LessonName = arrangeLessonTerm.LessonName;
+                        stuAttendanceLeave.TeachClassNo = arrangeLessonTerm.TeachClassNo;
+                        stuAttendanceLeave.LessonSortNo = arrangeLessonTerm.LessonSortNo;
+                        stuAttendanceLeave.LessonSortName = lessonSortList.Find(m => m.LessonSortNo == arrangeLessonTerm.LessonSortNo)?.LessonSortName;
+                        stuAttendanceLeave.LessonDate = arrangeLessonTerm.LessonDate;
+                        stuAttendanceLeave.LessonTime = arrangeLessonTerm.LessonTime;
+                        stuAttendanceLeave.LeaveType = model.LeaveType;
+                        stuAttendanceLeave.EmpNo = arrangeLessonTerm.EmpNo;
+                        stuAttendanceLeave.TecRemark = "按天请假";
+                        stuAttendanceLeave.UpdateDate = DateTime.Now;
+                        stuAttendanceLeave.IsCheck = "1";
+                        stuAttendanceLeave.ClassRoomNo = arrangeLessonTerm.ClassroomNo;
+                        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
+                        );
+                        if (isExistModel != null)
+                        {
+                            stuAttendanceLeave.Modify(isExistModel.ID);
+                            db.Update(stuAttendanceLeave);
+                        }
+                        else
+                        {
+                            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.Grade = arrangeLessonTerm.Grade;
+                        stuAttendanceEntity.DeptNo = arrangeLessonTerm.DeptNo;
+                        stuAttendanceEntity.DeptName = deptList.Where(x => x.DeptNo == arrangeLessonTerm.DeptNo)
+                            .FirstOrDefault()?.DeptName;
+                        stuAttendanceEntity.MajorNo = arrangeLessonTerm.MajorNo;
+                        stuAttendanceEntity.MajorName = majorList.Where(x => x.MajorNo == arrangeLessonTerm.MajorNo).FirstOrDefault()?.MajorName;
+                        stuAttendanceEntity.ClassNo = arrangeLessonTerm.TeachClassNo;
+                        stuAttendanceEntity.ClassName = classInfoList
+                            .Where(x => x.ClassNo == arrangeLessonTerm.TeachClassNo).FirstOrDefault()?.ClassName;
+                        stuAttendanceEntity.LessonNo = arrangeLessonTerm.LessonNo;
+                        stuAttendanceEntity.LessonName = arrangeLessonTerm.LessonName;
+                        stuAttendanceEntity.TeachClassNo = arrangeLessonTerm.TeachClassNo;
+                        stuAttendanceEntity.LessonSortNo = arrangeLessonTerm.LessonSortNo;
+                        stuAttendanceEntity.LessonSortName = lessonSortList.Find(m => m.LessonSortNo == arrangeLessonTerm.LessonSortNo)?.LessonSortName;
+                        stuAttendanceEntity.LessonDate = arrangeLessonTerm.LessonDate;
+                        stuAttendanceEntity.PlanWeek = null;
+                        stuAttendanceEntity.LessonTime = arrangeLessonTerm.LessonTime;
+                        stuAttendanceEntity.AttendOrNo = "否";
+                        stuAttendanceEntity.Sort = Convert.ToInt32(model.LeaveType) == 2 ? "病假" : "事假";
+                        stuAttendanceEntity.EmpNo = arrangeLessonTerm.EmpNo;
+                        stuAttendanceEntity.Remark = "按天请假";
+                        stuAttendanceEntity.CheckMarkDept = "";
+                        stuAttendanceEntity.CheckMark = "";
+                        stuAttendanceEntity.InertDate = DateTime.Now;
+                        stuAttendanceEntity.ClassRoomNo = arrangeLessonTerm.ClassroomNo;
+                        stuAttendanceEntity.ClassRoomName = classRoomList.FirstOrDefault(x => x.ClassroomNo == arrangeLessonTerm.ClassroomNo)?.ClassroomName;
+                        //去重
+                        var isExistModel2 = this.BaseRepository("CollegeMIS").FindEntity<StuAttendanceEntity>(x =>
+                        x.AcademicYearNo == stuAttendanceEntity.AcademicYearNo && x.Semester == stuAttendanceEntity.Semester && x.StuNo == stuAttendanceEntity.StuNo &&
+                        x.LessonNo == stuAttendanceEntity.LessonNo && x.TeachClassNo == stuAttendanceEntity.TeachClassNo && x.LessonSortNo == stuAttendanceEntity.LessonSortNo &&
+                        x.LessonDate == stuAttendanceEntity.LessonDate && x.LessonTime == stuAttendanceEntity.LessonTime && x.EmpNo == stuAttendanceEntity.EmpNo && x.ClassRoomNo == stuAttendanceEntity.ClassRoomNo);
+                        if (isExistModel2 != null)
+                        {
+                            stuAttendanceEntity.Modify(isExistModel2.ID);
+                            db.Update(stuAttendanceEntity);
+                        }
+                        else
+                        {
+                            stuAttendanceEntity.Create();
+                            db.Insert(stuAttendanceEntity);
+                        }
+
+                    }
+                }
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }

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

@@ -94,6 +94,7 @@
     <Compile Include="Delegate\NWFDelegateRelationEntity.cs" />
     <Compile Include="Delegate\NWFDelegateRuleEntity.cs" />
     <Compile Include="Delegate\NWFDelegateService.cs" />
+    <Compile Include="NodeMethod\Acc_DormitoryChangeMethod.cs" />
     <Compile Include="NodeMethod\DispatchMethod.cs" />
     <Compile Include="NodeMethod\MeetingManagementApplyMethod.cs" />
     <Compile Include="NodeMethod\StuCancelDisciplineManageMethod.cs" />
@@ -101,7 +102,6 @@
     <Compile Include="NodeMethod\TeacherCancelLeaveManageMethod.cs" />
     <Compile Include="NodeMethod\StuDisciplineManageMethod.cs" />
     <Compile Include="NodeMethod\StuLeaveManagementMethod.cs" />
-    <Compile Include="NodeMethod\Acc_DormitoryChangeMethod.cs" />
     <Compile Include="NodeMethod\TeacherOvertimeManageMethod.cs" />
     <Compile Include="NodeMethod\TeacherLeaveManagementMethod.cs" />
     <Compile Include="NodeMethod\ArrangeLessonTermAttemperMethod.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/StuLeaveManagementMethod.cs

@@ -13,14 +13,17 @@ namespace Learun.Application.WorkFlow
 
         public void Execute(WfMethodParameter parameter)
         {
-            //if (parameter.code == "agree")
-            //{
-            //    stuLeaveManagementIBLL.ChangeStatusByProcessId("2", parameter.processId, parameter.userId);
-            //}
-            //else
-            //{
-            //    stuLeaveManagementIBLL.ChangeStatusByProcessId("3", parameter.processId, parameter.userId);
-            //}
+            if (parameter.code == "agree")
+            {
+                stuLeaveManagementIBLL.ChangeStatusByProcessId("2", parameter.processId, parameter.userId);
+            }
+            else if (parameter.code == "disagree")
+            {
+                stuLeaveManagementIBLL.ChangeStatusByProcessId("3", parameter.processId, parameter.userId);
+            }
+            else {
+                stuLeaveManagementIBLL.ChangeStatusByProcessId("0", parameter.processId, parameter.userId);
+            }
         }
     }
 }