From e7a5aa78f36b761b61a0fa5e603a68999a3fed27 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 28 Feb 2023 14:28:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=92=8C=E4=B8=AA=E4=BA=BA=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/SalaryInfoController.cs | 128 ++++++++++ .../Views/SalaryInfo/Form.cshtml | 143 ++++++++++++ .../Views/SalaryInfo/Form.js | 50 ++++ .../Views/SalaryInfo/Index.cshtml | 53 +++++ .../Views/SalaryInfo/Index.js | 157 +++++++++++++ .../Views/SalaryInfo/IndexPersonal.cshtml | 39 ++++ .../Views/SalaryInfo/IndexPersonal.js | 157 +++++++++++++ .../Learun.Application.Web.csproj | 7 + .../Learun.Application.Mapping.csproj | 1 + .../ReceiveSendFeeManagement/SalaryInfoMap.cs | 29 +++ .../Learun.Application.TwoDevelopment.csproj | 4 + .../SalaryInfo/SalaryInfoBLL.cs | 125 ++++++++++ .../SalaryInfo/SalaryInfoEntity.cs | 219 ++++++++++++++++++ .../SalaryInfo/SalaryInfoIBLL.cs | 48 ++++ .../SalaryInfo/SalaryInfoService.cs | 174 ++++++++++++++ 15 files changed, 1334 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/SalaryInfoController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/SalaryInfoMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/SalaryInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/SalaryInfoController.cs new file mode 100644 index 000000000..9a9ef91f7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/SalaryInfoController.cs @@ -0,0 +1,128 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2023-02-27 15:25 + /// 描 述：工资条 + /// + public class SalaryInfoController : MvcControllerBase + { + private SalaryInfoIBLL salaryInfoIBLL = new SalaryInfoBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + /// + /// 个人工资条 + /// + /// + [HttpGet] + public ActionResult IndexPersonal() + { + return View(); + } + + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = salaryInfoIBLL.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 SalaryInfoData = salaryInfoIBLL.GetSalaryInfoEntity(keyValue); + var jsonData = new + { + SalaryInfo = SalaryInfoData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + salaryInfoIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + SalaryInfoEntity entity = strEntity.ToObject(); + salaryInfoIBLL.SaveEntity(keyValue, entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.cshtml new file mode 100644 index 000000000..2f3087000 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.cshtml @@ -0,0 +1,143 @@ +@{ + ViewBag.Title = "工资条"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
年度*
+ +
+
+
月份*
+ +
+
+
姓名*
+ +
+
+
身份证号*
+ +
+
+
工资类别*
+ +
+
+
岗位工资*
+ +
+
+
薪级工资*
+ +
+
+
高定工资*
+ +
+
+
基础绩效*
+ +
+
+
保留地区补贴@*及保留额*@*
+ +
+
+
奖励性绩效*
+ +
+
+
艰苦边远@*地区*@津贴*
+ +
+
+
南疆工作补贴*
+ +
+
+
教护龄津贴*
+ +
+
+
核增绩效工资*
+ +
+
+
班主任补贴*
+ +
+
+
补发基本工资*
+ +
+
+
补发津补贴*
+ +
+
+
补发绩效工资*
+ +
+
+
补发其它津补@*贴*@*
+ +
+
+
补发其它工资*
+ +
+
+
基础绩效奖*
+ +
+
+
补发奖励@*性*@绩效*
+ +
+
+
应发工资*
+ +
+
+
个人所得税*
+ +
+
+
预扣保险年金*
+ +
+
+
住房公积金*
+ +
+
+
养老保险*
+ +
+
+
医疗保险*
+ +
+
+
职业年金*
+ +
+
+
失业保险金*
+ +
+
+
大额医疗互助*
+ +
+
+
扣发工资*
+ +
+
+
实发工资*
+ +
+
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.js new file mode 100644 index 000000000..2cc95bbc5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.js @@ -0,0 +1,50 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-02-27 15:25 + * 描 述：工资条 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/ReceiveSendFeeManagement/SalaryInfo/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]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/SalaryInfo/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.cshtml new file mode 100644 index 000000000..dd16c194d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.cshtml @@ -0,0 +1,53 @@ +@{ + ViewBag.Title = "工资条"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
部门
+
+
+
+
年度
+
+
+
+
月份
+
+
+
+
职工编号
+ +
+
+
姓名
+ +
+
+
+
+
+
+
+ +
+
+ @* 新增*@ +  编辑 +  删除 +  打印 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js new file mode 100644 index 000000000..046f06abc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js @@ -0,0 +1,157 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-02-27 15:25 + * 描 述：工资条 + */ +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); + + //年度 + $('#YearNo').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GenerateNearByYear', + value: 'value', + text: 'text' + }); + //月份 + $('#MonthNo').lrDataItemSelect({ code: 'MonthInt' }); + // 部门选择 + $('#F_DepartmentId').lrselect({ + type: 'tree', + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', + // 访问数据接口参数 + }); + + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/ReceiveSendFeeManagement/SalaryInfo/Form', + width: 900, + height: 800, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/ReceiveSendFeeManagement/SalaryInfo/Form?keyValue=' + keyValue, + width: 950, + height: 700, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/SalaryInfo/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/ReceiveSendFeeManagement/SalaryInfo/GetPageList', + headData: [{ + label: "部门", name: "F_DepartmentId", width: 100, 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: "YearNo", width: 100, align: "left" }, + { label: "月份", name: "MonthNo", width: 100, align: "left" }, + { label: "职工编号", name: "EmpNo", width: 100, align: "left" }, + { label: "姓名", name: "EmpName", width: 100, align: "left" }, + { label: "身份证号", name: "IdCard", width: 150, align: "left" }, + { label: "工资类别", name: "SalaryType", width: 100, align: "left" }, + { label: "岗位工资", name: "GangWeiGZ", width: 100, align: "left" }, + { label: "薪级工资", name: "XinJiGZ", width: 100, align: "left" }, + { label: "高定工资", name: "GaoDingGZ", width: 100, align: "left" }, + { label: "按比例核定的基础性绩效工资", name: "JiChuJiXiaoGZ", width: 100, align: "left" }, + { label: "保留地区补贴及保留额", name: "BaoLiuBuTie", width: 100, align: "left" }, + { label: "奖励性绩效", name: "JiangLiJX", width: 100, align: "left" }, + { label: "艰苦边远地区津贴", name: "JianKuJT", width: 100, align: "left" }, + { label: "南疆工作补贴", name: "NanJiangBT", width: 100, align: "left" }, + { label: "教护龄津贴", name: "JiaoHuLingJT", width: 100, align: "left" }, + { label: "核增绩效工资", name: "HeZengJX", width: 100, align: "left" }, + { label: "班主任补贴", name: "BanZhuRenBT", width: 100, align: "left" }, + { label: "补发基本工资", name: "BuFaGZ", width: 100, align: "left" }, + { label: "补发津补贴", name: "BuFaJT", width: 100, align: "left" }, + { label: "补发绩效工资", name: "BuFaJX", width: 100, align: "left" }, + { label: "补发其它津补贴", name: "BuFaQTJT", width: 100, align: "left" }, + { label: "补发其它工资", name: "BuFaQTGZ", width: 100, align: "left" }, + { label: "基础绩效奖", name: "JiChuJX", width: 100, align: "left" }, + { label: "补发奖励性绩效", name: "BuFaJiangLiJX", width: 100, align: "left" }, + { label: "应发工资", name: "YingFaGZ", width: 100, align: "left" }, + { label: "个人所得税", name: "GeRenSDS", width: 100, align: "left" }, + { label: "预扣保险及年金", name: "YuKouBXNJ", width: 100, align: "left" }, + { label: "住房公积金", name: "ZhuFangGJJ", width: 100, align: "left" }, + { label: "养老保险", name: "YangLaoBX", width: 100, align: "left" }, + { label: "医疗保险", name: "YiLiaoBX", width: 100, align: "left" }, + { label: "职业年金", name: "ZhiYeNJ", width: 100, align: "left" }, + { label: "失业保险金", name: "ShiYeBXJ", width: 100, align: "left" }, + { label: "大额医疗互助", name: "YiLiao", width: 100, align: "left" }, + { label: "扣发工资", name: "KouFaGZ", width: 100, align: "left" }, + { label: "实发工资", name: "ShiFaGZ", width: 100, align: "left" }, + ], + mainId: 'Id', + isPage: true + }); + 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/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.cshtml new file mode 100644 index 000000000..572cc8853 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "个人工资条"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
部门
+
+
+
+
年度
+
+
+
+
月份
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js new file mode 100644 index 000000000..570d6ab80 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js @@ -0,0 +1,157 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-02-27 15:25 + * 描 述：工资条 + */ +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); + + //年度 + $('#YearNo').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GenerateNearByYear', + value: 'value', + text: 'text' + }); + //月份 + $('#MonthNo').lrDataItemSelect({ code: 'MonthInt' }); + // 部门选择 + $('#F_DepartmentId').lrselect({ + type: 'tree', + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', + // 访问数据接口参数 + }); + + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/ReceiveSendFeeManagement/SalaryInfo/Form', + width: 900, + height: 800, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/ReceiveSendFeeManagement/SalaryInfo/Form?keyValue=' + keyValue, + width: 950, + height: 700, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/SalaryInfo/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/ReceiveSendFeeManagement/SalaryInfo/GetPageList', + headData: [{ + label: "部门", name: "F_DepartmentId", width: 100, 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: "YearNo", width: 100, align: "left" }, + { label: "月份", name: "MonthNo", width: 100, align: "left" }, + { label: "职工编号", name: "EmpNo", width: 100, align: "left" }, + { label: "姓名", name: "EmpName", width: 100, align: "left" }, + { label: "身份证号", name: "IdCard", width: 150, align: "left" }, + { label: "工资类别", name: "SalaryType", width: 100, align: "left" }, + { label: "岗位工资", name: "GangWeiGZ", width: 100, align: "left" }, + { label: "薪级工资", name: "XinJiGZ", width: 100, align: "left" }, + { label: "高定工资", name: "GaoDingGZ", width: 100, align: "left" }, + { label: "按比例核定的基础性绩效工资", name: "JiChuJiXiaoGZ", width: 100, align: "left" }, + { label: "保留地区补贴及保留额", name: "BaoLiuBuTie", width: 100, align: "left" }, + { label: "奖励性绩效", name: "JiangLiJX", width: 100, align: "left" }, + { label: "艰苦边远地区津贴", name: "JianKuJT", width: 100, align: "left" }, + { label: "南疆工作补贴", name: "NanJiangBT", width: 100, align: "left" }, + { label: "教护龄津贴", name: "JiaoHuLingJT", width: 100, align: "left" }, + { label: "核增绩效工资", name: "HeZengJX", width: 100, align: "left" }, + { label: "班主任补贴", name: "BanZhuRenBT", width: 100, align: "left" }, + { label: "补发基本工资", name: "BuFaGZ", width: 100, align: "left" }, + { label: "补发津补贴", name: "BuFaJT", width: 100, align: "left" }, + { label: "补发绩效工资", name: "BuFaJX", width: 100, align: "left" }, + { label: "补发其它津补贴", name: "BuFaQTJT", width: 100, align: "left" }, + { label: "补发其它工资", name: "BuFaQTGZ", width: 100, align: "left" }, + { label: "基础绩效奖", name: "JiChuJX", width: 100, align: "left" }, + { label: "补发奖励性绩效", name: "BuFaJiangLiJX", width: 100, align: "left" }, + { label: "应发工资", name: "YingFaGZ", width: 100, align: "left" }, + { label: "个人所得税", name: "GeRenSDS", width: 100, align: "left" }, + { label: "预扣保险及年金", name: "YuKouBXNJ", width: 100, align: "left" }, + { label: "住房公积金", name: "ZhuFangGJJ", width: 100, align: "left" }, + { label: "养老保险", name: "YangLaoBX", width: 100, align: "left" }, + { label: "医疗保险", name: "YiLiaoBX", width: 100, align: "left" }, + { label: "职业年金", name: "ZhiYeNJ", width: 100, align: "left" }, + { label: "失业保险金", name: "ShiYeBXJ", width: 100, align: "left" }, + { label: "大额医疗互助", name: "YiLiao", width: 100, align: "left" }, + { label: "扣发工资", name: "KouFaGZ", width: 100, align: "left" }, + { label: "实发工资", name: "ShiFaGZ", width: 100, align: "left" }, + ], + mainId: 'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.SqlParameter = " and e.EmpNo='" + learun.clientdata.get(['userinfo']).account + "'" + $('#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 a23ffb3b4..1d9b1ec47 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 @@ -852,6 +852,7 @@ + @@ -1640,6 +1641,7 @@ + @@ -6655,6 +6657,10 @@ + + + + @@ -8009,6 +8015,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 04ea0f95c..ea1e27f16 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 @@ -606,6 +606,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/SalaryInfoMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/SalaryInfoMap.cs new file mode 100644 index 000000000..812102006 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/ReceiveSendFeeManagement/SalaryInfoMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2023-02-27 15:25 + /// 描 述：工资条 + /// + public class SalaryInfoMap : EntityTypeConfiguration + { + public SalaryInfoMap() + { + #region 表、主键 + //表 + this.ToTable("SALARYINFO"); + //主键 + 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 7b40667e2..280eb35ff 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 @@ -1851,6 +1851,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoBLL.cs new file mode 100644 index 000000000..43039f63d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2023-02-27 15:25 + /// 描 述：工资条 + /// + public class SalaryInfoBLL : SalaryInfoIBLL + { + private SalaryInfoService salaryInfoService = new SalaryInfoService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return salaryInfoService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取SalaryInfo表实体数据 + /// + /// 主键 + /// + public SalaryInfoEntity GetSalaryInfoEntity(string keyValue) + { + try + { + return salaryInfoService.GetSalaryInfoEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + salaryInfoService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, SalaryInfoEntity entity) + { + try + { + salaryInfoService.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/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoEntity.cs new file mode 100644 index 000000000..4003cb52d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoEntity.cs @@ -0,0 +1,219 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2023-02-27 15:25 + /// 描 述：工资条 + /// + public class SalaryInfoEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 年度 + /// + [Column("YEARNO")] + public string YearNo { get; set; } + /// + /// 月份 + /// + [Column("MONTHNO")] + public int? MonthNo { get; set; } + /// + /// 姓名 + /// + [Column("EMPNAME")] + public string EmpName { get; set; } + /// + /// 身份证号 + /// + [Column("IDCARD")] + public string IdCard { get; set; } + /// + /// 工资类别 + /// + [Column("SALARYTYPE")] + public string SalaryType { get; set; } + /// + /// 岗位工资 + /// + [Column("GANGWEIGZ")] + public decimal? GangWeiGZ { get; set; } + /// + /// 薪级工资 + /// + [Column("XINJIGZ")] + public decimal? XinJiGZ { get; set; } + /// + /// 高定工资 + /// + [Column("GAODINGGZ")] + public decimal? GaoDingGZ { get; set; } + /// + /// 按比例核定的基础性绩效工资 + /// + [Column("JICHUJIXIAOGZ")] + public decimal? JiChuJiXiaoGZ { get; set; } + /// + /// 保留地区补贴及保留额 + /// + [Column("BAOLIUBUTIE")] + public decimal? BaoLiuBuTie { get; set; } + /// + /// 奖励性绩效 + /// + [Column("JIANGLIJX")] + public decimal? JiangLiJX { get; set; } + /// + /// 艰苦边远地区津贴 + /// + [Column("JIANKUJT")] + public decimal? JianKuJT { get; set; } + /// + /// 南疆工作补贴 + /// + [Column("NANJIANGBT")] + public decimal? NanJiangBT { get; set; } + /// + /// 教护龄津贴 + /// + [Column("JIAOHULINGJT")] + public decimal? JiaoHuLingJT { get; set; } + /// + /// 核增绩效工资 + /// + [Column("HEZENGJX")] + public decimal? HeZengJX { get; set; } + /// + /// 班主任补贴 + /// + [Column("BANZHURENBT")] + public decimal? BanZhuRenBT { get; set; } + /// + /// 补发基本工资 + /// + [Column("BUFAGZ")] + public decimal? BuFaGZ { get; set; } + /// + /// 补发津补贴 + /// + [Column("BUFAJT")] + public decimal? BuFaJT { get; set; } + /// + /// 补发绩效工资 + /// + [Column("BUFAJX")] + public decimal? BuFaJX { get; set; } + /// + /// 补发其它津补贴 + /// + [Column("BUFAQTJT")] + public decimal? BuFaQTJT { get; set; } + /// + /// 补发其它工资 + /// + [Column("BUFAQTGZ")] + public decimal? BuFaQTGZ { get; set; } + /// + /// 基础绩效奖 + /// + [Column("JICHUJX")] + public decimal? JiChuJX { get; set; } + /// + /// 补发奖励性绩效 + /// + [Column("BUFAJIANGLIJX")] + public decimal? BuFaJiangLiJX { get; set; } + /// + /// 应发工资 + /// + [Column("YINGFAGZ")] + public decimal? YingFaGZ { get; set; } + /// + /// 个人所得税 + /// + [Column("GERENSDS")] + public decimal? GeRenSDS { get; set; } + /// + /// 预扣保险及年金 + /// + [Column("YUKOUBXNJ")] + public decimal? YuKouBXNJ { get; set; } + /// + /// 住房公积金 + /// + [Column("ZHUFANGGJJ")] + public decimal? ZhuFangGJJ { get; set; } + /// + /// 养老保险 + /// + [Column("YANGLAOBX")] + public decimal? YangLaoBX { get; set; } + /// + /// 医疗保险 + /// + [Column("YILIAOBX")] + public decimal? YiLiaoBX { get; set; } + /// + /// 职业年金 + /// + [Column("ZHIYENJ")] + public decimal? ZhiYeNJ { get; set; } + /// + /// 失业保险金 + /// + [Column("SHIYEBXJ")] + public decimal? ShiYeBXJ { get; set; } + /// + /// 大额医疗互助 + /// + [Column("YILIAO")] + public decimal? YiLiao { get; set; } + /// + /// 扣发工资 + /// + [Column("KOUFAGZ")] + public decimal? KouFaGZ { get; set; } + /// + /// 实发工资 + /// + [Column("SHIFAGZ")] + public decimal? ShiFaGZ { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + } + #endregion + #region 扩展字段 + [NotMapped] + public string F_DepartmentId { get; set; } + [NotMapped] + public string EmpNo { get; set; } + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoIBLL.cs new file mode 100644 index 000000000..79ccc034b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2023-02-27 15:25 + /// 描 述：工资条 + /// + public interface SalaryInfoIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取SalaryInfo表实体数据 + /// + /// 主键 + /// + SalaryInfoEntity GetSalaryInfoEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, SalaryInfoEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoService.cs new file mode 100644 index 000000000..b4a8c4411 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoService.cs @@ -0,0 +1,174 @@ +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.ReceiveSendFeeManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2023-02-27 15:25 + /// 描 述：工资条 + /// + public class SalaryInfoService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.*,e.F_DepartmentId,e.EmpNo + "); + strSql.Append(" FROM SalaryInfo t "); + strSql.Append(" left join empinfo e on t.IdCard=e.IdentityCardNo "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["YearNo"].IsEmpty()) + { + dp.Add("YearNo",queryParam["YearNo"].ToString(), DbType.String); + strSql.Append(" AND t.YearNo = @YearNo "); + } + if (!queryParam["MonthNo"].IsEmpty()) + { + dp.Add("MonthNo", queryParam["MonthNo"].ToString(), DbType.String); + strSql.Append(" AND t.MonthNo = @MonthNo "); + } + if (!queryParam["EmpNo"].IsEmpty()) + { + dp.Add("EmpNo", "%" + queryParam["EmpNo"].ToString() + "%", DbType.String); + strSql.Append(" AND e.EmpNo Like @EmpNo "); + } + if (!queryParam["F_DepartmentId"].IsEmpty()) + { + dp.Add("F_DepartmentId", queryParam["F_DepartmentId"].ToString(), DbType.String); + strSql.Append(" AND e.F_DepartmentId = @F_DepartmentId "); + } + if (!queryParam["EmpName"].IsEmpty()) + { + dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String); + strSql.Append(" AND t.EmpName Like @EmpName "); + } + if (!queryParam["SqlParameter"].IsEmpty()) + { + strSql.Append(queryParam["SqlParameter"].ToString()); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取SalaryInfo表实体数据 + /// + /// 主键 + /// + public SalaryInfoEntity GetSalaryInfoEntity(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.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, SalaryInfoEntity 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 + + } +} From 0d856c68cf0ac8fdfeaa373901199109c08ff574 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 28 Feb 2023 15:04:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E7=9C=8B=E6=89=80=E6=9C=89=E5=BC=82=E5=8A=A8?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E3=80=82=E8=A1=A5=E8=80=83=E7=AD=89=E4=B8=8D?= =?UTF-8?q?=E7=9C=8B=E9=80=80=E5=AD=A6=E7=AD=89=E5=AD=A6=E7=94=9F=E3=80=82?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=97=A7=E5=BC=82=E5=8A=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?AbmormityMoveMark=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=96=B0=E5=BC=82?= =?UTF-8?q?=E5=8A=A8=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/IndexOfDC.js | 2 +- .../Views/StuInfoBasic/MyClass.js | 1 - .../Views/StuInfoGraduate/Form.cshtml | 2 +- .../Views/StuInfoGraduate/Index.js | 2 +- .../Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs | 4 ++-- .../Exam_ExamStudent/Exam_ExamStudentService.cs | 2 +- .../StuInfoBasic/StuInfoBasicEntity.cs | 2 +- .../StuInfoBasic/StuInfoBasicService.cs | 9 +++++---- .../StuInfoBasicChange/StuInfoBasicChangeService.cs | 4 ++-- .../StuInfoGraduate/StuInfoGraduateEntity.cs | 2 +- .../StuScore/StuScoreService.cs | 2 +- .../StuScoreNotPass/StuScoreNotPassService.cs | 2 +- .../StuScoreNotPassTwo/StuScoreNotPassTwoService.cs | 6 +++--- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js index 177bc229d..d13e3e263 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js @@ -670,7 +670,7 @@ var bootstrap = function ($, learun) { //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, //{ label: "余额", name: "Balance", width: 100, align: "left" }, { - label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center", + label: "异动状态", name: "MoveStatus", width: 80, align: "center", formatter: function (cellvalue) { return cellvalue == "1" ? "" : ""; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js index 4c016b0ec..8782fbbc1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js @@ -415,7 +415,6 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.AbmormityMoveMark = 1; param.ClassNo = ClassNo; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Form.cshtml index 87373faff..9c23ab4bf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Form.cshtml @@ -181,7 +181,7 @@
异动标志*
- +
奖励标志*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js index 47e23c1fa..cbd91f214 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js @@ -126,7 +126,7 @@ var bootstrap = function ($, learun) { { label: "余额", name: "Balance", width: 100, align: "left" }, { label: "通信地址", name: "MailAddress", width: 100, align: "left" }, { - label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center", + label: "异动状态", name: "MoveStatus", width: 80, align: "center", formatter: function (cellvalue) { return cellvalue == "1" ? "" : ""; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs index 75cab56f9..37f74e960 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs @@ -343,7 +343,7 @@ from StuScore a left join StuInfoBasic b on b.StuNo=a.StuNo join (select l.lessonno,l.LessonTypeId,lt.ltorder from Exam_ExamLesson l left join CdLessonType lt on l.LessonTypeId=lt.ltid where l.elenabled=1 and l.AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and l.Semester='{exam_ExamPlan.Semester}' ) t on a.lessonno=t.lessonno --left join (select l.lessonno,l.LessonTypeId,lt.ltorder from lessoninfo l left join CdLessonType lt on l.LessonTypeId=lt.ltid ) t on a.lessonno=t.lessonno where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) - and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) + and (b.ChangeStatus<>'1' or len(b.ChangeStatus)=0 or b.ChangeStatus is null) and AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and Semester='{exam_ExamPlan.Semester}' and a.LessonNo not in (select LessonNo from Exam_ExamPlanLesson where EPId='{EPId}') group by t.ltorder,a.LessonNo,a.lessonname,t.LessonTypeId,b.Grade"; @@ -358,7 +358,7 @@ and AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and Semester='{exam_ExamPlan join (select l.lessonno,l.LessonTypeId,lt.ltorder from Exam_ExamLesson l left join CdLessonType lt on l.LessonTypeId=lt.ltid where l.elenabled=1 and l.AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and l.Semester='{exam_ExamPlan.Semester}' ) t on a.lessonno=t.lessonno --left join (select l.lessonno,l.LessonTypeId,lt.ltorder from lessoninfo l left join CdLessonType lt on l.LessonTypeId=lt.ltid ) t on a.lessonno=t.lessonno where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) - and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) + and (b.ChangeStatus<>'1' or len(b.ChangeStatus)=0 or b.ChangeStatus is null) and AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and Semester='{exam_ExamPlan.Semester}' and LessonNo not in (select LessonNo from Exam_ExamPlanLesson where EPId='{EPId}') group by t.ltorder,a.LessonNo,a.lessonname,t.LessonTypeId,b.Grade "; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs index bad441961..260972259 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs @@ -379,7 +379,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration strSql.Append(@" a left join StuInfoBasic b on b.StuNo=a.StuNo where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); strSql.Append(" and a.AcademicYearNo ='" + AcademicYearNo + "' and a.Semester ='" + Semester + "' "); - strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); + strSql.Append(" and (b.ChangeStatus<>'1' or len(b.ChangeStatus)=0 or b.ChangeStatus is null) "); strSql.Append($@" and a.stuno not in (select stuno from Exam_ExamStudent where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ESType='{ESType}' union select StuNo from StuInfoBasicChange where StuChangeType in ('04','05','06') and CheckStatus='1' ) "); strSql.Append(" group by a.stuno,a.stuname,a.classno,b.Grade"); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index 98d763cff..9eea289d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -267,7 +267,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("INSCHOOLTELEPHONE")] public string InSchoolTelephone { get; set; } /// - /// 当前异动类别 + /// 当前异动类别【旧异动字段，暂不使用】 /// [Column("ABMORMITYMOVEMARK")] public string AbmormityMoveMark { get; set; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index 3eada3670..998a66bdc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -88,10 +88,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Remark", "%" + queryParam["Remark"].ToString() + "%", DbType.String); strSql.Append(" AND t.Remark Like @Remark "); } - if (!queryParam["AbmormityMoveMark"].IsEmpty()) - { - strSql.Append(" AND t.stuno not in(select stuno from StuInfoBasicChange where StuChangeType in('04','05','06') and checkstatus=1) "); - } + //旧 + //if (!queryParam["AbmormityMoveMark"].IsEmpty()) + //{ + // strSql.Append(" AND t.stuno not in(select stuno from StuInfoBasicChange where StuChangeType in('04','05','06') and checkstatus=1) "); + //} return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs index c592dc5ae..642c80ee2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs @@ -162,7 +162,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.NewDeptNo}',MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}',MoveType ='{entity.StuChangeType}',MoveStatus='1' where StuNo='{entity.StuNo}' "); } } - else if (entity.StuChangeType == "04" || entity.StuChangeType == "05") //退学、休学 + else if (entity.StuChangeType == "04" || entity.StuChangeType == "05" || entity.StuChangeType == "06") //退学、休学、转校 { //改信息；不显示成绩； db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1,MoveType ='{entity.StuChangeType}',MoveStatus='1' where StuNo='{entity.StuNo}' "); @@ -213,7 +213,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}',MoveType =null,MoveStatus=null where StuNo='{entity.StuNo}' "); } } - else if (entity.StuChangeType == "04" || entity.StuChangeType == "05") //退学、休学 + else if (entity.StuChangeType == "04" || entity.StuChangeType == "05" || entity.StuChangeType == "06") //退学、休学、转校 { //改信息；显示成绩； db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null,MoveType =null,MoveStatus=null where StuNo='{entity.StuNo}' "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs index a2c02cada..9bfb316d9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs @@ -279,7 +279,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("INSCHOOLTELEPHONE")] public string InSchoolTelephone { get; set; } /// - /// 异动标志 + /// 异动标志【旧异动字段，暂不使用】 /// /// [Column("ABMORMITYMOVEMARK")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index 4187dde83..9a9f740ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -1422,7 +1422,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad strSql.Append(" ,case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end as ScoreFormat "); strSql.Append(" from ( "); strSql.Append($" select s.AcademicYearNo,s.Semester,s.ClassNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); - strSql.Append(" where 1=1 and s.LessonSortNo='1' "); + strSql.Append(" where 1=1 and s.LessonSortNo='1' and s.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus =1) "); if (!queryParam["AcademicYearNo"].IsEmpty()) { dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs index 2b9824fe5..141793201 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs @@ -461,7 +461,7 @@ and (b.EduSystem is null or b.EduSystem != '6') "); select a.* from StuScore a left join StuInfoBasic b on b.StuNo=a.StuNo -where a.LessonSortNo='1' and (b.AbmormityMoveMark is null or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark <> '1') +where a.LessonSortNo='1' and (b.ChangeStatus is null or len(b.ChangeStatus)=0 or b.ChangeStatus <> '1') and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) and a.StuNo not in ( select StuNo from StuScoreNotPass p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs index c2866e581..e169d4d00 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs @@ -406,8 +406,8 @@ else CONVERT(varchar,a.Score) end as Score2 "); { strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); } - - strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); + //旧 + //strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); } catch (Exception ex) @@ -512,7 +512,7 @@ else CONVERT(varchar,a.Score) end as Score2 "); select a.* from StuScoreNotPass a left join StuInfoBasic b on b.StuNo=a.StuNo -where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1' +where a.LessonSortNo='1' and (b.ChangeStatus is null or len(b.ChangeStatus)=0 or b.ChangeStatus <> '1') and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) and a.StuNo not in ( select StuNo from StuScoreNotPassTwo p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo