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

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

@@ -0,0 +1,117 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-31 11:22
+    /// 描 述：耗品申报
+    /// </summary>
+    public class TE_ConsumerGoodsApplyController : MvcControllerBase
+    {
+        private TE_ConsumerGoodsApplyIBLL tE_ConsumerGoodsApplyIBLL = new TE_ConsumerGoodsApplyBLL();
+
+        #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 = tE_ConsumerGoodsApplyIBLL.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 TE_ConsumerGoodsApplyData = tE_ConsumerGoodsApplyIBLL.GetTE_ConsumerGoodsApplyEntity( keyValue );
+            var jsonData = new {
+                TE_ConsumerGoodsApply = TE_ConsumerGoodsApplyData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            tE_ConsumerGoodsApplyIBLL.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)
+        {
+            TE_ConsumerGoodsApplyEntity entity = strEntity.ToObject<TE_ConsumerGoodsApplyEntity>();
+            tE_ConsumerGoodsApplyIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,35 @@
+@{
+    ViewBag.Title = "耗品申报";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="TE_ConsumerGoodsApply">
+        <div class="lr-form-item-title">专业部<font face="宋体">*</font></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TE_ConsumerGoodsApply">
+        <div class="lr-form-item-title">实训室名称<font face="宋体">*</font></div>
+        <input id="TrainName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TE_ConsumerGoodsApply">
+        <div class="lr-form-item-title">设备名称<font face="宋体">*</font></div>
+        <input id="EquipmentName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TE_ConsumerGoodsApply">
+        <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
+        <input id="EquipmentNum" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TE_ConsumerGoodsApply">
+        <div class="lr-form-item-title">预算价格<font face="宋体">*</font></div>
+        <input id="BudgetPrice" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TE_ConsumerGoodsApply">
+        <div class="lr-form-item-title">申报人<font face="宋体">*</font></div>
+        <div id="ApplyUserId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TE_ConsumerGoodsApply">
+        <div class="lr-form-item-title">申报时间<font face="宋体">*</font></div>
+        <input id="ApplyTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#ApplyTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TE_ConsumerGoodsApply/Form.js")

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

@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-31 11:22
+ * 描  述：耗品申报
+ */
+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: 'CdMajorInfo',value: 'majorno',text: 'majorname' });
+            $('#ApplyUserId').lrDataSourceSelect({ code: 'teacheruserdata',value: 'f_userid',text: 'f_realname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TE_ConsumerGoodsApply/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/TE_ConsumerGoodsApply/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,48 @@
+@{
+    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="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">实训室名称</div>
+                                    <input id="TrainName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">设备名称</div>
+                                    <input id="EquipmentName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">申报人</div>
+                                    <div id="ApplyUserId"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div 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/TE_ConsumerGoodsApply/Index.js")

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

@@ -0,0 +1,115 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-31 11:22
+ * 描  述：耗品申报
+ */
+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);
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' });
+            $('#ApplyUserId').lrDataSourceSelect({ code: 'teacheruserdata',value: 'f_userid',text: 'f_realname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/TE_ConsumerGoodsApply/Form',
+                    width: 600,
+                    height: 400,
+                    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/TE_ConsumerGoodsApply/Form?keyValue=' + keyValue,
+                        width: 600,
+                        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/TE_ConsumerGoodsApply/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/TE_ConsumerGoodsApply/GetPageList',
+                headData: [
+                    { label: "专业部", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                 key: value,
+                                 keyId: 'majorno',
+                                 callback: function (_data) {
+                                     callback(_data['majorname']);
+                                 }
+                             });
+                        }},
+                    { label: "实训室名称", name: "TrainName", width: 100, align: "left"},
+                    { label: "设备名称", name: "EquipmentName", width: 100, align: "left"},
+                    { label: "数量", name: "EquipmentNum", width: 100, align: "left"},
+                    { label: "预算价格", name: "BudgetPrice", width: 100, align: "left"},
+                    { label: "申报人", name: "ApplyUserId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                 key: value,
+                                 keyId: 'f_userid',
+                                 callback: function (_data) {
+                                     callback(_data['f_realname']);
+                                 }
+                             });
+                        }},
+                    { label: "申报时间", name: "ApplyTime", 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/Learun.Application.Web.csproj

@@ -866,6 +866,7 @@
     <Compile Include="Areas\PersonnelManagement\Controllers\ClassPatrolController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuGraduateStatisticController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TrainEquipmentManageController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\TE_ConsumerGoodsApplyController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6870,6 +6871,10 @@
     <Content Include="Areas\EducationalAdministration\Views\TrainEquipmentManage\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\TrainEquipmentManage\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TrainEquipmentManage\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TE_ConsumerGoodsApply\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TE_ConsumerGoodsApply\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TE_ConsumerGoodsApply\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TE_ConsumerGoodsApply\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TE_ConsumerGoodsApplyMap.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-08-31 11:22
+    /// 描 述：耗品申报
+    /// </summary>
+    public class TE_ConsumerGoodsApplyMap : EntityTypeConfiguration<TE_ConsumerGoodsApplyEntity>
+    {
+        public TE_ConsumerGoodsApplyMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("TE_CONSUMERGOODSAPPLY");
+            //主键
+            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

@@ -623,6 +623,7 @@
     <Compile Include="PersonnelManagement\ClassPatrolMap.cs" />
     <Compile Include="EducationalAdministration\StuGraduateStatisticMap.cs" />
     <Compile Include="EducationalAdministration\TrainEquipmentManageMap.cs" />
+    <Compile Include="EducationalAdministration\TE_ConsumerGoodsApplyMap.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/TE_ConsumerGoodsApply/TE_ConsumerGoodsApplyBLL.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-31 11:22
+    /// 描 述：耗品申报
+    /// </summary>
+    public class TE_ConsumerGoodsApplyBLL : TE_ConsumerGoodsApplyIBLL
+    {
+        private TE_ConsumerGoodsApplyService tE_ConsumerGoodsApplyService = new TE_ConsumerGoodsApplyService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TE_ConsumerGoodsApplyEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return tE_ConsumerGoodsApplyService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TE_ConsumerGoodsApply表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TE_ConsumerGoodsApplyEntity GetTE_ConsumerGoodsApplyEntity(string keyValue)
+        {
+            try
+            {
+                return tE_ConsumerGoodsApplyService.GetTE_ConsumerGoodsApplyEntity(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
+            {
+                tE_ConsumerGoodsApplyService.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, TE_ConsumerGoodsApplyEntity entity)
+        {
+            try
+            {
+                tE_ConsumerGoodsApplyService.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/TE_ConsumerGoodsApply/TE_ConsumerGoodsApplyEntity.cs

@@ -0,0 +1,80 @@
+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-08-31 11:22
+    /// 描 述：耗品申报
+    /// </summary>
+    public class TE_ConsumerGoodsApplyEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 专业部
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 实训室名称
+        /// </summary>
+        [Column("TRAINNAME")]
+        public string TrainName { get; set; }
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        [Column("EQUIPMENTNAME")]
+        public string EquipmentName { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [Column("EQUIPMENTNUM")]
+        public string EquipmentNum { get; set; }
+        /// <summary>
+        /// 预算价格
+        /// </summary>
+        [Column("BUDGETPRICE")]
+        public decimal? BudgetPrice { get; set; }
+        /// <summary>
+        /// 申报人
+        /// </summary>
+        [Column("APPLYUSERID")]
+        public string ApplyUserId { get; set; }
+        /// <summary>
+        /// 申报时间
+        /// </summary>
+        [Column("APPLYTIME")]
+        public DateTime? ApplyTime { 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/TE_ConsumerGoodsApply/TE_ConsumerGoodsApplyIBLL.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-31 11:22
+    /// 描 述：耗品申报
+    /// </summary>
+    public interface TE_ConsumerGoodsApplyIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<TE_ConsumerGoodsApplyEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取TE_ConsumerGoodsApply表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        TE_ConsumerGoodsApplyEntity GetTE_ConsumerGoodsApplyEntity(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, TE_ConsumerGoodsApplyEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TE_ConsumerGoodsApply/TE_ConsumerGoodsApplyService.cs

@@ -0,0 +1,171 @@
+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-08-31 11:22
+    /// 描 述：耗品申报
+    /// </summary>
+    public class TE_ConsumerGoodsApplyService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TE_ConsumerGoodsApplyEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.DeptNo,
+                t.TrainName,
+                t.EquipmentName,
+                t.EquipmentNum,
+                t.BudgetPrice,
+                t.ApplyUserId,
+                t.ApplyTime
+                ");
+                strSql.Append("  FROM TE_ConsumerGoodsApply t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["TrainName"].IsEmpty())
+                {
+                    dp.Add("TrainName", "%" + queryParam["TrainName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.TrainName Like @TrainName ");
+                }
+                if (!queryParam["EquipmentName"].IsEmpty())
+                {
+                    dp.Add("EquipmentName", "%" + queryParam["EquipmentName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.EquipmentName Like @EquipmentName ");
+                }
+                if (!queryParam["ApplyUserId"].IsEmpty())
+                {
+                    dp.Add("ApplyUserId",queryParam["ApplyUserId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ApplyUserId = @ApplyUserId ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<TE_ConsumerGoodsApplyEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TE_ConsumerGoodsApply表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TE_ConsumerGoodsApplyEntity GetTE_ConsumerGoodsApplyEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<TE_ConsumerGoodsApplyEntity>(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<TE_ConsumerGoodsApplyEntity>(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, TE_ConsumerGoodsApplyEntity 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

@@ -1918,6 +1918,10 @@
     <Compile Include="EducationalAdministration\StudentCertificate\StudentCertificateService.cs" />
     <Compile Include="EducationalAdministration\StudentCertificate\StudentCertificateBLL.cs" />
     <Compile Include="EducationalAdministration\StudentCertificate\StudentCertificateIBLL.cs" />
+    <Compile Include="EducationalAdministration\TE_ConsumerGoodsApply\TE_ConsumerGoodsApplyEntity.cs" />
+    <Compile Include="EducationalAdministration\TE_ConsumerGoodsApply\TE_ConsumerGoodsApplyService.cs" />
+    <Compile Include="EducationalAdministration\TE_ConsumerGoodsApply\TE_ConsumerGoodsApplyBLL.cs" />
+    <Compile Include="EducationalAdministration\TE_ConsumerGoodsApply\TE_ConsumerGoodsApplyIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">