From ce23be3321e4f78cdf714eb7649f0f908f7461ef Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 4 Nov 2022 14:14:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8A=A0=E7=AD=BE?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=BF=85=E5=A1=AB=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_NewWorkFlow/Views/NWFProcess/SignFlowForm.cshtml | 4 ++-- .../LR_WorkFlowModule/Views/WfMyTask/SignFlowForm.cshtml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignFlowForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignFlowForm.cshtml index 5e22f4fd9..2c7092442 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignFlowForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignFlowForm.cshtml @@ -12,8 +12,8 @@
-
备注*
- +
备注
+
@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/SignFlowForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/SignFlowForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/SignFlowForm.cshtml index 4144abb8c..97ab15b09 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/SignFlowForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/SignFlowForm.cshtml @@ -12,8 +12,8 @@
-
备注*
- +
备注
+
@Html.AppendJsFile("/Areas/LR_WorkFlowModule/Views/WfMyTask/SignFlowForm.js") From fbd58888a7ac39bbcc8d491df8580749899158e4 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 4 Nov 2022 17:48:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E6=9D=A1-=E5=85=AC?= =?UTF-8?q?=E7=9B=8A=E6=80=A7=E5=B2=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/WelfarePositionController.cs | 121 ++++++++ .../Views/WelfarePosition/Form.cshtml | 139 +++++++++ .../Views/WelfarePosition/Form.js | 38 +++ .../Views/WelfarePosition/Index.cshtml | 44 +++ .../Views/WelfarePosition/Index.js | 129 +++++++++ .../Learun.Application.Web.csproj | 5 + .../WelfarePositionMap.cs | 29 ++ .../Learun.Application.Mapping.csproj | 1 + .../WelfarePosition/WelfarePositionBLL.cs | 148 ++++++++++ .../WelfarePosition/WelfarePositionEntity.cs | 266 ++++++++++++++++++ .../WelfarePosition/WelfarePositionIBLL.cs | 55 ++++ .../WelfarePosition/WelfarePositionService.cs | 189 +++++++++++++ .../Learun.Application.TwoDevelopment.csproj | 4 + 13 files changed, 1168 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WelfarePositionController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/WelfarePositionMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WelfarePositionController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WelfarePositionController.cs new file mode 100644 index 000000000..04f306ced --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WelfarePositionController.cs @@ -0,0 +1,121 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using Learun.Util; +using System.Data; +using System.Web.Mvc; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-11-04 16:28 + /// 描 述：公益性岗位 + /// + public class WelfarePositionController : MvcControllerBase + { + private WelfarePositionIBLL welfarePositionIBLL = new WelfarePositionBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList( string queryJson ) + { + var data = welfarePositionIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = welfarePositionIBLL.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 data = welfarePositionIBLL.GetEntity(keyValue); + return Success(data); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + welfarePositionIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue,WelfarePositionEntity entity) + { + welfarePositionIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.cshtml new file mode 100644 index 000000000..ab99bdcb2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.cshtml @@ -0,0 +1,139 @@ +@{ + ViewBag.Title = "公益性岗位"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
序号
+ +
+
+
姓名
+ +
+
+
身份证号
+ +
+
+
工资卡号
+ +
+
+
人员类别
+ +
+
+
岗位等级
+ +
+
+
薪级
+ +
+
+
应发合计
+ +
+
+
岗位工资
+ +
+
+
薪级工资
+ +
+
+
百分之十
+ +
+
+
艰边津贴
+ +
+
+
女职工卫生费
+ +
+
+
教龄津贴
+ +
+
+
民族津贴
+ +
+
+
基础性绩效
+ +
+
+
交通补贴
+ +
+
+
物业补贴
+ +
+
+
九三年工改补贴
+ +
+
+
住房补贴
+ +
+
+
公积金
+ +
+
+
考核工资
+ +
+
+
扣款合计
+ +
+
+
(缴纳)公积金
+ +
+
+
工会工费
+ +
+
+
所得税
+ +
+
+
养老保险
+ +
+
+
医疗保险
+ +
+
+
失业保险
+ +
+
+
其他
+ +
+
+
实发合计
+ +
+
+
发放年份
+ +
+
+
发放月份
+ +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/WelfarePosition/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.js new file mode 100644 index 000000000..6b5a8416d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.js @@ -0,0 +1,38 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-11-04 16:28 + * 描 述：公益性岗位 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var selectedRow = learun.frameTab.currentIframe().selectedRow; + var page = { + init: function () { + page.initData(); + }, + bind: function () { + }, + initData: function () { + if (!!selectedRow) { + $('#form').lrSetFormData(selectedRow); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('#form').lrValidform()) { + return false; + } + var postData = $('#form').lrGetFormData(); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/WelfarePosition/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.cshtml new file mode 100644 index 000000000..13fffa9c6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.cshtml @@ -0,0 +1,44 @@ +@{ + ViewBag.Title = "公益性岗位"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
年份
+
+
+
+
月份
+
+
+
+
姓名
+ +
+
+
+
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/WelfarePosition/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.js new file mode 100644 index 000000000..33b23bcca --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.js @@ -0,0 +1,129 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-11-04 16:28 + * 描 述：公益性岗位 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + //年份 + $('#IssueYear').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', + value: 'value', + text: 'text' + }); + $('#IssueMonth').lrDataItemSelect({ code: 'MPMonth' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + selectedRow = null; + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/WelfarePosition/Form', + width: 800, + height: 800, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('GYID'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/WelfarePosition/Form?keyValue=' + keyValue, + width: 800, + height: 800, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('GYID'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/WelfarePosition/DeleteForm', { keyValue: keyValue }, function () { + }); + } + }); + } + }); + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/WelfarePosition/GetPageList', + headData: [ + { label: '序号', name: 'No', width: 100, align: "left" }, + { label: '姓名', name: 'EmpName', width: 100, align: "left" }, + { label: '身份证', name: 'IdCardNo', width: 150, align: "left" }, + { label: '工资卡号', name: 'WageCardNo', width: 135, align: "left" }, + { label: '人员类别', name: 'PeopleType', width: 100, align: "left" }, + { label: '岗位等级', name: 'PostType', width: 100, align: "left" }, + { label: '薪级', name: 'PayGrade', width: 100, align: "left" }, + { label: '应发合计', name: 'TotalGrossPay', width: 80, align: "left", statistics: true }, + { label: '岗位工资', name: 'PostWage', width: 80, align: "left", statistics: true }, + { label: '薪级工资', name: 'PayGradeWage', width: 80, align: "left", statistics: true }, + { label: '百分之十', name: 'TenPercent', width: 80, align: "left", statistics: true }, + { label: '艰边津贴', name: 'RoughEdgeAllowance', width: 80, align: "left", statistics: true }, + { label: '女职工卫生费', name: 'GirlStaffSanitation', width: 80, align: "left", statistics: true }, + { label: '教龄津贴', name: 'TeachAllowance', width: 80, align: "left", statistics: true }, + { label: '民族津贴', name: 'NationAllowance', width: 80, align: "left", statistics: true }, + { label: '基础性绩效', name: 'BasicsPerformance', width: 80, align: "left", statistics: true }, + { label: '交通补贴', name: 'Transportation', width: 80, align: "left", statistics: true }, + { label: '物业补贴', name: 'RealeState', width: 80, align: "left", statistics: true }, + { label: '九三年工改补贴', name: 'WorkKeep', width: 80, align: "left", statistics: true }, + { label: '住房补贴', name: 'HousingAllowance', width: 80, align: "left", statistics: true }, + { label: '公积金', name: 'ProvidentFundPayment', width: 80, align: "left", statistics: true }, + { label: '考核工资', name: 'AssessmentWages', width: 100, align: "left", statistics: true }, + { label: '扣款合计', name: 'DeductionsCombined', width: 100, align: "left", statistics: true }, + { label: '(缴纳)公积金', name: 'HousingFundAllowance', width: 100, align: "left", statistics: true }, + { label: '工会工费', name: 'LaborUnionWage', width: 100, align: "left", statistics: true }, + { label: '所得税', name: 'PersonalIncomeTax', width: 100, align: "left", statistics: true }, + { label: '养老保险', name: 'EndowmentInsurance', width: 100, align: "left", statistics: true }, + { label: '医疗保险', name: 'MedicalInsurance', width: 100, align: "left", statistics: true }, + { label: '失业保险', name: 'UnemploymentInsurance', width: 100, align: "left", statistics: true }, + { label: '其他', name: 'Other', width: 100, align: "left", statistics: true }, + { label: '实发合计', name: 'NetCombined', width: 100, align: "left", statistics: true }, + { label: "发放月份", name: "IssueMonth", width: 100, align: "left" }, + { label: "发放年份", name: "IssueYear", width: 100, align: "left" }, + ], + mainId: 'GYID', + isPage: true, + sidx: 'CreateTime' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 4f4db9329..5aa37328f 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 @@ -873,6 +873,7 @@ + @@ -6915,6 +6916,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/WelfarePositionMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/WelfarePositionMap.cs new file mode 100644 index 000000000..234c2c95f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/WelfarePositionMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-11-04 16:28 + /// 描 述：公益性岗位 + /// + public class WelfarePositionMap : EntityTypeConfiguration + { + public WelfarePositionMap() + { + #region 表、主键 + //表 + this.ToTable("WELFAREPOSITION"); + //主键 + this.HasKey(t => t.GYID); + #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 b1063e1b3..e0ca37dbf 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 @@ -631,6 +631,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionBLL.cs new file mode 100644 index 000000000..09e9cfe47 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionBLL.cs @@ -0,0 +1,148 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-11-04 16:28 + /// 描 述：公益性岗位 + /// + public class WelfarePositionBLL : WelfarePositionIBLL + { + private WelfarePositionService welfarePositionService = new WelfarePositionService(); + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList( string queryJson ) + { + try + { + return welfarePositionService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return welfarePositionService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public WelfarePositionEntity GetEntity(string keyValue) + { + try + { + return welfarePositionService.GetEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + welfarePositionService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, WelfarePositionEntity entity) + { + try + { + welfarePositionService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionEntity.cs new file mode 100644 index 000000000..0c988549f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionEntity.cs @@ -0,0 +1,266 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; +namespace Learun.Application.TwoDevelopment.EducationalAdministration + +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-11-04 16:28 + /// 描 述：公益性岗位 + /// + public class WelfarePositionEntity + { + #region 实体成员 + /// + /// GYID + /// + /// + [Column("GYID")] + public string GYID { get; set; } + /// + /// 序号 + /// + /// + [Column("NO")] + public string No { get; set; } + /// + /// EmpName + /// + /// + [Column("EMPNAME")] + public string EmpName { get; set; } + /// + /// IdCardNo + /// + /// + [Column("IDCARDNO")] + public string IdCardNo { get; set; } + /// + /// 工资卡号 + /// + /// + [Column("WAGECARDNO")] + public string WageCardNo { get; set; } + /// + /// 人员类别 + /// + /// + [Column("PEOPLETYPE")] + public string PeopleType { get; set; } + /// + /// 岗位等级 + /// + /// + [Column("POSTTYPE")] + public string PostType { get; set; } + /// + /// 薪级 + /// + /// + [Column("PAYGRADE")] + public string PayGrade { get; set; } + /// + /// 应发合计 + /// + /// + [Column("TOTALGROSSPAY")] + public string TotalGrossPay { get; set; } + /// + /// 岗位工资 + /// + /// + [Column("POSTWAGE")] + public decimal? PostWage { get; set; } + /// + /// 薪级工资 + /// + /// + [Column("PAYGRADEWAGE")] + public decimal? PayGradeWage { get; set; } + /// + /// 百分之十 + /// + /// + [Column("TENPERCENT")] + public decimal? TenPercent { get; set; } + /// + /// 艰边津贴 + /// + /// + [Column("ROUGHEDGEALLOWANCE")] + public decimal? RoughEdgeAllowance { get; set; } + /// + /// 女职工卫生费 + /// + /// + [Column("GIRLSTAFFSANITATION")] + public decimal? GirlStaffSanitation { get; set; } + /// + /// 教龄津贴 + /// + /// + [Column("TEACHALLOWANCE")] + public decimal? TeachAllowance { get; set; } + /// + /// 民族津贴 + /// + /// + [Column("NATIONALLOWANCE")] + public decimal? NationAllowance { get; set; } + /// + /// 基础性绩效 + /// + /// + [Column("BASICSPERFORMANCE")] + public decimal? BasicsPerformance { get; set; } + /// + /// 交通补贴 + /// + /// + [Column("TRANSPORTATION")] + public decimal? Transportation { get; set; } + /// + /// 物业补贴 + /// + /// + [Column("REALESTATE")] + public decimal? RealeState { get; set; } + /// + /// 九三年工改补贴 + /// + /// + [Column("WORKKEEP")] + public decimal? WorkKeep { get; set; } + /// + /// 住房补贴 + /// + /// + [Column("HOUSINGALLOWANCE")] + public decimal? HousingAllowance { get; set; } + /// + /// 公积金 + /// + /// + [Column("PROVIDENTFUNDPAYMENT")] + public decimal? ProvidentFundPayment { get; set; } + /// + /// 考核工资 + /// + /// + [Column("ASSESSMENTWAGES")] + public string AssessmentWages { get; set; } + /// + /// 扣款合计 + /// + /// + [Column("DEDUCTIONSCOMBINED")] + public string DeductionsCombined { get; set; } + /// + /// (缴纳)公积金 + /// + /// + [Column("HOUSINGFUNDALLOWANCE")] + public decimal? HousingFundAllowance { get; set; } + /// + /// 工会工费 + /// + /// + [Column("LABORUNIONWAGE")] + public decimal? LaborUnionWage { get; set; } + /// + /// 所得税 + /// + /// + [Column("PERSONALINCOMETAX")] + public decimal? PersonalIncomeTax { get; set; } + /// + /// 养老保险 + /// + /// + [Column("ENDOWMENTINSURANCE")] + public decimal? EndowmentInsurance { get; set; } + /// + /// 医疗保险 + /// + /// + [Column("MEDICALINSURANCE")] + public decimal? MedicalInsurance { get; set; } + /// + /// 失业保险 + /// + /// + [Column("UNEMPLOYMENTINSURANCE")] + public decimal? UnemploymentInsurance { get; set; } + /// + /// 其他 + /// + /// + [Column("OTHER")] + public decimal? Other { get; set; } + /// + /// 实发合计 + /// + /// + [Column("NETCOMBINED")] + public decimal? NetCombined { get; set; } + /// + /// 月 + /// + /// + [Column("ISSUEMONTH")] + public string IssueMonth { get; set; } + /// + /// 年 + /// + /// + [Column("ISSUEYEAR")] + public DateTime? IssueYear { get; set; } + /// + /// CreateUser + /// + /// + [Column("CREATEUSER")] + public string CreateUser { get; set; } + /// + /// CreateTime + /// + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// UpdateUser + /// + /// + [Column("UPDATEUSER")] + public string UpdateUser { get; set; } + /// + /// UpdateTime + /// + /// + [Column("UPDATETIME")] + public DateTime? UpdateTime { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.GYID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.GYID = keyValue; + } + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionIBLL.cs new file mode 100644 index 000000000..5a9007551 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionIBLL.cs @@ -0,0 +1,55 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-11-04 16:28 + /// 描 述：公益性岗位 + /// + public interface WelfarePositionIBLL + { + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList( string queryJson ); + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取实体数据 + /// + /// 主键 + /// + WelfarePositionEntity GetEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, WelfarePositionEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs new file mode 100644 index 000000000..4f015f13d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionService.cs @@ -0,0 +1,189 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-11-04 16:28 + /// 描 述：公益性岗位 + /// + public class WelfarePositionService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 条件参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + ////参考写法 + //var queryParam = queryJson.ToJObject(); + //// 虚拟参数 + //var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* FROM WelfarePosition t "); + return this.BaseRepository("CollegeMIS").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.* FROM WelfarePosition t where 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var userInfo = LoginUserInfo.Get(); + if (userInfo.Description != "管理员") + { + strSql.Append(" AND t.IdCardNo = " + userInfo.IdentityCardNo + " "); + } + if (!queryParam["EmpName"].IsEmpty()) + { + dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String); + strSql.Append(" AND t.EmpName like @EmpName "); + } + if (!queryParam["IssueMonth"].IsEmpty()) + { + dp.Add("IssueMonth", queryParam["IssueMonth"].ToString(), DbType.String); + strSql.Append(" AND t.IssueMonth = IssueMonth "); + } + if (!queryParam["IssueYear"].IsEmpty()) + { + dp.Add("IssueYear", queryParam["IssueYear"].ToString(), DbType.String); + strSql.Append(" AND t.IssueYear = IssueYear "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public WelfarePositionEntity GetEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").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("CollegeMIS").Delete(t => t.GYID == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, WelfarePositionEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 685fa64e5..3896acfa3 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 @@ -1947,6 +1947,10 @@ + + + +