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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/FundsApplyController.cs

@@ -99,9 +99,11 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         public ActionResult GetFormDataByProcessId(string processId)
         {
             var FundsApplyData = fundsApplyIBLL.GetEntityByProcessId(processId);
+            var FundsApplyDetailData = fundsApplyDetailIBLL.GetListByApplyId(FundsApplyData.Id);
             var jsonData = new
             {
                 FundsApply = FundsApplyData,
+                FundsApplyDetail = FundsApplyDetailData,
             };
             return Success(jsonData);
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.cshtml

@@ -13,11 +13,12 @@
                         <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_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_look" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;查看</a>
                         <a id="lr_submit" 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>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js

@@ -46,6 +46,12 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status !== 0) {
+                        learun.alert.warning("当前项目已提交不能编辑！");
+                        return;
+                    }
+
                     learun.layerForm({
                         id: 'formFundsApply',
                         title: '编辑',
@@ -71,10 +77,15 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status !== 0) {
+                        learun.alert.warning("当前项目已提交不能编辑！");
+                        return;
+                    }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/FundsApply/DeleteForm', { keyValue: keyValue}, function () {
-                                refreshGirdData();
+                            learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/FundsApply/DeleteForm', { keyValue: keyValue }, function () {
+                                page.search();
                             });
                         }
                     });
@@ -103,7 +114,22 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            //查看
+            $('#lr_look').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formFundsApply',
+                        title: '查看',
+                        url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/FormView?keyValue=' + keyValue,
+                        width: 860,
+                        height: 600,
+                        callBack: function (id) {
 
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -111,27 +137,31 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/GetPageList',
                 headData: [
                     { label: "申报单号", name: "EnCode", width: 200, align: "left" },
-                    { label: "申报部门", name: "ApplyDept", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('department', {
-                                 key: value,
-                                 callback: function (_data) {
-                                     callback(_data.name);
-                                 }
-                             });
-                        }},
-                    { label: "填报时间", name: "ApplyTime", width: 100, align: "left"},
-                    { label: "填报人", name: "ApplyUser", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('user', {
-                                 key: value,
-                                 callback: function (_data) {
-                                     callback(_data.name);
-                                 }
-                             });
-                        }},
-                    { label: "备注", name: "Remark", width: 100, align: "left"},
-                    { label: "总金额", name: "SumAmount", width: 100, align: "left"},
+                    {
+                        label: "申报部门", name: "ApplyDept", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('department', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "填报时间", name: "ApplyTime", width: 100, align: "left" },
+                    {
+                        label: "填报人", name: "ApplyUser", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                    { label: "总金额", name: "SumAmount", width: 100, align: "left" },
                     { label: "人民币（大写）", name: "UpperAmount", width: 100, align: "left" },
                     {
                         label: "审批状态", name: "Status", width: 100, align: "left",
@@ -147,33 +177,31 @@ var bootstrap = function ($, learun) {
                     }
 
                 ],
-                mainId:'Id',
+                mainId: 'Id',
                 isPage: true
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function (res, postData) {
-        if (!!res)
-        {
-          if (res.code == 200)
-          {
-             // 发起流程
-             var postData = {
-                 schemeCode:'LC_FundsApply',// 填写流程对应模板编号
-                  processId:processId,
-                  level:'1',
-             };
-             learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function(data) {
-                 learun.loading(false);
-             });
+        if (!!res) {
+            if (res.code == 200) {
+                // 发起流程
+                var postData = {
+                    schemeCode: 'LC_FundsApply',// 填写流程对应模板编号
+                    processId: processId,
+                    level: '1',
+                };
+                learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                    learun.loading(false);
+                });
+            }
+            page.search();
         }
-       page.search();
-       }
     };
     page.init();
 }

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

@@ -0,0 +1,121 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-10 17:25
+    /// 描 述：民体活动管理
+    /// </summary>
+    public class PeopleSportsActivitiesController : MvcControllerBase
+    {
+        private PeopleSportsActivitiesIBLL peopleSportsActivitiesIBLL = new PeopleSportsActivitiesBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = peopleSportsActivitiesIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = peopleSportsActivitiesIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = peopleSportsActivitiesIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            peopleSportsActivitiesIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,PeopleSportsActivitiesEntity entity)
+        {
+            peopleSportsActivitiesIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "民体活动管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">赛事</div>
+        <input id="ContestItem" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">内容</div>
+        <input id="Contents" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">单位</div>
+        <input id="Unit" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">时间</div>
+        <input id="MatchTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#MatchTime').trigger('change'); } })"  />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">荣誉</div>
+        <input id="Honour" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:50px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PeopleSportsActivities/Form.js")

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

@@ -0,0 +1,38 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-11-10 17:25
+ * 描  述：民体活动管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PeopleSportsActivities/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,44 @@
+@{
+    ViewBag.Title = "民体活动管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">赛项</div>
+                                    <input id="ContestItem" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">单位</div>
+                                    <input id="Unit" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">荣誉</div>
+                                    <input id="Honour" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PeopleSportsActivities/Index.js")

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

@@ -0,0 +1,93 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-11-10 17:25
+ * 描  述：民体活动管理
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/PeopleSportsActivities/Form',
+                    width: 700,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/PeopleSportsActivities/Form?keyValue=' + keyValue,
+                        width: 700,
+                        height: 400,
+                        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/PeopleSportsActivities/DeleteForm', { keyValue: keyValue}, function () {
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/PeopleSportsActivities/GetPageList',
+                headData: [
+                        { label: '赛事', name: 'ContestItem', width: 200, align: "left" },
+                        { label: '内容', name: 'Contents', width: 300, align: "left" },
+                        { label: '单位', name: 'Unit', width: 200, align: "left" },
+                        { label: '时间', name: 'MatchTime', width: 200, align: "left" },
+                        { label: '荣誉', name: 'Honour', width: 200, align: "left" },
+                        { label: '备注', name: 'Remark', width: 300, 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/Content/jquery/plugin/jfGrid/jfgrid.js

@@ -204,18 +204,18 @@
             if (dfop.isShowNum) {
                 var $num = $('<div class="jfgrid-border-cell jfgrid-border-num"></div>');
                 $border.prepend($num);
-                _width += 30;
+                _width += 60;
             }
             if (dfop.isMultiselect) {
                 var $cb = $('<div class="jfgrid-border-cell jfgrid-border-cb"><input role="checkbox" id="jfgrid_all_cb_' + dfop.id + '" type="checkbox"></div>')
                     .css('left', _width + 'px').css('line-height', (dfop._headHeight - 1) + 'px');
                 $border.prepend($cb);
-                _width += 30;
+                _width += 60;
             }
             if (dfop.isSubGrid) {
                 var $sub = $('<div class="jfgrid-border-cell jfgrid-border-sub"></div>').css('left', _width + 'px');
                 $border.prepend($sub);
-                _width += 30;
+                _width += 60;
             }
 
             dfop._borderLeftPadding = _width;

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

@@ -887,6 +887,7 @@
     <Compile Include="Areas\AssetManagementSystem\Controllers\FundsApplyController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\SportEquipmentLendController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\SportEquipmentReturnController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\PeopleSportsActivitiesController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6999,6 +7000,10 @@
     <Content Include="Areas\EducationalAdministration\Views\SportEquipmentReturn\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\SportEquipmentReturn\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\SportEquipmentReturn\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PeopleSportsActivities\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PeopleSportsActivities\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PeopleSportsActivities\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PeopleSportsActivities\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.css

@@ -47,7 +47,7 @@
     position: absolute;
     top: 0;
     left: 0;
-    width: 30px;
+    width: 60px;
     height: 100%;
     border-right: 1px solid #ccc;
 }
@@ -165,7 +165,7 @@
     left: 0;
     font-size: 12px;
     color: #333;
-    width: 30px;
+    width: 60px;
     line-height: 27px;
     border-bottom: 1px solid #ccc;
     border-right: 1px solid #ccc;

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js

@@ -998,20 +998,20 @@
             // 判断是否有序号列
             if (op.isShowNum) {
                 $border.append('<div class="jfgrid-border-cell jfgrid-border-num"></div>');
-                op.running.leftWidth += 30;
+                op.running.leftWidth += 60;
             }
             // 判断是否允许多选
             if (op.isMultiselect) {
                 var $cb = $('<div class="jfgrid-border-cell jfgrid-border-cb"><img  id="jfgrid_all_cb_' + op.id + '" src="' + imageurl + cb[0] + '" /></div>')
                     .css({ 'left': op.running.leftWidth, 'line-height': (op.running.headHeight - 1) + 'px' });
                 $border.append($cb);
-                op.running.leftWidth += 30;
+                op.running.leftWidth += 60;
             }
             // 是否有展开
             if (op.isSubGrid) {
                 var $sub = $('<div class="jfgrid-border-cell jfgrid-border-sub"></div>').css('left', op.running.leftWidth);
                 $border.append($sub);
-                op.running.leftWidth += 30;
+                op.running.leftWidth += 60;
             }
             op.running.leftWidth += op.running.frozenleft;
             $self.css({ 'padding-top': op.running.headHeight });
@@ -1281,7 +1281,7 @@
 
                 row['jfcheck'].$cell.css({ 'top': row['jfcheck'].top, 'left': row['jfcheck'].left, 'text-align': 'center', 'height': op.rowHeight, 'line-height': (op.rowHeight - 1) + 'px' });
                 $left.append(row['jfcheck'].$cell);
-                _left += 30;
+                _left += 60;
             }
             // 是否有子表选项
             if (op.isSubGrid) {
@@ -1293,7 +1293,7 @@
                 };
                 row['jfsubGrid'].$cell.css({ 'top': row['jfsubGrid'].top, 'left': row['jfsubGrid'].left, 'text-align': 'center', 'height': op.rowHeight, 'line-height': (op.rowHeight - 1) + 'px' });
                 $left.append(row['jfsubGrid'].$cell);
-                _left += 30;
+                _left += 60;
             }
 
             // 加载固定列数据
@@ -2153,7 +2153,7 @@
             isAutoHeight: false,          // 自动适应表格高度
             height: 0,
             rowHeight: 28,                 // 行高
-            numRowWitdh: 30                // 序号列宽度
+            numRowWitdh: 60                // 序号列宽度
 
 
         };

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config

@@ -35,7 +35,7 @@
     <typeAlias alias="StuDisciplineManagementMethod" type="Learun.Application.WorkFlow.StuDisciplineManagementMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StudentCertificateMethod" type="Learun.Application.WorkFlow.StudentCertificateMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StudentHonorMethod" type="Learun.Application.WorkFlow.StudentHonorMethod,Learun.Application.WorkFlow" />
-    <typeAlias alias="FundsApplyMethod" type="Learun.Application.WorkFlow.StudentHonorMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="FundsApplyMethod" type="Learun.Application.WorkFlow.FundsApplyMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StudentCompetitionMethod" type="Learun.Application.WorkFlow.StudentCompetitionMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StudentArticlePublicMethod" type="Learun.Application.WorkFlow.StudentArticlePublicMethod,Learun.Application.WorkFlow" />
     

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/PeopleSportsActivitiesMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-10 17:25
+    /// 描 述：民体活动管理
+    /// </summary>
+    public class PeopleSportsActivitiesMap : EntityTypeConfiguration<PeopleSportsActivitiesEntity>
+    {
+        public PeopleSportsActivitiesMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("PEOPLESPORTSACTIVITIES");
+            //主键
+            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

@@ -645,6 +645,7 @@
     <Compile Include="EducationalAdministration\SportEquipmentMap.cs" />
     <Compile Include="EducationalAdministration\SportEquipmentLendMap.cs" />
     <Compile Include="EducationalAdministration\SportEquipmentReturnMap.cs" />
+    <Compile Include="EducationalAdministration\PeopleSportsActivitiesMap.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/AssetManagementSystem/FundsApply/FundsApplyService.cs

@@ -115,6 +115,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
             try
             {
                 this.BaseRepository("CollegeMIS").Delete<FundsApplyEntity>(t => t.Id == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<FundsApplyDetailEntity>(t => t.ApplyId == keyValue);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApplyDetail/FundsApplyDetailBLL.cs

@@ -85,6 +85,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 }
             }
         }
+        
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApplyDetail/FundsApplyDetailService.cs

@@ -102,6 +102,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 }
             }
         }
+        
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PeopleSportsActivities/PeopleSportsActivitiesBLL.cs

@@ -0,0 +1,148 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-10 17:25
+    /// 描 述：民体活动管理
+    /// </summary>
+    public class PeopleSportsActivitiesBLL : PeopleSportsActivitiesIBLL
+    {
+        private PeopleSportsActivitiesService peopleSportsActivitiesService = new PeopleSportsActivitiesService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PeopleSportsActivitiesEntity> GetList( string queryJson )
+        {
+            try
+            {
+                return peopleSportsActivitiesService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PeopleSportsActivitiesEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return peopleSportsActivitiesService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public PeopleSportsActivitiesEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return peopleSportsActivitiesService.GetEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                peopleSportsActivitiesService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, PeopleSportsActivitiesEntity entity)
+        {
+            try
+            {
+                peopleSportsActivitiesService.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/PeopleSportsActivities/PeopleSportsActivitiesEntity.cs

@@ -0,0 +1,95 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-10 17:25
+    /// 描 述：民体活动管理
+    /// </summary>
+    public class PeopleSportsActivitiesEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        /// <returns></returns>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 赛事
+        /// </summary>
+        /// <returns></returns>
+        [Column("CONTESTITEM")]
+        public string ContestItem { get; set; }
+        /// <summary>
+        /// 内容
+        /// </summary>
+        /// <returns></returns>
+        [Column("CONTENTS")]
+        public string Contents { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+        /// <returns></returns>
+        [Column("UNIT")]
+        public string Unit { get; set; }
+        /// <summary>
+        /// MatchTime
+        /// </summary>
+        /// <returns></returns>
+        [Column("MATCHTIME")]
+        public DateTime? MatchTime { get; set; }
+        /// <summary>
+        /// 荣誉
+        /// </summary>
+        /// <returns></returns>
+        [Column("HONOUR")]
+        public string Honour { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>
+        /// <returns></returns>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// CreateUserId
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            var userlogin = LoginUserInfo.Get();
+            this.ID = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            this.CreateUserId = userlogin.userId;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+        }
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PeopleSportsActivities/PeopleSportsActivitiesIBLL.cs

@@ -0,0 +1,55 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-10 17:25
+    /// 描 述：民体活动管理
+    /// </summary>
+    public interface PeopleSportsActivitiesIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<PeopleSportsActivitiesEntity> GetList( string queryJson );
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<PeopleSportsActivitiesEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        PeopleSportsActivitiesEntity GetEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, PeopleSportsActivitiesEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PeopleSportsActivities/PeopleSportsActivitiesService.cs

@@ -0,0 +1,189 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-11-10 17:25
+    /// 描 述：民体活动管理
+    /// </summary>
+    public class PeopleSportsActivitiesService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<PeopleSportsActivitiesEntity> GetList(string queryJson)
+        {
+            try
+            {
+                //参考写法
+                //var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                //var dp = new DynamicParameters(new { });
+                //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*");
+                strSql.Append(" FROM PeopleSportsActivities t ");
+                return this.BaseRepository("CollegeMIS").FindList<PeopleSportsActivitiesEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<PeopleSportsActivitiesEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append(" FROM PeopleSportsActivities t ");
+                strSql.Append(" where 1= 1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                var userInfo = LoginUserInfo.Get();
+                if (!queryParam["ContestItem"].IsEmpty())
+                {
+                    dp.Add("ContestItem", "%" + queryParam["ContestItem"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.ContestItem like @ContestItem ");
+                }
+                if (!queryParam["Unit"].IsEmpty())
+                {
+                    dp.Add("Unit", "%" + queryParam["Unit"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Unit like @Unit ");
+                }
+                if (!queryParam["Honour"].IsEmpty())
+                {
+                    dp.Add("Honour", "%" + queryParam["Honour"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Honour like @Honour ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<PeopleSportsActivitiesEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public PeopleSportsActivitiesEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<PeopleSportsActivitiesEntity>(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<PeopleSportsActivitiesEntity>(t => t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// </summary>
+        public void SaveEntity(string keyValue, PeopleSportsActivitiesEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

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

@@ -2003,6 +2003,10 @@
     <Compile Include="EducationalAdministration\SportEquipmentReturn\SportEquipmentReturnService.cs" />
     <Compile Include="EducationalAdministration\SportEquipmentReturn\SportEquipmentReturnBLL.cs" />
     <Compile Include="EducationalAdministration\SportEquipmentReturn\SportEquipmentReturnIBLL.cs" />
+    <Compile Include="EducationalAdministration\PeopleSportsActivities\PeopleSportsActivitiesEntity.cs" />
+    <Compile Include="EducationalAdministration\PeopleSportsActivities\PeopleSportsActivitiesService.cs" />
+    <Compile Include="EducationalAdministration\PeopleSportsActivities\PeopleSportsActivitiesIBLL.cs" />
+    <Compile Include="EducationalAdministration\PeopleSportsActivities\PeopleSportsActivitiesBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">