Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-04 16:28
+    /// 描 述：公益性岗位
+    /// </summary>
+    public class WelfarePositionController : MvcControllerBase
+    {
+        private WelfarePositionIBLL welfarePositionIBLL = new WelfarePositionBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = welfarePositionIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = welfarePositionIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = welfarePositionIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            welfarePositionIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,WelfarePositionEntity entity)
+        {
+            welfarePositionIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.cshtml

@@ -0,0 +1,139 @@
+@{
+    ViewBag.Title = "公益性岗位";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">序号</div>
+        <input id="No" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">姓名</div>
+        <input id="EmpName" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">身份证号</div>
+        <input id="IdCardNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">工资卡号</div>
+        <input id="WageCardNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">人员类别</div>
+        <input id="PeopleType" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">岗位等级</div>
+        <input id="PostType" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">薪级</div>
+        <input id="PayGrade" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">应发合计</div>
+        <input id="TotalGrossPay" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">岗位工资</div>
+        <input id="PostWage" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">薪级工资</div>
+        <input id="PayGradeWage" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">百分之十</div>
+        <input id="TenPercent" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">艰边津贴</div>
+        <input id="RoughEdgeAllowance" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">女职工卫生费</div>
+        <input id="GirlStaffSanitation" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">教龄津贴</div>
+        <input id="TeachAllowance" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">民族津贴</div>
+        <input id="NationAllowance" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">基础性绩效</div>
+        <input id="BasicsPerformance" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">交通补贴</div>
+        <input id="Transportation" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">物业补贴</div>
+        <input id="RealeState" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">九三年工改补贴</div>
+        <input id="WorkKeep" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">住房补贴</div>
+        <input id="HousingAllowance" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">公积金</div>
+        <input id="ProvidentFundPayment" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">考核工资</div>
+        <input id="AssessmentWages" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">扣款合计</div>
+        <input id="DeductionsCombined" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">(缴纳)公积金</div>
+        <input id="HousingFundAllowance" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">工会工费</div>
+        <input id="LaborUnionWage" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">所得税</div>
+        <input id="PersonalIncomeTax" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">养老保险</div>
+        <input id="EndowmentInsurance" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">医疗保险</div>
+        <input id="MedicalInsurance" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">失业保险</div>
+        <input id="UnemploymentInsurance" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">其他</div>
+        <input id="Other" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">实发合计</div>
+        <input id="NetCombined" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">发放年份</div>
+        <input id="IssueYear" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">发放月份</div>
+        <input id="IssueMonth" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/WelfarePosition/Form.js")

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();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.cshtml

@@ -0,0 +1,44 @@
+@{
+    ViewBag.Title = "公益性岗位";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout">
+   <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">年份</div>
+                                    <div id="IssueYear"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="IssueMonth"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="EmpName" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/WelfarePosition/Index.js")

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();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SignFlowForm.cshtml

@@ -12,8 +12,8 @@
         <div id="auditorId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title">备注<font face="宋体">*</font></div>
-        <textarea id="des" class="form-control" style="height: 200px;" isvalid="yes" checkexpession="NotNull"></textarea>
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="des" class="form-control" style="height: 200px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/SignFlowForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_WorkFlowModule/Views/WfMyTask/SignFlowForm.cshtml

@@ -12,8 +12,8 @@
         <div id="auditorId"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title">备注<font face="宋体">*</font></div>
-        <textarea id="description" class="form-control" style="height: 200px;" isvalid="yes" checkexpession="NotNull"></textarea>
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="description" class="form-control" style="height: 200px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/LR_WorkFlowModule/Views/WfMyTask/SignFlowForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -874,6 +874,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\TE_MaterialPutInController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TE_MaterialOutboundController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ScoreCheckInfoController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\WelfarePositionController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6922,6 +6923,10 @@
     <Content Include="Areas\EducationalAdministration\Views\ScoreCheckInfo\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\ScoreCheckInfo\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ScoreCheckInfo\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\WelfarePosition\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\WelfarePosition\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\WelfarePosition\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\WelfarePosition\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-04 16:28
+    /// 描 述：公益性岗位
+    /// </summary>
+    public class WelfarePositionMap : EntityTypeConfiguration<WelfarePositionEntity>
+    {
+        public WelfarePositionMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("WELFAREPOSITION");
+            //主键
+            this.HasKey(t => t.GYID);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

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

@@ -632,6 +632,7 @@
     <Compile Include="EducationalAdministration\TE_MaterialPutInMap.cs" />
     <Compile Include="EducationalAdministration\TE_MaterialOutboundMap.cs" />
     <Compile Include="EducationalAdministration\ScoreCheckInfoMap.cs" />
+    <Compile Include="EducationalAdministration\WelfarePositionMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-04 16:28
+    /// 描 述：公益性岗位
+    /// </summary>
+    public class WelfarePositionBLL : WelfarePositionIBLL
+    {
+        private WelfarePositionService welfarePositionService = new WelfarePositionService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<WelfarePositionEntity> GetList( string queryJson )
+        {
+            try
+            {
+                return welfarePositionService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<WelfarePositionEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return welfarePositionService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        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 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                welfarePositionService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        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
+
+    }
+}

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
+
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-04 16:28
+    /// 描 述：公益性岗位
+    /// </summary>
+    public class WelfarePositionEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// GYID
+        /// </summary>
+        /// <returns></returns>
+        [Column("GYID")]
+        public string GYID { get; set; }
+        /// <summary>
+        /// 序号
+        /// </summary>
+        /// <returns></returns>
+        [Column("NO")]
+        public string No { get; set; }
+        /// <summary>
+        /// EmpName
+        /// </summary>
+        /// <returns></returns>
+        [Column("EMPNAME")]
+        public string EmpName { get; set; }
+        /// <summary>
+        /// IdCardNo
+        /// </summary>
+        /// <returns></returns>
+        [Column("IDCARDNO")]
+        public string IdCardNo { get; set; }
+        /// <summary>
+        /// 工资卡号
+        /// </summary>
+        /// <returns></returns>
+        [Column("WAGECARDNO")]
+        public string WageCardNo { get; set; }
+        /// <summary>
+        /// 人员类别
+        /// </summary>
+        /// <returns></returns>
+        [Column("PEOPLETYPE")]
+        public string PeopleType { get; set; }
+        /// <summary>
+        /// 岗位等级
+        /// </summary>
+        /// <returns></returns>
+        [Column("POSTTYPE")]
+        public string PostType { get; set; }
+        /// <summary>
+        /// 薪级
+        /// </summary>
+        /// <returns></returns>
+        [Column("PAYGRADE")]
+        public string PayGrade { get; set; }
+        /// <summary>
+        /// 应发合计
+        /// </summary>
+        /// <returns></returns>
+        [Column("TOTALGROSSPAY")]
+        public string TotalGrossPay { get; set; }
+        /// <summary>
+        /// 岗位工资
+        /// </summary>
+        /// <returns></returns>
+        [Column("POSTWAGE")]
+        public decimal? PostWage { get; set; }
+        /// <summary>
+        /// 薪级工资
+        /// </summary>
+        /// <returns></returns>
+        [Column("PAYGRADEWAGE")]
+        public decimal? PayGradeWage { get; set; }
+        /// <summary>
+        /// 百分之十
+        /// </summary>
+        /// <returns></returns>
+        [Column("TENPERCENT")]
+        public decimal? TenPercent { get; set; }
+        /// <summary>
+        /// 艰边津贴
+        /// </summary>
+        /// <returns></returns>
+        [Column("ROUGHEDGEALLOWANCE")]
+        public decimal? RoughEdgeAllowance { get; set; }
+        /// <summary>
+        /// 女职工卫生费
+        /// </summary>
+        /// <returns></returns>
+        [Column("GIRLSTAFFSANITATION")]
+        public decimal? GirlStaffSanitation { get; set; }
+        /// <summary>
+        /// 教龄津贴
+        /// </summary>
+        /// <returns></returns>
+        [Column("TEACHALLOWANCE")]
+        public decimal? TeachAllowance { get; set; }
+        /// <summary>
+        /// 民族津贴
+        /// </summary>
+        /// <returns></returns>
+        [Column("NATIONALLOWANCE")]
+        public decimal? NationAllowance { get; set; }
+        /// <summary>
+        /// 基础性绩效
+        /// </summary>
+        /// <returns></returns>
+        [Column("BASICSPERFORMANCE")]
+        public decimal? BasicsPerformance { get; set; }
+        /// <summary>
+        /// 交通补贴
+        /// </summary>
+        /// <returns></returns>
+        [Column("TRANSPORTATION")]
+        public decimal? Transportation { get; set; }
+        /// <summary>
+        /// 物业补贴
+        /// </summary>
+        /// <returns></returns>
+        [Column("REALESTATE")]
+        public decimal? RealeState { get; set; }
+        /// <summary>
+        /// 九三年工改补贴
+        /// </summary>
+        /// <returns></returns>
+        [Column("WORKKEEP")]
+        public decimal? WorkKeep { get; set; }
+        /// <summary>
+        /// 住房补贴
+        /// </summary>
+        /// <returns></returns>
+        [Column("HOUSINGALLOWANCE")]
+        public decimal? HousingAllowance { get; set; }
+        /// <summary>
+        /// 公积金
+        /// </summary>
+        /// <returns></returns>
+        [Column("PROVIDENTFUNDPAYMENT")]
+        public decimal? ProvidentFundPayment { get; set; }
+        /// <summary>
+        /// 考核工资
+        /// </summary>
+        /// <returns></returns>
+        [Column("ASSESSMENTWAGES")]
+        public string AssessmentWages { get; set; }
+        /// <summary>
+        /// 扣款合计
+        /// </summary>
+        /// <returns></returns>
+        [Column("DEDUCTIONSCOMBINED")]
+        public string DeductionsCombined { get; set; }
+        /// <summary>
+        /// (缴纳)公积金
+        /// </summary>
+        /// <returns></returns>
+        [Column("HOUSINGFUNDALLOWANCE")]
+        public decimal? HousingFundAllowance { get; set; }
+        /// <summary>
+        /// 工会工费
+        /// </summary>
+        /// <returns></returns>
+        [Column("LABORUNIONWAGE")]
+        public decimal? LaborUnionWage { get; set; }
+        /// <summary>
+        /// 所得税
+        /// </summary>
+        /// <returns></returns>
+        [Column("PERSONALINCOMETAX")]
+        public decimal? PersonalIncomeTax { get; set; }
+        /// <summary>
+        /// 养老保险
+        /// </summary>
+        /// <returns></returns>
+        [Column("ENDOWMENTINSURANCE")]
+        public decimal? EndowmentInsurance { get; set; }
+        /// <summary>
+        /// 医疗保险
+        /// </summary>
+        /// <returns></returns>
+        [Column("MEDICALINSURANCE")]
+        public decimal? MedicalInsurance { get; set; }
+        /// <summary>
+        /// 失业保险
+        /// </summary>
+        /// <returns></returns>
+        [Column("UNEMPLOYMENTINSURANCE")]
+        public decimal? UnemploymentInsurance { get; set; }
+        /// <summary>
+        /// 其他
+        /// </summary>
+        /// <returns></returns>
+        [Column("OTHER")]
+        public decimal? Other { get; set; }
+        /// <summary>
+        /// 实发合计
+        /// </summary>
+        /// <returns></returns>
+        [Column("NETCOMBINED")]
+        public decimal? NetCombined { get; set; }
+        /// <summary>
+        /// 月
+        /// </summary>
+        /// <returns></returns>
+        [Column("ISSUEMONTH")]
+        public string IssueMonth { get; set; }
+        /// <summary>
+        /// 年
+        /// </summary>
+        /// <returns></returns>
+        [Column("ISSUEYEAR")]
+        public DateTime? IssueYear { get; set; }
+        /// <summary>
+        /// CreateUser
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATEUSER")]
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// UpdateUser
+        /// </summary>
+        /// <returns></returns>
+        [Column("UPDATEUSER")]
+        public string UpdateUser { get; set; }
+        /// <summary>
+        /// UpdateTime
+        /// </summary>
+        /// <returns></returns>
+        [Column("UPDATETIME")]
+        public DateTime? UpdateTime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.GYID = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.GYID = keyValue;
+        }
+        #endregion
+    }
+}
+

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-04 16:28
+    /// 描 述：公益性岗位
+    /// </summary>
+    public interface WelfarePositionIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<WelfarePositionEntity> GetList( string queryJson );
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<WelfarePositionEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        WelfarePositionEntity GetEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, WelfarePositionEntity entity);
+        #endregion
+
+    }
+}

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-04 16:28
+    /// 描 述：公益性岗位
+    /// </summary>
+    public class WelfarePositionService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<WelfarePositionEntity> 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<WelfarePositionEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<WelfarePositionEntity> 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<WelfarePositionEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public WelfarePositionEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<WelfarePositionEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<WelfarePositionEntity>(t => t.GYID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// </summary>
+        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
+
+    }
+}

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

@@ -1951,6 +1951,10 @@
     <Compile Include="EducationalAdministration\ScoreCheckInfo\ScoreCheckInfoService.cs" />
     <Compile Include="EducationalAdministration\ScoreCheckInfo\ScoreCheckInfoBLL.cs" />
     <Compile Include="EducationalAdministration\ScoreCheckInfo\ScoreCheckInfoIBLL.cs" />
+    <Compile Include="EducationalAdministration\WelfarePosition\WelfarePositionEntity.cs" />
+    <Compile Include="EducationalAdministration\WelfarePosition\WelfarePositionService.cs" />
+    <Compile Include="EducationalAdministration\WelfarePosition\WelfarePositionIBLL.cs" />
+    <Compile Include="EducationalAdministration\WelfarePosition\WelfarePositionBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">