diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index c201f2961..4c9bf0269 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -26,6 +26,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers private UserIBLL userIbll = new UserBLL(); private UserRelationIBLL userRelationIBLL = new UserRelationBLL(); + private StudentLeaveIBLL studentLeaveIBLL = new StudentLeaveBLL(); #region 视图功能 /// @@ -278,6 +279,25 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers return View(); } + /// + /// 普通教师请假归档 + /// + /// + [HttpGet] + public ActionResult LeaveFiling() + { + return View(); + } + /// + /// 普通教师请假流程监控 + /// + /// + [HttpGet] + public ActionResult LeaveFilingMonitor() + { + return View(); + } + #endregion @@ -342,6 +362,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers }; return Success(jsonData); } + /// /// 获取我的流程信息列表 /// @@ -415,6 +436,28 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers var data = nWFTaskIBLL.GetEntity(taskId); return Success(data); } + + /// + /// 获取普通教师请假归档列表 + /// + /// + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetLeaveList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var list = studentLeaveIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = list, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records, + }; + return Success(jsonData); + } #endregion #region 保存更新删除 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.cshtml new file mode 100644 index 000000000..9a597d6e7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.cshtml @@ -0,0 +1,57 @@ +@{ + ViewBag.Title = "普通教师请假归档"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
+
+
+
姓名
+
+
+
+
所属部门
+
+
+
+
请假类型
+
+
+
+
请假事由
+ +
+
+
+
+ +
+
+
+ +
+
+  查看 +
+
+
+ +
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.js") + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.js new file mode 100644 index 000000000..05ce66076 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.js @@ -0,0 +1,191 @@ +/* + * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2018 上海力软信息技术有限公司 + * 创建人：力软-前端开发组 + * 日 期：2021.05.18 + * 描 述：普通教师请假归档 + */ +var bootstrap = function ($, learun) { + "use strict"; + var categoryId = '1'; + var logbegin = ''; + var logend = ''; + + var page = { + init: function () { + $('#lr_verify').hide(); + page.initGrid(); + page.bind(); + }, + bind: function () { + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + selectfn: function (begin, end) { + logbegin = begin; + logend = end; + page.search(); + } + }); + // 查询 + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#F_CreateUserName').lrUserSelect(1); + $('#F_QJType').lrDataItemSelect({ code: 'LeaveType' }); + $('#F_BuMen').lrselect({ + type: 'tree', + // 展开最大高度 + maxHeight: 200, + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_eye').on('click', function () { + page.eye(); + }); + }, + initleft: function () { + $('#lr_left_list li').on('click', function () { + var $this = $(this); + var $parent = $this.parent(); + $parent.find('.active').removeClass('active'); + $this.addClass('active'); + categoryId = $this.attr('data-value'); + if (categoryId == 3) { + categoryId = 1; + F_EnabledMark = true; + } else { + F_EnabledMark = false; + } + page.search(); + }); + }, + initGrid: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetLeaveList', + headData: [ + { + label: '开始时间', name: 'StartDate', width: 140, align: "left", formatter: function (cellvalue, row) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { + label: '上下午', name: 'F_shangxiawu', width: 60, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'sxw', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '结束时间', name: 'EndDate', width: 140, align: "left", formatter: function (cellvalue, row) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { + label: '上下午', name: 'F_sxw', width: 60, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'sxw', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: '姓名', name: 'F_CreateUserName', width: 80, align: "left", + formatterAsync: function (callback, value, row) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (item) { + callback(item.name); + } + }); + } + }, + { + label: '所属部门', name: 'F_BuMen', width: 120, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { label: '请假天数', name: 'F_tianshu', width: 60, align: "left" }, + { + label: '请假类型', name: 'F_QJType', width: 80, 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: 'F_Description', width: 80, align: "left" }, + ], + mainId: 'SLId', + isPage: true, + sidx: 'F_CreateDate DESC', + dblclick: function () { + page.eye(); + } + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.StartTime = logbegin; + param.EndTime = logend; + param.F_IsFinished = 1; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + }, + eye: function () { + var processId = $('#gridtable').jfGridValue('SLId') || ''; + var title = $('#gridtable').jfGridValue('F_Description'); + + if (learun.checkrow(processId)) { + learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); + } + } + }; + + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs index e5b3ee28f..1c7eff821 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs @@ -105,8 +105,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers { IssueYear = x.Key.IssueYear, IssueMonth = x.Key.IssueMonth, - SpringFestival = x.Select(y => y.SpringFestival.ToDecimal()).Sum().ToString(), - MidAutumnFestival = x.Select(y => y.MidAutumnFestival.ToDecimal()).Sum().ToString() + TotalPayAmount = x.Select(y => y.TotalPayAmount.ToDecimal()).Sum().ToString(), + FinalPayAmount = x.Select(y => y.FinalPayAmount.ToDecimal()).Sum().ToString() }).OrderByDescending(x => x.IssueYear).ThenByDescending(x => x.IssueMonth); return Success(datagroup); @@ -140,9 +140,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers { EMP_PayrollOnceEntity entity = strEntity.ToObject(); emp_PayrollOnceIBLL.SaveEntity(keyValue, entity); - if (string.IsNullOrEmpty(keyValue)) - { - } return Success("保存成功！"); } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml index 32dd2dfd7..a4ae88c9c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml @@ -16,12 +16,16 @@
-
春节福利
- +
应发金额
+
-
中秋节福利
- +
实发金额
+ +
+
+
备注
+
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js index 092aeb3bd..59cb3bc07 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js @@ -91,13 +91,15 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/GetPageList', headData: [ { label: "姓名", name: "SalaryName", width: 100, align: "left" }, - { label: "春节福利", name: "SpringFestival", width: 100, align: "left", statistics: true }, - { label: "中秋节福利", name: "MidAutumnFestival", width: 100, align: "left", statistics: true }, + { label: "应发金额", name: "TotalPayAmount", width: 100, align: "left", statistics: true }, + { label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true }, { label: "发放月份", name: "IssueMonth", width: 100, align: "left" }, { label: "发放年份", name: "IssueYear", width: 100, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, ], mainId: 'SalaryID', - isPage: true + isPage: true, + sidx: 'IssueYear desc,IssueMonth desc' }); page.search(); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js index d08462485..9b926e1a2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js @@ -47,8 +47,8 @@ var bootstrap = function ($, learun) { headData: [ { label: "发放年份", name: "IssueYear", width: 100, align: "left" }, { label: "发放月份", name: "IssueMonth", width: 100, align: "left" }, - { label: "春节福利", name: "SpringFestival", width: 100, align: "left", statistics: true }, - { label: "中秋节福利", name: "MidAutumnFestival", width: 100, align: "left", statistics: true }, + { label: "应发金额", name: "TotalPayAmount", width: 100, align: "left", statistics: true }, + { label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true }, ], mainId: 'SalaryID', isPage: false 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 5e3be2b68..f1e817fd3 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 @@ -1286,6 +1286,7 @@ + @@ -7183,6 +7184,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/StudentLeaveMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/StudentLeaveMap.cs new file mode 100644 index 000000000..0a1233654 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/StudentLeaveMap.cs @@ -0,0 +1,28 @@ +using Learun.Application.TwoDevelopment.LR_LGManager; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-05-18 15:48 + /// 描 述：流程_请假表 + /// + public class StudentLeaveMap : EntityTypeConfiguration + { + public StudentLeaveMap() + { + #region 表、主键 + //表 + this.ToTable("STUDENTLEAVE"); + //主键 + this.HasKey(t => t.SLId); + #endregion + + #region 配置关系 + #endregion + } + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index c6840c796..e85fe4839 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 @@ -138,6 +138,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveBLL.cs new file mode 100644 index 000000000..9866ed17d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveBLL.cs @@ -0,0 +1,148 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_LGManager +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-05-18 15:48 + /// 描 述：流程_请假表 + /// + public class StudentLeaveBLL : StudentLeaveIBLL + { + private StudentLeaveService studentLeaveService = new StudentLeaveService(); + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + return studentLeaveService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return studentLeaveService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public StudentLeaveEntity GetEntity(string keyValue) + { + try + { + return studentLeaveService.GetEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + studentLeaveService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, StudentLeaveEntity entity) + { + try + { + studentLeaveService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveEntity.cs new file mode 100644 index 000000000..bfb815e5e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveEntity.cs @@ -0,0 +1,131 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; +namespace Learun.Application.TwoDevelopment.LR_LGManager + +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-05-18 15:48 + /// 描 述：流程_请假表 + /// + public class StudentLeaveEntity + { + #region 实体成员 + /// + /// SLId + /// + /// + [Column("SLID")] + public string SLId { get; set; } + /// + /// 创建人ID + /// + /// + [Column("F_CREATEUSERID")] + public string F_CreateUserId { get; set; } + /// + /// 创建人 + /// + /// + [Column("F_CREATEUSERNAME")] + public string F_CreateUserName { get; set; } + /// + /// 创建时间 + /// + /// + [Column("F_CREATEDATE")] + public DateTime? F_CreateDate { get; set; } + /// + /// 备注 + /// + /// + [Column("F_DESCRIPTION")] + public string F_Description { get; set; } + /// + /// 开始时间 + /// + /// + [Column("STARTDATE")] + public DateTime? StartDate { get; set; } + /// + /// 结束时间 + /// + /// + [Column("ENDDATE")] + public DateTime? EndDate { get; set; } + /// + /// 请假类型 + /// + /// + [Column("F_QJTYPE")] + public string F_QJType { get; set; } + /// + /// 所属部门 + /// + /// + [Column("F_BUMEN")] + public string F_BuMen { get; set; } + /// + /// 请假天数 + /// + /// + [Column("F_TIANSHU")] + public string F_tianshu { get; set; } + /// + /// 资料上传 + /// + /// + [Column("F_FUJIAN")] + public string F_fujian { get; set; } + /// + /// 上下午（开始时间） + /// + /// + [Column("F_SHANGXIAWU")] + public string F_shangxiawu { get; set; } + /// + /// 上下午（结束时间） + /// + /// + [Column("F_SXW")] + public string F_sxw { get; set; } + /// + /// 当前角色 + /// + /// + [Column("F_DQJS")] + public string F_dqjs { get; set; } + /// + /// LeaveDay + /// + /// + [Column("LEAVEDAY")] + public string LeaveDay { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.SLId = Guid.NewGuid().ToString(); + this.F_CreateDate = DateTime.Now; + UserInfo userInfo = LoginUserInfo.Get(); + this.F_CreateUserId = userInfo.userId; + this.F_CreateUserName = userInfo.realName; + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.SLId = keyValue; + } + #endregion + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveIBLL.cs new file mode 100644 index 000000000..9d2e75337 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveIBLL.cs @@ -0,0 +1,55 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_LGManager +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-05-18 15:48 + /// 描 述：流程_请假表 + /// + public interface StudentLeaveIBLL + { + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取实体数据 + /// + /// 主键 + /// + StudentLeaveEntity GetEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, StudentLeaveEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveService.cs new file mode 100644 index 000000000..a2af86a29 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveService.cs @@ -0,0 +1,238 @@ +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.LR_LGManager +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-05-18 15:48 + /// 描 述：流程_请假表 + /// + public class StudentLeaveService : RepositoryFactory + { + #region 构造函数和属性 + + private string fieldSql; + /// + /// 构造方法 + /// + public StudentLeaveService() + { + fieldSql = @" + t.SLId, + t.F_CreateUserId, + t.F_CreateUserName, + t.F_CreateDate, + t.F_Description, + t.StartDate, + t.EndDate, + t.F_QJType, + t.F_BuMen, + t.F_tianshu, + t.F_fujian, + t.F_shangxiawu, + t.F_sxw, + t.F_dqjs, + t.LeaveDay + "; + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 条件参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + //参考写法 + //var queryParam = queryJson.ToJObject(); + // 虚拟参数 + //var dp = new DynamicParameters(new { }); + //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(fieldSql); + strSql.Append(" FROM StudentLeave t "); + return this.BaseRepository().FindList(strSql.ToString()); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 条件参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM StudentLeave t left join LR_NWF_Process p on t.SLId=p.F_Id where p.F_EnabledMark!=2 and p.F_IsChild=0 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["F_IsFinished"].IsEmpty()) + { + dp.Add("F_IsFinished", queryParam["F_IsFinished"].ToString(), DbType.String); + strSql.Append(" and p.F_IsFinished=@F_IsFinished "); + } + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.F_CreateDate >= @startTime AND t.F_CreateDate <= @endTime ) "); + } + if (!queryParam["F_CreateUserName"].IsEmpty()) + { + var arr = queryParam["F_CreateUserName"].ToString().Split(','); + var arrtemp = ""; + foreach (var item in arr) + { + arrtemp += $"'{item}',"; + } + arrtemp = arrtemp.TrimEnd(','); + strSql.Append($" and t.F_CreateUserName in ({arrtemp}) "); + } + if (!queryParam["F_BuMen"].IsEmpty()) + { + dp.Add("F_BuMen", queryParam["F_BuMen"].ToString(), DbType.String); + strSql.Append(" and t.F_BuMen=@F_BuMen "); + } + if (!queryParam["F_QJType"].IsEmpty()) + { + dp.Add("F_QJType", queryParam["F_QJType"].ToString(), DbType.String); + strSql.Append(" and t.F_QJType=@F_QJType "); + } + if (!queryParam["F_Description"].IsEmpty()) + { + dp.Add("F_Description", "%" + queryParam["F_Description"].ToString() + "%", DbType.String); + strSql.Append(" and t.F_Description like @F_Description "); + } + return this.BaseRepository().FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public StudentLeaveEntity GetEntity(string keyValue) + { + try + { + return this.BaseRepository().FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository().Delete(t => t.SLId == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, StudentLeaveEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository().Update(entity); + } + else + { + entity.Create(); + this.BaseRepository().Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index b1e53a153..174b4e427 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 @@ -273,6 +273,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs index fe1090873..ceebc772c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs @@ -16,35 +16,40 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { #region 实体成员 /// - /// SalaryID + /// 工资编号 /// [Column("SALARYID")] public string SalaryID { get; set; } /// - /// SalaryName + /// 姓名 /// [Column("SALARYNAME")] public string SalaryName { get; set; } /// - /// IssueMonth + /// 发放月份 /// [Column("ISSUEMONTH")] public string IssueMonth { get; set; } /// - /// IssueYear + /// 发放年份 /// [Column("ISSUEYEAR")] public string IssueYear { get; set; } /// - /// SpringFestival + /// 应发金额 /// - [Column("SPRINGFESTIVAL")] - public string SpringFestival { get; set; } + [Column("TOTALPAYAMOUNT")] + public string TotalPayAmount { get; set; } /// - /// MidAutumnFestival + /// 实发金额 /// - [Column("MIDAUTUMNFESTIVAL")] - public string MidAutumnFestival { get; set; } + [Column("FINALPAYAMOUNT")] + public string FinalPayAmount { get; set; } + /// + /// 备注 + /// + [Column("REMARK")] + public string Remark { get; set; } #endregion