新增校级奖学金功能；修复学生请假审核时学生姓名有时不显示的问题；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolLevelScholarshipController.cs

@@ -0,0 +1,127 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-03-16 11:49
+    /// 描 述：校级奖学金
+    /// </summary>
+    public class SchoolLevelScholarshipController : MvcControllerBase
+    {
+        private SchoolLevelScholarshipIBLL schoolLevelScholarshipIBLL = new SchoolLevelScholarshipBLL();
+        private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
+
+        #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="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = schoolLevelScholarshipIBLL.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 SchoolLevelScholarshipData = schoolLevelScholarshipIBLL.GetSchoolLevelScholarshipEntity( keyValue );
+            var jsonData = new {
+                SchoolLevelScholarship = SchoolLevelScholarshipData,
+            };
+            return Success(jsonData);
+        }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetClassList()
+        {
+            var account = LoginUserInfo.Get().account;
+            var data = classInfoIBLL.GetListByAccount(account);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            schoolLevelScholarshipIBLL.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)
+        {
+            SchoolLevelScholarshipEntity entity = strEntity.ToObject<SchoolLevelScholarshipEntity>();
+            schoolLevelScholarshipIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,87 @@
+@{
+    ViewBag.Title = "校级奖学金";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <div id="StuName"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">所属院系<font face="宋体">*</font></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">所属班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
+        <input id="IdCardType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <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="SchoolLevelScholarship">
+        <div class="lr-form-item-title">班级总人数<font face="宋体">*</font></div>
+        <input id="CalssNum" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">成绩排名名次<font face="宋体">*</font></div>
+        <input id="ClassRank" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">资助等级<font face="宋体">*</font></div>
+        <div id="FundingLevel" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">资助标准<font face="宋体">*</font></div>
+        <input id="FundingCriteria" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">应发金额<font face="宋体">*</font></div>
+        <input id="ShoudAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">实发金额<font face="宋体">*</font></div>
+        <input id="ActualAmount" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">申请日期</div>
+        <input id="ApplyDate" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">发放日期<font face="宋体">*</font></div>
+        <input id="ProvideDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ProvideDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">申请理由<font face="宋体">*</font></div>
+        <textarea id="ApplyAccount" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">开户银行<font face="宋体">*</font></div>
+        <input id="DepositBank" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">开户行账号<font face="宋体">*</font></div>
+        <input id="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">开户行号</div>
+        <input id="BankCode" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+    @*<div class="col-xs-12 lr-form-item"  data-table="SchoolLevelScholarship" >
+            <div class="lr-form-item-title">附件上传</div>
+            <div id="Url"  ></div>
+        </div>*@
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js

@@ -0,0 +1,106 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-16 11:49
+ * 描  述：校级奖学金
+ */
+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 () {
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#FundingLevel').lrDataItemSelect({ code: 'StateStipend' });
+            $('#ApplyDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            //$('#Url').lrUploader();
+            $("#StuName").lrlayerselect({
+                treeUrl: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetClassList',
+                treeParentId: 'ClassNo',
+                treeValueId: 'ClassNo',
+                treeTextId: 'ClassName',
+                dataUrl: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetList',
+                dataTreeId: 'ClassNo',
+                dataValueId: 'AId',
+                dataTextId: 'AName',
+                grid: [
+                    { label: '资产编号', name: 'ACode', width: 200, align: 'left' },
+                    { label: '资产名称', name: 'AName', width: 200, align: 'left' },
+                    { label: "英文名称", name: "AEName", width: 200, align: "left" },
+                    { label: "资产型号", name: "AModel", width: 200, align: "left" },
+                    { label: "生产厂家", name: "AManufacturer", width: 200, align: "left" },
+                    {
+                        label: "供应商", name: "ASupplierId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    callback(_data['sname']);
+                                }
+                            });
+                        }
+                    }
+                ],
+                select: function (values, texts) {
+                    if (values && values.length > 0) {
+                        $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/GetFormData?keyValue=' + values[0], function (data) {
+                            data = data.Ass_AssetsInfo;
+                            console.log(data);
+                            $('#PAIName').val(data.AName);//资产名称
+                            //$('#AAIUnit').lrselectSet(data.AUnit);
+                            $('#PAIEName').val(data.AEName);//英文名称
+                            $('#PAIModel').val(data.AModel);//资产型号
+                            $('#PAITId').val(data.AAssType);//资产类别
+                            $('#PAIManufacturer').val(data.AManufacturer);//生产厂家
+                        });
+                    }
+                },
+                unknowselect: function () {
+                    $('#PAIName').val("");
+                    $('#PAIEName').val("");
+                    $('#PAITId').lrselectSet("");
+                    $('#PAIModel').val("");
+                    $('#PAIManufacturer').val("");
+                },
+                isMultiple: false
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/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 + '/EducationalAdministration/SchoolLevelScholarship/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,60 @@
+@{
+    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="ApplyDate"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">发放日期</div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">所属院系</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">所属班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">身份证件号</div>
+                                    <input id="IdCard" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">资助等级</div>
+                                    <div id="FundingLevel"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">开户行账号</div>
+                                    <input id="BankCard" 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/EducationalAdministration/Views/SchoolLevelScholarship/Index.js")

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

@@ -0,0 +1,142 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-16 11:49
+ * 描  述：校级奖学金
+ */
+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);
+            }, 350, 400);
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#FundingLevel').lrDataItemSelect({ code: 'StateStipend' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/Form',
+                    width: 850,
+                    height: 650,
+                    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 + '/EducationalAdministration/SchoolLevelScholarship/Form?keyValue=' + keyValue,
+                        width: 850,
+                        height: 650,
+                        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 + '/EducationalAdministration/SchoolLevelScholarship/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetPageList',
+                headData: [
+                    { label: "学号", name: "StuNo", width: 100, align: "left"},
+                    { label: "姓名", name: "StuName", width: 100, align: "left"},
+                    { label: "所属院系", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                 key: value,
+                                 keyId: 'deptno',
+                                 callback: function (_data) {
+                                     callback(_data['deptname']);
+                                 }
+                             });
+                        }},
+                    { label: "所属班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                 key: value,
+                                 keyId: 'classno',
+                                 callback: function (_data) {
+                                     callback(_data['classname']);
+                                 }
+                             });
+                        }},
+                    { label: "身份证件类型", name: "IdCardType", width: 100, align: "left"},
+                    { label: "身份证件号", name: "IdCard", width: 100, align: "left"},
+                    { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"},
+                    { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"},
+                    { label: "资助等级", name: "FundingLevel", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'StateStipend',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "资助标准", name: "FundingCriteria", width: 100, align: "left"},
+                    { label: "应发金额", name: "ShoudAmount", width: 100, align: "left"},
+                    { label: "实发金额", name: "ActualAmount", width: 100, align: "left"},
+                    { label: "申请日期", name: "ApplyDate", width: 100, align: "left"},
+                    { label: "发放日期", name: "ProvideDate", width: 100, align: "left"},
+                    { label: "申请理由", name: "ApplyAccount", width: 100, align: "left"},
+                    { label: "开户银行", name: "DepositBank", width: 100, align: "left"},
+                    { label: "开户行账号", name: "BankCard", width: 100, align: "left"},
+                    { label: "开户行号", name: "BankCode", width: 100, align: "left"},
+                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                    { label: "附件上传", name: "Url", 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/EducationalAdministration/Views/StuLeaveManagement/FormView.cshtml

@@ -9,7 +9,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuLeaveManagement">
         <div class="lr-form-item-title">学生姓名</div>
-        <div id="CreateUserName" readonly></div>
+        <input id="CreateUserName" readonly type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuLeaveManagement">
         <div class="lr-form-item-title">系部</div>

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

@@ -43,7 +43,7 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' });
-            $('#CreateUserName').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' });
+            //$('#CreateUserName').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' });
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassDiredctorNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });

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

@@ -880,6 +880,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\PsychologyInfoController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\PsychologyReplyInfoController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuFellowshipController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\SchoolLevelScholarshipController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6721,6 +6722,10 @@
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/SchoolLevelScholarshipMap.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-03-16 11:49
+    /// 描 述：校级奖学金
+    /// </summary>
+    public class SchoolLevelScholarshipMap : EntityTypeConfiguration<SchoolLevelScholarshipEntity>
+    {
+        public SchoolLevelScholarshipMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("SCHOOLLEVELSCHOLARSHIP");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

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

@@ -610,6 +610,7 @@
     <Compile Include="LR_Desktop\PsychologyReplyInfoMap.cs" />
     <Compile Include="EducationalAdministration\PsychologyInfoMap.cs" />
     <Compile Include="EducationalAdministration\StuFellowshipMap.cs" />
+    <Compile Include="EducationalAdministration\SchoolLevelScholarshipMap.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/ClassInfo/ClassInfoBLL.cs

@@ -132,6 +132,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public IEnumerable<ClassInfoEntity> GetListByAccount(string account)
+        {
+            try
+            {
+                return classInfoService.GetListByAccount(account);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoIBLL.cs

@@ -40,6 +40,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         ClassInfoEntity GetClassInfoEntityByClassName(string className);
+
+        /// <summary>
+        /// 获取班主任或辅导员是当前用户的班级
+        /// </summary>
+        /// <param name="account"></param>
+        /// <returns></returns>
+        IEnumerable<ClassInfoEntity> GetListByAccount(string account);
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoService.cs

@@ -162,6 +162,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 根据班主任或辅导员账号查询班级
+        /// <param name="account">班主任或辅导员账号</param>
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<ClassInfoEntity> GetListByAccount(string account)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>(x => (x.ClassDiredctorNo == account || x.ClassTutorNo == account) && x.CheckMark == true);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipBLL.cs

@@ -0,0 +1,125 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-03-16 11:49
+    /// 描 述：校级奖学金
+    /// </summary>
+    public class SchoolLevelScholarshipBLL : SchoolLevelScholarshipIBLL
+    {
+        private SchoolLevelScholarshipService schoolLevelScholarshipService = new SchoolLevelScholarshipService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SchoolLevelScholarshipEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return schoolLevelScholarshipService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SchoolLevelScholarship表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SchoolLevelScholarshipEntity GetSchoolLevelScholarshipEntity(string keyValue)
+        {
+            try
+            {
+                return schoolLevelScholarshipService.GetSchoolLevelScholarshipEntity(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
+            {
+                schoolLevelScholarshipService.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, SchoolLevelScholarshipEntity entity)
+        {
+            try
+            {
+                schoolLevelScholarshipService.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/SchoolLevelScholarship/SchoolLevelScholarshipEntity.cs

@@ -0,0 +1,145 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-03-16 11:49
+    /// 描 述：校级奖学金
+    /// </summary>
+    public class SchoolLevelScholarshipEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 学号
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// 学生姓名
+        /// </summary>
+        [Column("STUNAME")]
+        public string StuName { get; set; }
+        /// <summary>
+        /// 所属院系
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 班级
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 身份证件类型
+        /// </summary>
+        [Column("IDCARDTYPE")]
+        public string IdCardType { get; set; }
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        [Column("IDCARD")]
+        public string IdCard { get; set; }
+        /// <summary>
+        /// 班级总人数/成绩排名总人数
+        /// </summary>
+        [Column("CALSSNUM")]
+        public int? CalssNum { get; set; }
+        /// <summary>
+        /// 成绩排名名次/班级排名
+        /// </summary>
+        [Column("CLASSRANK")]
+        public int? ClassRank { get; set; }
+        /// <summary>
+        /// 资助等级
+        /// </summary>
+        [Column("FUNDINGLEVEL")]
+        public string FundingLevel { get; set; }
+        /// <summary>
+        /// 资助标准
+        /// </summary>
+        [Column("FUNDINGCRITERIA")]
+        public string FundingCriteria { get; set; }
+        /// <summary>
+        /// 应发金额
+        /// </summary>
+        [Column("SHOUDAMOUNT")]
+        public decimal? ShoudAmount { get; set; }
+        /// <summary>
+        /// 实发金额
+        /// </summary>
+        [Column("ACTUALAMOUNT")]
+        public decimal? ActualAmount { get; set; }
+        /// <summary>
+        /// 申请日期
+        /// </summary>
+        [Column("APPLYDATE")]
+        public DateTime? ApplyDate { get; set; }
+        /// <summary>
+        /// 发放日期
+        /// </summary>
+        [Column("PROVIDEDATE")]
+        public DateTime? ProvideDate { get; set; }
+        /// <summary>
+        /// ApplyAccount
+        /// </summary>
+        [Column("APPLYACCOUNT")]
+        public string ApplyAccount { get; set; }
+        /// <summary>
+        /// 开户银行
+        /// </summary>
+        [Column("DEPOSITBANK")]
+        public string DepositBank { get; set; }
+        /// <summary>
+        /// 开户卡账号
+        /// </summary>
+        [Column("BANKCARD")]
+        public string BankCard { get; set; }
+        /// <summary>
+        /// 开户行号
+        /// </summary>
+        [Column("BANKCODE")]
+        public string BankCode { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 附件
+        /// </summary>
+        [Column("URL")]
+        public string Url { 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 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipIBLL.cs

@@ -0,0 +1,48 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-03-16 11:49
+    /// 描 述：校级奖学金
+    /// </summary>
+    public interface SchoolLevelScholarshipIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SchoolLevelScholarshipEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取SchoolLevelScholarship表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        SchoolLevelScholarshipEntity GetSchoolLevelScholarshipEntity(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, SchoolLevelScholarshipEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs

@@ -0,0 +1,199 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-03-16 11:49
+    /// 描 述：校级奖学金
+    /// </summary>
+    public class SchoolLevelScholarshipService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SchoolLevelScholarshipEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.StuNo,
+                t.StuName,
+                t.DeptNo,
+                t.ClassNo,
+                t.IdCardType,
+                t.IdCard,
+                t.CalssNum,
+                t.ClassRank,
+                t.FundingLevel,
+                t.FundingCriteria,
+                t.ShoudAmount,
+                t.ActualAmount,
+                t.ApplyDate,
+                t.ProvideDate,
+                t.ApplyAccount,
+                t.DepositBank,
+                t.BankCard,
+                t.BankCode,
+                t.Remark,
+                t.Url
+                ");
+                strSql.Append("  FROM SchoolLevelScholarship t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["ApplyDate"].IsEmpty())
+                {
+                    dp.Add("ApplyDate",queryParam["ApplyDate"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ApplyDate = @ApplyDate ");
+                }
+                if (!queryParam["ProvideDate"].IsEmpty())
+                {
+                    dp.Add("ProvideDate",queryParam["ProvideDate"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ProvideDate = @ProvideDate ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo",queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["IdCard"].IsEmpty())
+                {
+                    dp.Add("IdCard", "%" + queryParam["IdCard"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.IdCard Like @IdCard ");
+                }
+                if (!queryParam["FundingLevel"].IsEmpty())
+                {
+                    dp.Add("FundingLevel",queryParam["FundingLevel"].ToString(), DbType.String);
+                    strSql.Append(" AND t.FundingLevel = @FundingLevel ");
+                }
+                if (!queryParam["BankCard"].IsEmpty())
+                {
+                    dp.Add("BankCard", "%" + queryParam["BankCard"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.BankCard Like @BankCard ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<SchoolLevelScholarshipEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SchoolLevelScholarship表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SchoolLevelScholarshipEntity GetSchoolLevelScholarshipEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<SchoolLevelScholarshipEntity>(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<SchoolLevelScholarshipEntity>(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, SchoolLevelScholarshipEntity 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/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs

@@ -42,6 +42,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public IEnumerable<StuInfoBasicEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return stuInfoBasicService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取页面显示列表数据
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs

@@ -21,7 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<StuInfoBasicEntity> GetPageList(Pagination pagination, string queryJson);
-
+        IEnumerable<StuInfoBasicEntity> GetList(string queryJson);
         /// <summary>
         /// 获取页面显示列表数据
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -197,6 +197,47 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取不分页列表
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuInfoBasicEntity> GetList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM StuInfoBasic t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["keyword"].IsEmpty())
+                {
+                    dp.Add("keyword", queryParam["keyword"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.StuNo = @keyword or t.StuName Like @keyword)");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", "" + queryParam["ClassNo"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.ClassNo=@ClassNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         internal List<string> GetSaveClassStudents(string account)
         {
             try

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

@@ -1867,6 +1867,10 @@
     <Compile Include="EducationalAdministration\StuFellowship\StuFellowshipService.cs" />
     <Compile Include="EducationalAdministration\StuFellowship\StuFellowshipIBLL.cs" />
     <Compile Include="EducationalAdministration\StuFellowship\StuFellowshipBLL.cs" />
+    <Compile Include="EducationalAdministration\SchoolLevelScholarship\SchoolLevelScholarshipEntity.cs" />
+    <Compile Include="EducationalAdministration\SchoolLevelScholarship\SchoolLevelScholarshipService.cs" />
+    <Compile Include="EducationalAdministration\SchoolLevelScholarship\SchoolLevelScholarshipBLL.cs" />
+    <Compile Include="EducationalAdministration\SchoolLevelScholarship\SchoolLevelScholarshipIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">