合并包含文件

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Acc_DormitoryChange/FormView.cshtml

@@ -0,0 +1,47 @@
+@{
+    ViewBag.Title = "宿舍调换申请";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">宿舍楼<font face="宋体">*</font></div>
+        <div id="HisDormitory" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新宿舍楼<font face="宋体">*</font></div>
+        <div id="Dormitory" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">单元<font face="宋体">*</font></div>
+        <div id="HisUnit" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新单元<font face="宋体">*</font></div>
+        <div id="Unit" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">楼层<font face="宋体">*</font></div>
+        <div id="HisFloor" isvalid="yes" checkexpession="NotNull"readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新楼层<font face="宋体">*</font></div>
+        <div id="Floor" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">宿舍<font face="宋体">*</font></div>
+        <div id="HisRId" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新宿舍<font face="宋体">*</font></div>
+        <div id="RId" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">原因<font face="宋体">*</font></div>
+        <textarea id="Reason" class="form-control" style="height:50px;" isvalid="yes" checkexpession="NotNull" readonly></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;" readonly></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Acc_DormitoryChange/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Acc_DormitoryChange/FormView.js

@@ -0,0 +1,191 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-07-11 14:34
+ * 描  述：宿舍调换申请
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#HisDormitory').lrDataSourceSelect({
+                code: 'Acc_DormitoryData', value: 'id', text: 'name', select: function (item) {
+                    if (item) {
+                        $('#HisUnit').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_UnitData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#HisUnit').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#HisFloor').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_FloorData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#HisFloor').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#HisRId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_RoomData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+
+            $('#HisRId').lrselect({
+                text: 'name',
+                value: 'id',
+                allowSearch: true
+            })
+            $('#Dormitory').lrDataSourceSelect({
+                code: 'Acc_DormitoryData', value: 'id', text: 'name', select: function (item) {
+                    if (item) {
+                        $('#Unit').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_UnitData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#Unit').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#Floor').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_FloorData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#Floor').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#RId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_RoomData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+
+            $('#RId').lrselect({
+                text: 'name',
+                value: 'id',
+                allowSearch: true
+            })
+
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Acc_DormitoryChange' && data[id]) {
+                            keyValue = data[id].ID;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        //判断是否是学生
+        var IdentityName = learun.clientdata.get(['userinfo']).Description;
+        if (IdentityName != "学生") {
+            learun.alert.warning("当前提交者非学生!!!");
+            return false;
+        }
+        var formData = $('#form').lrGetFormData();
+        if (!!processId) {
+            formData.ProcessId = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}

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

@@ -31,7 +31,7 @@
                                     <div id="Province"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">报考专业</div>
+                                    <div class="lr-form-item-title">第一志愿</div>
                                     <div id="MajorNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.js

@@ -221,7 +221,33 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "报考专业", name: "MajorNo", width: 100, align: "left",
+                        label: "第一志愿", name: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "第二志愿", name: "MajorNo2", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "第三志愿", name: "MajorNo3", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',

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" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }

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

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

@@ -181,7 +181,7 @@
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">异动标志<font face="宋体">*</font></div>
-        <input id="AbmormityMoveMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="MoveStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">奖励标志<font face="宋体">*</font></div>

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" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.cshtml

@@ -8,7 +8,7 @@
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入标题" />
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入关键字查询" />
                     </div>
                     <div class="lr-layout-tool-item">
                         <div id='IsRead' class="form-control"></div>

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-02-27 15:25
+    /// 描 述：工资条
+    /// </summary>
+    public class SalaryInfoController : MvcControllerBase
+    {
+        private SalaryInfoIBLL salaryInfoIBLL = new SalaryInfoBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 个人工资条
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexPersonal()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region 获取数据
+
+        /// <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 = salaryInfoIBLL.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 SalaryInfoData = salaryInfoIBLL.GetSalaryInfoEntity(keyValue);
+            var jsonData = new
+            {
+                SalaryInfo = SalaryInfoData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            salaryInfoIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            SalaryInfoEntity entity = strEntity.ToObject<SalaryInfoEntity>();
+            salaryInfoIBLL.SaveEntity(keyValue, entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.cshtml

@@ -0,0 +1,143 @@
+@{
+    ViewBag.Title = "工资条";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">年度<font face="宋体">*</font></div>
+        <input id="YearNo" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">月份<font face="宋体">*</font></div>
+        <input id="MonthNo" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="EmpName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
+        <input id="IdCard" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">工资类别<font face="宋体">*</font></div>
+        <input id="SalaryType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">岗位工资<font face="宋体">*</font></div>
+        <input id="GangWeiGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">薪级工资<font face="宋体">*</font></div>
+        <input id="XinJiGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">高定工资<font face="宋体">*</font></div>
+        <input id="GaoDingGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">基础绩效<font face="宋体">*</font></div>
+        <input id="JiChuJiXiaoGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SalaryInfo">
+        <div class="lr-form-item-title">保留地区补贴@*及保留额*@<font face="宋体">*</font></div>
+        <input id="BaoLiuBuTie" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">奖励性绩效<font face="宋体">*</font></div>
+        <input id="JiangLiJX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SalaryInfo">
+        <div class="lr-form-item-title">艰苦边远@*地区*@津贴<font face="宋体">*</font></div>
+        <input id="JianKuJT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">南疆工作补贴<font face="宋体">*</font></div>
+        <input id="NanJiangBT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">教护龄津贴<font face="宋体">*</font></div>
+        <input id="JiaoHuLingJT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">核增绩效工资<font face="宋体">*</font></div>
+        <input id="HeZengJX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">班主任补贴<font face="宋体">*</font></div>
+        <input id="BanZhuRenBT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">补发基本工资<font face="宋体">*</font></div>
+        <input id="BuFaGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">补发津补贴<font face="宋体">*</font></div>
+        <input id="BuFaJT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">补发绩效工资<font face="宋体">*</font></div>
+        <input id="BuFaJX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">补发其它津补@*贴*@<font face="宋体">*</font></div>
+        <input id="BuFaQTJT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">补发其它工资<font face="宋体">*</font></div>
+        <input id="BuFaQTGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">基础绩效奖<font face="宋体">*</font></div>
+        <input id="JiChuJX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">补发奖励@*性*@绩效<font face="宋体">*</font></div>
+        <input id="BuFaJiangLiJX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">应发工资<font face="宋体">*</font></div>
+        <input id="YingFaGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">个人所得税<font face="宋体">*</font></div>
+        <input id="GeRenSDS" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">预扣保险年金<font face="宋体">*</font></div>
+        <input id="YuKouBXNJ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">住房公积金<font face="宋体">*</font></div>
+        <input id="ZhuFangGJJ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">养老保险<font face="宋体">*</font></div>
+        <input id="YangLaoBX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">医疗保险<font face="宋体">*</font></div>
+        <input id="YiLiaoBX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">职业年金<font face="宋体">*</font></div>
+        <input id="ZhiYeNJ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">失业保险金<font face="宋体">*</font></div>
+        <input id="ShiYeBXJ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">大额医疗互助<font face="宋体">*</font></div>
+        <input id="YiLiao" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">扣发工资<font face="宋体">*</font></div>
+        <input id="KouFaGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">实发工资<font face="宋体">*</font></div>
+        <input id="ShiFaGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.js")

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.cshtml

@@ -0,0 +1,53 @@
+@{
+    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="F_DepartmentId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">年度</div>
+                                    <div id="YearNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MonthNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">职工编号</div>
+                                    <input id="EmpNo" 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>
+                        </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>
+                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js")

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.cshtml

@@ -0,0 +1,39 @@
+@{
+    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="F_DepartmentId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">年度</div>
+                                    <div id="YearNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="MonthNo"></div>
+                                </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>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js")

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

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

@@ -876,6 +876,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuSubsidizeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuSubsidizeTypeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuEnrollOfficialController.cs" />
+    <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\SalaryInfoController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -986,6 +987,7 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_UserChangeInfo\Index.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\FormProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\IndexProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\IndexForStudent.js" />
@@ -1665,6 +1667,7 @@
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Index.js" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\IndexPersonal.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\AnswerIndex.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\AnswerQuery.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\Form.js" />
@@ -6680,6 +6683,10 @@
     <Content Include="Areas\EducationalAdministration\Views\StuEnrollOfficial\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnrollOfficial\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnrollOfficial\Form.js" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\Index.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\Index.js" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\Form.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />
@@ -8041,6 +8048,8 @@
     <None Include="Oracle.ManagedDataAccess.Client.Configuration.Section.xsd">
       <SubType>Designer</SubType>
     </None>
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\IndexPersonal.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\FormView.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

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

@@ -606,6 +606,7 @@
     <Compile Include="EducationalAdministration\StuSubsidizeMap.cs" />
     <Compile Include="EducationalAdministration\StuSubsidizeTypeMap.cs" />
     <Compile Include="EducationalAdministration\StuEnrollOfficialMap.cs" />
+    <Compile Include="ReceiveSendFeeManagement\SalaryInfoMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-02-27 15:25
+    /// 描 述：工资条
+    /// </summary>
+    public class SalaryInfoMap : EntityTypeConfiguration<SalaryInfoEntity>
+    {
+        public SalaryInfoMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("SALARYINFO");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs

@@ -396,9 +396,10 @@ SELECT ruserid from [dbo].[LR_OA_NewsShouldRead] where newsid='{news.F_NewsId}'
                 var deptId = userinfo.departmentId;
                 var postIds = userinfo.postIds;
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.*,r.RNewsId,r.RTime FROM LR_OA_News t ");
+                strSql.Append("SELECT t.*,r.RNewsId,r.RTime,d.F_FullName FROM LR_OA_News t ");
                 strSql.Append(" left join LR_OA_NewsRead r on t.F_NewsId = r.NewsId and r.RUserId=@userId ");
                 strSql.Append(" left join  lr_base_user u on u.F_UserId=@userId ");
+                strSql.Append(" left join LR_BASE_DEPARTMENT d on d.F_DepartmentId = t.F_SendDeptId ");
                 strSql.Append(" WHERE t.F_TypeId = 2 and t.F_DeleteMark=0  and t.F_EnabledMark=1 ");
                 if (userinfo.account.Contains("20"))
                 {
@@ -440,7 +441,10 @@ SELECT ruserid from [dbo].[LR_OA_NewsShouldRead] where newsid='{news.F_NewsId}'
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["keyword"].IsEmpty())
                 {
-                    strSql.Append($" AND t.F_FullHead Like '{queryParam["keyword"].ToString()}' ");
+
+                    var keyword = "%" + queryParam["keyword"].ToString() + "%";
+                    strSql.Append(@" AND ( t.F_FullHead like '" + keyword + "' or t.F_Category like '" + keyword + "' or t.F_CreateUserName like '" + keyword 
+                        + "' or t.F_SourceName like'"+ keyword + "' or t.F_SourceAddress like '"+ keyword + "' )");
                 }
                 if (!queryParam["categoryId"].IsEmpty())
                 {

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 ";

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");

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialEntity.cs

@@ -85,11 +85,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("PROVINCE")]
         public string Province { get; set; }
         /// <summary>
-        /// 报考专业
+        /// 报考专业第一志愿
         /// </summary>
         [Column("MAJORNO")]
         public string MajorNo { get; set; }
         /// <summary>
+        /// 报考专业第2志愿
+        /// </summary>
+        [Column("MAJORNO2")]
+        public string MajorNo2 { get; set; }
+        /// <summary>
+        /// 报考专业第3志愿
+        /// </summary>
+        [Column("MAJORNO3")]
+        public string MajorNo3 { get; set; }
+        /// <summary>
         /// 户籍省份
         /// </summary>
         [Column("HOMEPROVINCE")]
@@ -165,6 +175,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("CREATETIME")]
         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 个人照片
+        /// </summary>
+        [Column("PHOTO")]
+        public string Photo { get; set; }
 
 
         #endregion

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; }
         /// <summary>
-        /// 当前异动类别
+        /// 当前异动类别【旧异动字段，暂不使用】
         /// </summary>
         [Column("ABMORMITYMOVEMARK")]
         public string AbmormityMoveMark { get; set; }

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<StuInfoBasicEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

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}' ");

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; }
         /// <summary>
-        /// 异动标志
+        /// 异动标志【旧异动字段，暂不使用】
         /// </summary>
         /// <returns></returns>
         [Column("ABMORMITYMOVEMARK")]

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);

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

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<NotPassEntity>(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

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

@@ -1851,6 +1851,10 @@
     <Compile Include="EducationalAdministration\StuEnrollOfficial\StuEnrollOfficialService.cs" />
     <Compile Include="EducationalAdministration\StuEnrollOfficial\StuEnrollOfficialBLL.cs" />
     <Compile Include="EducationalAdministration\StuEnrollOfficial\StuEnrollOfficialIBLL.cs" />
+    <Compile Include="ReceiveSendFeeManagement\SalaryInfo\SalaryInfoEntity.cs" />
+    <Compile Include="ReceiveSendFeeManagement\SalaryInfo\SalaryInfoService.cs" />
+    <Compile Include="ReceiveSendFeeManagement\SalaryInfo\SalaryInfoBLL.cs" />
+    <Compile Include="ReceiveSendFeeManagement\SalaryInfo\SalaryInfoIBLL.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/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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-02-27 15:25
+    /// 描 述：工资条
+    /// </summary>
+    public class SalaryInfoBLL : SalaryInfoIBLL
+    {
+        private SalaryInfoService salaryInfoService = new SalaryInfoService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SalaryInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return salaryInfoService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SalaryInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        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 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                salaryInfoService.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>
+        /// <returns></returns>
+        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
+
+    }
+}

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-02-27 15:25
+    /// 描 述：工资条
+    /// </summary>
+    public class SalaryInfoEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 年度
+        /// </summary>
+        [Column("YEARNO")]
+        public string YearNo { get; set; }
+        /// <summary>
+        /// 月份
+        /// </summary>
+        [Column("MONTHNO")]
+        public int? MonthNo { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        [Column("EMPNAME")]
+        public string EmpName { get; set; }
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        [Column("IDCARD")]
+        public string IdCard { get; set; }
+        /// <summary>
+        /// 工资类别
+        /// </summary>
+        [Column("SALARYTYPE")]
+        public string SalaryType { get; set; }
+        /// <summary>
+        /// 岗位工资
+        /// </summary>
+        [Column("GANGWEIGZ")]
+        public decimal? GangWeiGZ { get; set; }
+        /// <summary>
+        /// 薪级工资
+        /// </summary>
+        [Column("XINJIGZ")]
+        public decimal? XinJiGZ { get; set; }
+        /// <summary>
+        /// 高定工资
+        /// </summary>
+        [Column("GAODINGGZ")]
+        public decimal? GaoDingGZ { get; set; }
+        /// <summary>
+        /// 按比例核定的基础性绩效工资
+        /// </summary>
+        [Column("JICHUJIXIAOGZ")]
+        public decimal? JiChuJiXiaoGZ { get; set; }
+        /// <summary>
+        /// 保留地区补贴及保留额
+        /// </summary>
+        [Column("BAOLIUBUTIE")]
+        public decimal? BaoLiuBuTie { get; set; }
+        /// <summary>
+        /// 奖励性绩效
+        /// </summary>
+        [Column("JIANGLIJX")]
+        public decimal? JiangLiJX { get; set; }
+        /// <summary>
+        /// 艰苦边远地区津贴
+        /// </summary>
+        [Column("JIANKUJT")]
+        public decimal? JianKuJT { get; set; }
+        /// <summary>
+        /// 南疆工作补贴
+        /// </summary>
+        [Column("NANJIANGBT")]
+        public decimal? NanJiangBT { get; set; }
+        /// <summary>
+        /// 教护龄津贴
+        /// </summary>
+        [Column("JIAOHULINGJT")]
+        public decimal? JiaoHuLingJT { get; set; }
+        /// <summary>
+        /// 核增绩效工资
+        /// </summary>
+        [Column("HEZENGJX")]
+        public decimal? HeZengJX { get; set; }
+        /// <summary>
+        /// 班主任补贴
+        /// </summary>
+        [Column("BANZHURENBT")]
+        public decimal? BanZhuRenBT { get; set; }
+        /// <summary>
+        /// 补发基本工资
+        /// </summary>
+        [Column("BUFAGZ")]
+        public decimal? BuFaGZ { get; set; }
+        /// <summary>
+        /// 补发津补贴
+        /// </summary>
+        [Column("BUFAJT")]
+        public decimal? BuFaJT { get; set; }
+        /// <summary>
+        /// 补发绩效工资
+        /// </summary>
+        [Column("BUFAJX")]
+        public decimal? BuFaJX { get; set; }
+        /// <summary>
+        /// 补发其它津补贴
+        /// </summary>
+        [Column("BUFAQTJT")]
+        public decimal? BuFaQTJT { get; set; }
+        /// <summary>
+        /// 补发其它工资
+        /// </summary>
+        [Column("BUFAQTGZ")]
+        public decimal? BuFaQTGZ { get; set; }
+        /// <summary>
+        /// 基础绩效奖
+        /// </summary>
+        [Column("JICHUJX")]
+        public decimal? JiChuJX { get; set; }
+        /// <summary>
+        /// 补发奖励性绩效
+        /// </summary>
+        [Column("BUFAJIANGLIJX")]
+        public decimal? BuFaJiangLiJX { get; set; }
+        /// <summary>
+        /// 应发工资
+        /// </summary>
+        [Column("YINGFAGZ")]
+        public decimal? YingFaGZ { get; set; }
+        /// <summary>
+        /// 个人所得税
+        /// </summary>
+        [Column("GERENSDS")]
+        public decimal? GeRenSDS { get; set; }
+        /// <summary>
+        /// 预扣保险及年金
+        /// </summary>
+        [Column("YUKOUBXNJ")]
+        public decimal? YuKouBXNJ { get; set; }
+        /// <summary>
+        /// 住房公积金
+        /// </summary>
+        [Column("ZHUFANGGJJ")]
+        public decimal? ZhuFangGJJ { get; set; }
+        /// <summary>
+        /// 养老保险
+        /// </summary>
+        [Column("YANGLAOBX")]
+        public decimal? YangLaoBX { get; set; }
+        /// <summary>
+        /// 医疗保险
+        /// </summary>
+        [Column("YILIAOBX")]
+        public decimal? YiLiaoBX { get; set; }
+        /// <summary>
+        /// 职业年金
+        /// </summary>
+        [Column("ZHIYENJ")]
+        public decimal? ZhiYeNJ { get; set; }
+        /// <summary>
+        /// 失业保险金
+        /// </summary>
+        [Column("SHIYEBXJ")]
+        public decimal? ShiYeBXJ { get; set; }
+        /// <summary>
+        /// 大额医疗互助
+        /// </summary>
+        [Column("YILIAO")]
+        public decimal? YiLiao { get; set; }
+        /// <summary>
+        /// 扣发工资
+        /// </summary>
+        [Column("KOUFAGZ")]
+        public decimal? KouFaGZ { get; set; }
+        /// <summary>
+        /// 实发工资
+        /// </summary>
+        [Column("SHIFAGZ")]
+        public decimal? ShiFaGZ { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        [NotMapped]
+        public string F_DepartmentId { get; set; }
+        [NotMapped]
+        public string EmpNo { get; set; }
+        #endregion
+    }
+}
+

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-02-27 15:25
+    /// 描 述：工资条
+    /// </summary>
+    public interface SalaryInfoIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SalaryInfoEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取SalaryInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        SalaryInfoEntity GetSalaryInfoEntity(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, SalaryInfoEntity entity);
+        #endregion
+
+    }
+}

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
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-02-27 15:25
+    /// 描 述：工资条
+    /// </summary>
+    public class SalaryInfoService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SalaryInfoEntity> 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<SalaryInfoEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SalaryInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SalaryInfoEntity GetSalaryInfoEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<SalaryInfoEntity>(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<SalaryInfoEntity>(t=>t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        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
+
+    }
+}