From 17e118e8b834e6cc6c97b5c6272f88393467b04f Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Thu, 11 Mar 2021 17:41:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91=E4=BA=BA?= =?UTF-8?q?=E4=BA=8B=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=95=99=E5=B8=88=E5=8A=A0=E7=8F=AD=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TeacherOvertimeManagementController.cs | 154 ++++++++++++ .../TeacherOvertimeManagement/Form.cshtml | 42 ++++ .../Views/TeacherOvertimeManagement/Form.js | 109 +++++++++ .../TeacherOvertimeManagement/FormView.cshtml | 42 ++++ .../TeacherOvertimeManagement/FormView.js | 109 +++++++++ .../TeacherOvertimeManagement/Index.cshtml | 46 ++++ .../Views/TeacherOvertimeManagement/Index.js | 209 +++++++++++++++++ .../Learun.Application.Web.csproj | 7 + .../XmlConfig/ioc.config | 2 + .../Learun.Application.Mapping.csproj | 1 + .../TeacherOvertimeManagementMap.cs | 29 +++ .../Learun.Application.TwoDevelopment.csproj | 4 + .../TeacherOvertimeManagementBLL.cs | 194 +++++++++++++++ .../TeacherOvertimeManagementEntity.cs | 110 +++++++++ .../TeacherOvertimeManagementIBLL.cs | 66 ++++++ .../TeacherOvertimeManagementService.cs | 222 ++++++++++++++++++ .../Learun.Application.WorkFlow.csproj | 1 + .../NodeMethod/TeacherOvertimeManageMethod.cs | 27 +++ 18 files changed, 1374 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherOvertimeManagementController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/FormView.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/FormView.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/TeacherOvertimeManagementMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementService.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/TeacherOvertimeManageMethod.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherOvertimeManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherOvertimeManagementController.cs new file mode 100644 index 000000000..48b095d08 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherOvertimeManagementController.cs @@ -0,0 +1,154 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Web.Mvc; +using Learun.Application.TwoDevelopment.LR_CodeDemo; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-11 14:24 + /// 描 述：教师加班管理 + /// + public class TeacherOvertimeManagementController : MvcControllerBase + { + private TeacherOvertimeManagementIBLL teacherOvertimeManagementIBLL = new TeacherOvertimeManagementBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + /// + /// 表单页-查看 + /// + /// + [HttpGet] + public ActionResult FormView() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = teacherOvertimeManagementIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var TeacherOvertimeManagementData = teacherOvertimeManagementIBLL.GetTeacherOvertimeManagementEntity(keyValue); + var jsonData = new + { + TeacherOvertimeManagement = TeacherOvertimeManagementData, + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 流程实例主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormDataByProcessId(string processId) + { + var TeacherOvertimeManagementData = teacherOvertimeManagementIBLL.GetEntityByProcessId(processId); + var jsonData = new + { + TeacherOvertimeManagement = TeacherOvertimeManagementData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + teacherOvertimeManagementIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + TeacherOvertimeManagementEntity entity = strEntity.ToObject(); + entity.CheckStatus = "0"; + teacherOvertimeManagementIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + /// + /// 提交实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DoSubmit(string keyValue, string status, string processId) + { + teacherOvertimeManagementIBLL.DoSubmit(keyValue, status, processId); + return Success("提交成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Form.cshtml new file mode 100644 index 000000000..4245a424c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Form.cshtml @@ -0,0 +1,42 @@ +@{ + ViewBag.Title = "教师加班管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+ 教职工加班申请单 +
+
+
姓名
+ +
+
+
填表时间
+ +
+
+
加班类型*
+
+
+
+
时长(小时)*
+ +
+
+
开始时间*
+ +
+
+
结束时间*
+ +
+
+
加班原因
+ +
+
+
是否法定假日
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Form.js new file mode 100644 index 000000000..a1d87c313 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Form.js @@ -0,0 +1,109 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-11 14:24 + * 描 述：教师加班管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +// 设置权限 +var setAuthorize; +// 设置表单数据 +var setFormData; +// 验证数据是否填写完整 +var validForm; +// 保存数据 +var save; +var bootstrap = function ($, learun) { + "use strict"; + // 设置权限 + setAuthorize = function (data) { + if(!!data) + { + for (var field in data) { + if (data[field].isLook != 1) {// 如果没有查看权限就直接移除 + $('#' + data[field].fieldId).parent().remove(); + } + else { + if (data[field].isEdit != 1) { + $('#' + data[field].fieldId).attr('disabled', 'disabled'); + if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) { + $('#' + data[field].fieldId).css({ 'padding-right': '58px' }); + $('#' + data[field].fieldId).find('.btn-success').remove(); + } + } + } + } + } + }; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; + $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName); + $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); + $('#OvertimeType').lrDataItemSelect({ code: 'OvertimeType' }); + $('#IsHoliday').lrDataItemSelect({ code: 'YesOrNoInt' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 设置表单数据 + setFormData = function (processId,param,callback) { + if (!!processId) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/GetFormDataByProcessId?processId=' + processId, function (data) { + for (var id in data) { + if (!!data[id] && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + if(id == 'TeacherOvertimeManagement' && data[id] ){ + keyValue = data[id].Id; + } + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + callback && callback(); } + // 验证数据是否填写完整 + validForm = function () { + if (!$('body').lrValidform()) { + return false; + } + return true; + }; + // 保存数据 + save = function (processId, callBack, i) { + var formData = $('body').lrGetFormData(); + if(!!processId){ + formData.ProcessId =processId; + } + var postData = { + strEntity: JSON.stringify(formData) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(res, i); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/FormView.cshtml new file mode 100644 index 000000000..da03a08da --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/FormView.cshtml @@ -0,0 +1,42 @@ +@{ + ViewBag.Title = "教师加班管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+ 教职工加班申请单 +
+
+
姓名
+ +
+
+
填表时间
+ +
+
+
加班类型*
+
+
+
+
时长(小时)*
+ +
+
+
开始时间*
+ +
+
+
结束时间*
+ +
+
+
加班原因
+ +
+
+
是否法定假日
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/FormView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/FormView.js new file mode 100644 index 000000000..a1d87c313 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/FormView.js @@ -0,0 +1,109 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-11 14:24 + * 描 述：教师加班管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +// 设置权限 +var setAuthorize; +// 设置表单数据 +var setFormData; +// 验证数据是否填写完整 +var validForm; +// 保存数据 +var save; +var bootstrap = function ($, learun) { + "use strict"; + // 设置权限 + setAuthorize = function (data) { + if(!!data) + { + for (var field in data) { + if (data[field].isLook != 1) {// 如果没有查看权限就直接移除 + $('#' + data[field].fieldId).parent().remove(); + } + else { + if (data[field].isEdit != 1) { + $('#' + data[field].fieldId).attr('disabled', 'disabled'); + if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) { + $('#' + data[field].fieldId).css({ 'padding-right': '58px' }); + $('#' + data[field].fieldId).find('.btn-success').remove(); + } + } + } + } + } + }; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; + $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName); + $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); + $('#OvertimeType').lrDataItemSelect({ code: 'OvertimeType' }); + $('#IsHoliday').lrDataItemSelect({ code: 'YesOrNoInt' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 设置表单数据 + setFormData = function (processId,param,callback) { + if (!!processId) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/GetFormDataByProcessId?processId=' + processId, function (data) { + for (var id in data) { + if (!!data[id] && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + if(id == 'TeacherOvertimeManagement' && data[id] ){ + keyValue = data[id].Id; + } + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + callback && callback(); } + // 验证数据是否填写完整 + validForm = function () { + if (!$('body').lrValidform()) { + return false; + } + return true; + }; + // 保存数据 + save = function (processId, callBack, i) { + var formData = $('body').lrGetFormData(); + if(!!processId){ + formData.ProcessId =processId; + } + var postData = { + strEntity: JSON.stringify(formData) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(res, i); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Index.cshtml new file mode 100644 index 000000000..2a2e2e7a3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Index.cshtml @@ -0,0 +1,46 @@ +@{ + /**/ + + ViewBag.Title = "教师加班管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
加班类型
+
+
+
+
姓名
+
+
+
+
+
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +
+
+  查看 +  提交 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Index.js new file mode 100644 index 000000000..12b427626 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherOvertimeManagement/Index.js @@ -0,0 +1,209 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-11 14:24 + * 描 述：教师加班管理 + */ +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); + $('#OvertimeType').lrDataItemSelect({ code: 'OvertimeType' }); + $('#CreateUserId').lrUserSelect(0); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/Form', + width: 1000, + height: 600, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus != "0") { + learun.alert.warning("当前项已提交！"); + return false; + } + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/Form?keyValue=' + keyValue, + width: 1000, + height: 600, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus != "0") { + learun.alert.warning("当前项已提交！"); + return false; + } + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //  查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formview', + title: '查看', + url: top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/FormView?keyValue=' + keyValue, + width: 1000, + height: 600, + btn: null + }); + } + }); + //  提交 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus != "0") { + learun.alert.warning("当前项已提交！"); + return false; + } + learun.layerConfirm('是否确认提交该项！', function (res) { + if (res) { + processId = learun.newGuid(); + learun.postForm(top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/DoSubmit', { keyValue: keyValue, status: "1", processId: processId }, function (res) { + refreshGirdData(res, {}); + }); + } + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/TeacherOvertimeManagement/GetPageList', + headData: [ + { + label: "姓名", name: "CreateUserId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { label: "填表时间", name: "CreateTime", width: 130, align: "left" }, + { + label: "加班类型", name: "OvertimeType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'OvertimeType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "时长(小时)", name: "OvertimeHours", width: 100, align: "left" }, + { label: "开始时间", name: "StartTime", width: 120, align: "left" }, + { label: "结束时间", name: "EndTime", width: 120, align: "left" }, + { label: "加班原因", name: "OvertimeReason", width: 100, align: "left" }, + { + label: "是否法定假日", name: "IsHoliday", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == "1" ? "审核中" : cellvalue == "2" ? "审核通过" : cellvalue == "3" ? "审核未通过" : "草稿"; + } + }, + ], + mainId: 'Id', + isPage: true, + sidx: "CreateTime desc" + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function (res, postData) { + if (!!res) { + if (res.code == 200) { + // 发起流程 + var postData = { + schemeCode: 'TeacherOvertimeManagement',// 填写流程对应模板编号 + processId: processId, + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); + }); + } + page.search(); + } + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index c76ec1442..6a27dfcec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -794,6 +794,7 @@ + @@ -1351,6 +1352,7 @@ + @@ -6137,6 +6139,10 @@ + + + + @@ -6912,6 +6918,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config index 3967d5b1f..0c12e5fad 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config @@ -29,6 +29,7 @@ + @@ -68,6 +69,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index 71070cac0..ed0590d83 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -546,6 +546,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/TeacherOvertimeManagementMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/TeacherOvertimeManagementMap.cs new file mode 100644 index 000000000..595e960ca --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/TeacherOvertimeManagementMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-11 14:24 + /// 描 述：教师加班管理 + /// + public class TeacherOvertimeManagementMap : EntityTypeConfiguration + { + public TeacherOvertimeManagementMap() + { + #region 表、主键 + //表 + this.ToTable("TEACHEROVERTIMEMANAGEMENT"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 7444cb4da..51559c986 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -1605,6 +1605,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementBLL.cs new file mode 100644 index 000000000..a819505d3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementBLL.cs @@ -0,0 +1,194 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-11 14:24 + /// 描 述：教师加班管理 + /// + public class TeacherOvertimeManagementBLL : TeacherOvertimeManagementIBLL + { + private TeacherOvertimeManagementService teacherOvertimeManagementService = new TeacherOvertimeManagementService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return teacherOvertimeManagementService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取TeacherOvertimeManagement表实体数据 + /// + /// 主键 + /// + public TeacherOvertimeManagementEntity GetTeacherOvertimeManagementEntity(string keyValue) + { + try + { + return teacherOvertimeManagementService.GetTeacherOvertimeManagementEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取主表实体数据 + /// + /// 流程实例ID + /// + public TeacherOvertimeManagementEntity GetEntityByProcessId(string processId) + { + try + { + return teacherOvertimeManagementService.GetEntityByProcessId(processId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + teacherOvertimeManagementService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, TeacherOvertimeManagementEntity entity) + { + try + { + teacherOvertimeManagementService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 提交实体数据 + /// + /// 主键 + public void DoSubmit(string keyValue, string status, string processId) + { + try + { + teacherOvertimeManagementService.DoSubmit(keyValue, status, processId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 审核实体数据 + /// + /// 主键 + public void ChangeStatusByProcessId(string status, string processId, string userId) + { + try + { + teacherOvertimeManagementService.ChangeStatusByProcessId(status, processId, userId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementEntity.cs new file mode 100644 index 000000000..a55530d06 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementEntity.cs @@ -0,0 +1,110 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-11 14:24 + /// 描 述：教师加班管理 + /// + public class TeacherOvertimeManagementEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 加班类型 + /// + [Column("OVERTIMETYPE")] + public string OvertimeType { get; set; } + /// + /// 开始时间 + /// + [Column("STARTTIME")] + public DateTime? StartTime { get; set; } + /// + /// 结束时间 + /// + [Column("ENDTIME")] + public DateTime? EndTime { get; set; } + /// + /// 时长(小时) + /// + [Column("OVERTIMEHOURS")] + public string OvertimeHours { get; set; } + /// + /// 加班原因 + /// + [Column("OVERTIMEREASON")] + public string OvertimeReason { get; set; } + /// + /// 是否法定假日 + /// + [Column("ISHOLIDAY")] + public string IsHoliday { get; set; } + /// + /// 申请人 + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// 申请时间 + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// 审核状态 + /// + [Column("CHECKSTATUS")] + public string CheckStatus { get; set; } + /// + /// 审核备注 + /// + [Column("CHECKREMARK")] + public string CheckRemark { get; set; } + /// + /// 审核人 + /// + [Column("CHECKUSERID")] + public string CheckUserId { get; set; } + /// + /// 审核时间 + /// + [Column("CHECKTIME")] + public DateTime? CheckTime { get; set; } + /// + /// 流程Id + /// + [Column("PROCESSID")] + public string ProcessId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementIBLL.cs new file mode 100644 index 000000000..92ba57deb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementIBLL.cs @@ -0,0 +1,66 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-11 14:24 + /// 描 述：教师加班管理 + /// + public interface TeacherOvertimeManagementIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取TeacherOvertimeManagement表实体数据 + /// + /// 主键 + /// + TeacherOvertimeManagementEntity GetTeacherOvertimeManagementEntity(string keyValue); + /// + /// 获取主表实体数据 + /// + /// 流程实例ID + /// + TeacherOvertimeManagementEntity GetEntityByProcessId(string processId); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, TeacherOvertimeManagementEntity entity); + + /// + /// 提交实体数据 + /// + /// 主键 + void DoSubmit(string keyValue, string status, string processId); + /// + /// 审核实体数据 + /// + /// 主键 + void ChangeStatusByProcessId(string status, string processId, string userId); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementService.cs new file mode 100644 index 000000000..25c6acca6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherOvertimeManagement/TeacherOvertimeManagementService.cs @@ -0,0 +1,222 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-11 14:24 + /// 描 述：教师加班管理 + /// + public class TeacherOvertimeManagementService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM TeacherOvertimeManagement t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["OvertimeType"].IsEmpty()) + { + dp.Add("OvertimeType",queryParam["OvertimeType"].ToString(), DbType.String); + strSql.Append(" AND t.OvertimeType = @OvertimeType "); + } + if (!queryParam["CreateUserId"].IsEmpty()) + { + dp.Add("CreateUserId",queryParam["CreateUserId"].ToString(), DbType.String); + strSql.Append(" AND t.CreateUserId = @CreateUserId "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取TeacherOvertimeManagement表实体数据 + /// + /// 主键 + /// + public TeacherOvertimeManagementEntity GetTeacherOvertimeManagementEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取主表实体数据 + /// + /// 流程实例ID + /// + public TeacherOvertimeManagementEntity GetEntityByProcessId(string processId) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(t=>t.ProcessId == processId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t=>t.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, TeacherOvertimeManagementEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 提交实体数据 + /// + /// 主键 + public void DoSubmit(string keyValue, string status, string processId) + { + try + { + this.BaseRepository("CollegeMIS").ExecuteBySql("update TeacherOvertimeManagement set CheckStatus='" + status + "',ProcessId='" + processId + "' where Id='" + keyValue + "' "); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 审核实体数据 + /// + /// 主键 + public void ChangeStatusByProcessId(string status, string processId, string userId) + { + try + { + this.BaseRepository("CollegeMIS").ExecuteBySql("update TeacherOvertimeManagement set CheckStatus='" + status + "',CheckUserId='" + userId + "',CheckTime='" + DateTime.Now + "' where ProcessId='" + processId + "' "); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj index 4d6976b83..bba1808df 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj @@ -94,6 +94,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/TeacherOvertimeManageMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/TeacherOvertimeManageMethod.cs new file mode 100644 index 000000000..715e387fc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/TeacherOvertimeManageMethod.cs @@ -0,0 +1,27 @@ +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Learun.Application.WorkFlow +{ + public class TeacherOvertimeManageMethod : IWorkFlowMethod + { + TeacherOvertimeManagementIBLL teacherOvertimeManagementIBLL = new TeacherOvertimeManagementBLL(); + + + public void Execute(WfMethodParameter parameter) + { + if (parameter.code == "agree") + { + teacherOvertimeManagementIBLL.ChangeStatusByProcessId("2", parameter.processId, parameter.userId); + } + else + { + teacherOvertimeManagementIBLL.ChangeStatusByProcessId("3", parameter.processId, parameter.userId); + } + } + } +}