Merge branch 'yanshi' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into yanshi

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/ArchiveInfoController.cs

@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.CustomFunction;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.CustomFunction.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 15:42
+    /// 描 述：档案著录
+    /// </summary>
+    public class ArchiveInfoController : MvcControllerBase
+    {
+        private ArchiveInfoIBLL archiveInfoIBLL = new ArchiveInfoBLL();
+
+        #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 = archiveInfoIBLL.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 ArchiveInfoData = archiveInfoIBLL.GetArchiveInfoEntity( keyValue );
+            var jsonData = new {
+                ArchiveInfo = ArchiveInfoData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            archiveInfoIBLL.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)
+        {
+            ArchiveInfoEntity entity = strEntity.ToObject<ArchiveInfoEntity>();
+            archiveInfoIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/ArchiveRecordInfoController.cs

@@ -0,0 +1,120 @@
+using System;
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.CustomFunction;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.CustomFunction.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 16:30
+    /// 描 述：案卷著录
+    /// </summary>
+    public class ArchiveRecordInfoController : MvcControllerBase
+    {
+        private ArchiveRecordInfoIBLL archiveRecordInfoIBLL = new ArchiveRecordInfoBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            ViewBag.Year = DateTime.Now.Year;
+            ViewBag.Num = archiveRecordInfoIBLL.GetNum();
+             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 = archiveRecordInfoIBLL.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 ArchiveRecordInfoData = archiveRecordInfoIBLL.GetArchiveRecordInfoEntity( keyValue );
+            var jsonData = new {
+                ArchiveRecordInfo = ArchiveRecordInfoData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            archiveRecordInfoIBLL.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)
+        {
+            ArchiveRecordInfoEntity entity = strEntity.ToObject<ArchiveRecordInfoEntity>();
+            archiveRecordInfoIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/OfficialSealController.cs

@@ -106,7 +106,7 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
             var entity = officialSealIBLL.GetOfficialSealEntity(keyValue);
             entity.Enable = Enable;
             officialSealIBLL.SaveEntity(keyValue, entity);
-            return Success("删除成功！");
+            return Success("操作成功！");
         }
         /// <summary>
         /// 
@@ -121,6 +121,18 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
             return Success("操作成功！");
         }
         /// <summary>
+        /// 归还
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult Return(string keyValue)
+        {
+            officialSealIBLL.Return(keyValue);
+            return Success("操作成功！");
+        }
+        /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveInfo/Form.cshtml

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "档案著录";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveInfo">
+        <div class="lr-form-item-title">档案编号<font face="宋体">*</font></div>
+        <input id="EnCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveInfo">
+        <div class="lr-form-item-title">档案名称<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveInfo">
+        <div class="lr-form-item-title">档案分类<font face="宋体">*</font></div>
+        <div id="Type" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveInfo">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="File"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveInfo">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/ArchiveInfo/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveInfo/Form.js

@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-11 15:42
+ * 描  述：档案著录
+ */
+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 () {
+            $('#Type').lrDataItemSelect({ code: 'ArchiveType' });
+            $('#File').lrUploader();
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/ArchiveInfo/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 + '/CustomFunction/ArchiveInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveInfo/Index.cshtml

@@ -0,0 +1,41 @@
+@{
+    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="Name" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">档案分类</div>
+                                    <div id="Type"></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>
+                        <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/CustomFunction/Views/ArchiveInfo/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveInfo/Index.js

@@ -0,0 +1,107 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-11 15:42
+ * 描  述：档案著录
+ */
+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);
+            $('#Type').lrDataItemSelect({ code: 'ArchiveType' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/ArchiveInfo/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 + '/CustomFunction/ArchiveInfo/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 + '/CustomFunction/ArchiveInfo/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CustomFunction/ArchiveInfo/GetPageList',
+                headData: [
+                    { label: "档案名称", name: "Name", width: 100, align: "left" },
+                    {
+                        label: "档案分类", name: "Type", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ArchiveType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "备注", name: "Remark", width: 300, align: "left" },
+                    { label: "创建人", name: "CreateUserName", width: 100, align: "left" },
+                    { label: "创建时间", name: "CreateTime", 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/CustomFunction/Views/ArchiveRecordInfo/Form.cshtml

@@ -0,0 +1,47 @@
+@{
+    ViewBag.Title = "案卷著录";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="ArchiveRecordInfo">
+        <div class="lr-form-item-title">案卷名称<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ArchiveRecordInfo">
+        <div class="lr-form-item-title">案卷类别<font face="宋体">*</font></div>
+        <div id="Type" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="ArchiveRecordInfo">
+        <div class="lr-form-item-title">归档号<font face="宋体">*</font></div>
+        <input id="Code" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="ArchiveRecordInfo">
+        <div class="lr-form-item-title">年份<font face="宋体">*</font></div>
+        <input id="Year" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" value="@ViewBag.Year" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="ArchiveRecordInfo">
+        <div class="lr-form-item-title">流水号<font face="宋体">*</font></div>
+        <input id="Number" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" value="@ViewBag.Num" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ArchiveRecordInfo">
+        <div class="lr-form-item-title">案卷提名</div>
+        <input id="Nomination" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ArchiveRecordInfo">
+        <div class="lr-form-item-title">密级<font face="宋体">*</font></div>
+        <div id="Classification" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ArchiveRecordInfo">
+        <div class="lr-form-item-title">立卷人</div>
+        <input id="CreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ArchiveRecordInfo">
+        <div class="lr-form-item-title">立卷起始日期<font face="宋体">*</font></div>
+        <input id="StartTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#StartTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ArchiveRecordInfo">
+        <div class="lr-form-item-title">立卷截至日期<font face="宋体">*</font></div>
+        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#EndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/ArchiveRecordInfo/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveRecordInfo/Form.js

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-11 16:30
+ * 描  述：案卷著录
+ */
+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 () {
+            $('#Type').lrDataItemSelect({ code: 'ArchiveRecordType' });
+            $('#Classification').lrDataItemSelect({ code: 'SecretLevel' });
+            $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/ArchiveRecordInfo/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 + '/CustomFunction/ArchiveRecordInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveRecordInfo/Index.cshtml

@@ -0,0 +1,49 @@
+@{
+    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="Name" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">案卷类别</div>
+                                    <div id="Type"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">归档号</div>
+                                    <input id="Code" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">密级</div>
+                                    <div id="Classification"></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>
+                        <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/CustomFunction/Views/ArchiveRecordInfo/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ArchiveRecordInfo/Index.js

@@ -0,0 +1,137 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-11 16:30
+ * 描  述：案卷著录
+ */
+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);
+            $('#Type').lrDataItemSelect({ code: 'ArchiveRecordType' });
+            $('#Classification').lrDataItemSelect({ code: 'SecretLevel' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/ArchiveRecordInfo/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 + '/CustomFunction/ArchiveRecordInfo/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 + '/CustomFunction/ArchiveRecordInfo/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CustomFunction/ArchiveRecordInfo/GetPageList',
+                headData: [
+                    { label: "案卷名称", name: "Name", width: 100, align: "left"},
+                    { label: "案卷类别", name: "Type", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'ArchiveRecordType',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "归档号", name: "filecode", width: 150, align: "left"},
+                    
+                    { label: "案卷提名", name: "Nomination", width: 100, align: "left"},
+                    { label: "密级", name: "Classification", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'SecretLevel',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "立卷人", name: "CreateUserId", 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: "StartTime", width: 100, align: "left",
+                        formatter: function(value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "立卷截止日期", name: "EndTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        } },
+                ],
+                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/CustomFunction/Views/OfficialSeal/Index.cshtml

@@ -41,6 +41,7 @@
                             <li id="lr_disable"><a><i></i>&nbsp;<span class="lrlt">禁用</span></a></li>
                             <li id="lr_loss"><a><i></i>&nbsp;<span class="lrlt">挂失</span></a></li>
                             <li id="lr_noloss"><a><i></i>&nbsp;<span class="lrlt">取消挂失</span></a></li>
+                            <li id="lr_return"><a><i></i>&nbsp;<span class="lrlt">归还</span></a></li>
                             <li id="lr_xh"><a><i></i>&nbsp;<span class="lrlt">销毁</span></a></li>
                         </ul>
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/OfficialSeal/Index.js

@@ -138,6 +138,24 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+            // 归还
+            $('#lr_return').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != 1) {
+                        return learun.alert.warning('未借出无需归还！');
+                    }
+                    learun.layerConfirm('是否确认归还该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/CustomFunction/OfficialSeal/Return', { keyValue: keyValue, Status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
             // 打印
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/OfficialSealRecord/Index.js

@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             // 初始化左侧树形数据
             $('#dataTree').lrtree({
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetTree?code=OfficialSealData&parentId=type&Id=id&showId=name',
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetTree?code=OfficialSealInfo&parentId=type&Id=id&showId=name',
                 nodeClick: function (item) {
                     page.search({ SealId: item.value });
                 }
@@ -73,7 +73,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/CustomFunction/OfficialSealRecord/GetPageList',
                 headData: [
                     { label: "公章类型", name: "SealType", width: 100, align: "left",
@@ -89,17 +89,39 @@ var bootstrap = function ($, learun) {
                     { label: "公章名称", name: "SealId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('custmerData', {
-                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'OfficialSealData',
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'OfficialSealInfo',
                                  key: value,
                                  keyId: 'id',
                                  callback: function (_data) {
                                      callback(_data['name']);
                                  }
                              });
-                        }},
+                        }
+                    },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue == '0') {
+                                return '<span class=\"label label-success\">正常</span>';
+                            } else if (cellvalue == '1') {
+                                return '<span class=\"label label-warning\">借出</span>';
+                            } else if (cellvalue == '2') {
+                                return '<span class=\"label label-danger\">挂失</span>';
+                            } else if (cellvalue == '3') {
+                                return '<span class=\"label label-success\">归还</span>';
+                            }else if (cellvalue == '99') {
+                                return '<span class=\"label label-danger\">销毁</span>';
+                            }
+
+                        }
+                    },
+                    { label: "申请人", name: "ApplyUserName", width: 100, align: "left" },
+                    { label: "申请时间", name: "ApplyTime", width: 150, align: "left" },
                 ],
                 mainId:'Id',
-                isPage: true
+                isPage: true,
+                sidx: 'ApplyTime',
+                sord: 'ASC',
             });
             page.search();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/OfficialSealUse/Index.js

@@ -72,8 +72,12 @@ var bootstrap = function ($, learun) {
             // 提交
             $('#lr_submit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
-                
+
                 if (learun.checkrow(keyValue)) {
+                    var status = $('#gridtable').jfGridValue('Status');
+                    if (status != '0') {
+                        return learun.alert.warning('只有草稿状态才可提交！');
+                    }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/CustomFunction/OfficialSealUse/UpdateStatus', { keyValue: keyValue, Status: 1 }, function () {
@@ -151,7 +155,7 @@ var bootstrap = function ($, learun) {
                             if (cellvalue == 0) {
                                 return "<span class=\"label label-default\">草稿</span>";
                             } else if (cellvalue == 1) {
-                                return "<span class=\"label label-success\">审批中</span>";
+                                return "<span class=\"label label-success\">进行中</span>";
                             } else if (cellvalue == 2) {
                                 return "<span class=\"label label-warning\">已通过</span>";
                             } else if (cellvalue == 99) {

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

@@ -823,6 +823,8 @@
     <Compile Include="Areas\CustomFunction\Controllers\OfficialSealUseController.cs" />
     <Compile Include="Areas\CustomFunction\Controllers\OfficialSealRecordController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\DtStuLeaveController.cs" />
+    <Compile Include="Areas\CustomFunction\Controllers\ArchiveInfoController.cs" />
+    <Compile Include="Areas\CustomFunction\Controllers\ArchiveRecordInfoController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6432,6 +6434,14 @@
     <Content Include="Areas\LogisticsManagement\Views\pxzhusuguanli\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\pxzhusuguanli\Form.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\pxzhusuguanli\Form.js" />
+    <Content Include="Areas\CustomFunction\Views\ArchiveInfo\Index.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ArchiveInfo\Index.js" />
+    <Content Include="Areas\CustomFunction\Views\ArchiveInfo\Form.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ArchiveInfo\Form.js" />
+    <Content Include="Areas\CustomFunction\Views\ArchiveRecordInfo\Index.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ArchiveRecordInfo\Index.js" />
+    <Content Include="Areas\CustomFunction\Views\ArchiveRecordInfo\Form.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ArchiveRecordInfo\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/CustomFunction/ArchiveInfoMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.CustomFunction;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 15:42
+    /// 描 述：档案著录
+    /// </summary>
+    public class ArchiveInfoMap : EntityTypeConfiguration<ArchiveInfoEntity>
+    {
+        public ArchiveInfoMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("ARCHIVEINFO");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/CustomFunction/ArchiveRecordInfoMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.CustomFunction;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 16:30
+    /// 描 述：案卷著录
+    /// </summary>
+    public class ArchiveRecordInfoMap : EntityTypeConfiguration<ArchiveRecordInfoEntity>
+    {
+        public ArchiveRecordInfoMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("ARCHIVERECORDINFO");
+            //主键
+            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

@@ -572,6 +572,8 @@
     <Compile Include="CustomFunction\OfficialSealUseMap.cs" />
     <Compile Include="CustomFunction\OfficialSealRecordMap.cs" />
     <Compile Include="EducationalAdministration\DtStuLeaveMap.cs" />
+    <Compile Include="CustomFunction\ArchiveInfoMap.cs" />
+    <Compile Include="CustomFunction\ArchiveRecordInfoMap.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/CustomFunction/ArchiveInfo/ArchiveInfoBLL.cs

@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 15:42
+    /// 描 述：档案著录
+    /// </summary>
+    public class ArchiveInfoBLL : ArchiveInfoIBLL
+    {
+        private ArchiveInfoService archiveInfoService = new ArchiveInfoService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ArchiveInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return archiveInfoService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ArchiveInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ArchiveInfoEntity GetArchiveInfoEntity(string keyValue)
+        {
+            try
+            {
+                return archiveInfoService.GetArchiveInfoEntity(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
+            {
+                archiveInfoService.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, ArchiveInfoEntity entity)
+        {
+            try
+            {
+                archiveInfoService.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/CustomFunction/ArchiveInfo/ArchiveInfoEntity.cs

@@ -0,0 +1,129 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 15:42
+    /// 描 述：档案著录
+    /// </summary>
+    public class ArchiveInfoEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 档案名称
+        /// </summary>
+        [Column("NAME")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 档案编号
+        /// </summary>
+        [Column("ENCODE")]
+        public string EnCode { get; set; }
+        /// <summary>
+        /// 档案分类
+        /// </summary>
+        [Column("TYPE")]
+        public string Type { get; set; }
+        /// <summary>
+        /// 附件
+        /// </summary>
+        [Column("FILE")]
+        public string File { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("CREATEUSERNAME")]
+        public string CreateUserName { get; set; }
+        /// <summary>
+        /// 所属案卷Id
+        /// </summary>
+        [Column("RECORDID")]
+        public string RecordId { get; set; }
+        /// <summary>
+        /// 归档序号
+        /// </summary>
+        [Column("RECORDNUM")]
+        public string RecordNum { get; set; }
+        /// <summary>
+        /// 案卷归档号+档案归档序号
+        /// </summary>
+        [Column("RECORDCODE")]
+        public string RecordCode { get; set; }
+        /// <summary>
+        /// 文号
+        /// </summary>
+        [Column("DOCUMENTNUM")]
+        public string DocumentNum { get; set; }
+        /// <summary>
+        /// 提名
+        /// </summary>
+        [Column("NOMINATION")]
+        public string Nomination { get; set; }
+        /// <summary>
+        /// 责任者
+        /// </summary>
+        [Column("MANAGEUSERID")]
+        public string ManageUserId { get; set; }
+        /// <summary>
+        /// 件号
+        /// </summary>
+        [Column("PARTNUM")]
+        public string PartNum { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Column("STATUS")]
+        public int? Status { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+            var userinfo = LoginUserInfo.Get();
+            this.CreateUserId = userinfo.userId;
+            this.CreateUserName = userinfo.realName;
+            this.CreateTime=DateTime.Now;
+        }
+        /// <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/CustomFunction/ArchiveInfo/ArchiveInfoIBLL.cs

@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 15:42
+    /// 描 述：档案著录
+    /// </summary>
+    public interface ArchiveInfoIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ArchiveInfoEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取ArchiveInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        ArchiveInfoEntity GetArchiveInfoEntity(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, ArchiveInfoEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ArchiveInfo/ArchiveInfoService.cs

@@ -0,0 +1,158 @@
+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.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 15:42
+    /// 描 述：档案著录
+    /// </summary>
+    public class ArchiveInfoService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ArchiveInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.Name,
+                t.Type,
+                t.Remark,
+t.EnCode,t.CreateTime,t.CreateUserName
+                ");
+                strSql.Append("  FROM ArchiveInfo t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Name"].IsEmpty())
+                {
+                    dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Name Like @Name ");
+                }
+                if (!queryParam["Type"].IsEmpty())
+                {
+                    dp.Add("Type",queryParam["Type"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Type = @Type ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<ArchiveInfoEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ArchiveInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ArchiveInfoEntity GetArchiveInfoEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<ArchiveInfoEntity>(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<ArchiveInfoEntity>(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, ArchiveInfoEntity 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/CustomFunction/ArchiveRecordInfo/ArchiveRecordInfoBLL.cs

@@ -0,0 +1,149 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 16:30
+    /// 描 述：案卷著录
+    /// </summary>
+    public class ArchiveRecordInfoBLL : ArchiveRecordInfoIBLL
+    {
+        private ArchiveRecordInfoService archiveRecordInfoService = new ArchiveRecordInfoService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ArchiveRecordInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return archiveRecordInfoService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ArchiveRecordInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ArchiveRecordInfoEntity GetArchiveRecordInfoEntity(string keyValue)
+        {
+            try
+            {
+                return archiveRecordInfoService.GetArchiveRecordInfoEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取流水号
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public string GetNum()
+        {
+            try
+            {
+                return archiveRecordInfoService.GetNum();
+            }
+            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
+            {
+                archiveRecordInfoService.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, ArchiveRecordInfoEntity entity)
+        {
+            try
+            {
+                archiveRecordInfoService.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/CustomFunction/ArchiveRecordInfo/ArchiveRecordInfoEntity.cs

@@ -0,0 +1,147 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 16:30
+    /// 描 述：案卷著录
+    /// </summary>
+    public class ArchiveRecordInfoEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 案卷名称
+        /// </summary>
+        [Column("NAME")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 案卷分类
+        /// </summary>
+        [Column("TYPE")]
+        public string Type { get; set; }
+        /// <summary>
+        /// 归档号
+        /// </summary>
+        [Column("CODE")]
+        public string Code { get; set; }
+        /// <summary>
+        /// 年份
+        /// </summary>
+        [Column("YEAR")]
+        public string Year { get; set; }
+        /// <summary>
+        /// 流水号
+        /// </summary>
+        [Column("NUMBER")]
+        public string Number { get; set; }
+        /// <summary>
+        /// 案卷提名
+        /// </summary>
+        [Column("NOMINATION")]
+        public string Nomination { get; set; }
+        /// <summary>
+        /// 密级
+        /// </summary>
+        [Column("CLASSIFICATION")]
+        public string Classification { get; set; }
+        /// <summary>
+        /// 立卷起始日期
+        /// </summary>
+        [Column("STARTTIME")]
+        public DateTime? StartTime { get; set; }
+        /// <summary>
+        /// 立卷截至日期
+        /// </summary>
+        [Column("ENDTIME")]
+        public DateTime? EndTime { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("CREATEUSERNAME")]
+        public string CreateUserName { get; set; }
+        /// <summary>
+        /// IsDelete
+        /// </summary>
+        [Column("ISDELETE")]
+        public bool? IsDelete { get; set; }
+        /// <summary>
+        /// DeleteUserId
+        /// </summary>
+        [Column("DELETEUSERID")]
+        public string DeleteUserId { get; set; }
+        /// <summary>
+        /// DeleteTime
+        /// </summary>
+        [Column("DELETETIME")]
+        public DateTime? DeleteTime { get; set; }
+        /// <summary>
+        /// LastModifyTime
+        /// </summary>
+        [Column("LASTMODIFYTIME")]
+        public DateTime? LastModifyTime { get; set; }
+        /// <summary>
+        /// LastModifyUserId
+        /// </summary>
+        [Column("LASTMODIFYUSERID")]
+        public string LastModifyUserId { get; set; }
+        /// <summary>
+        /// LastModifyName
+        /// </summary>
+        [Column("LASTMODIFYNAME")]
+        public string LastModifyName { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+            var userinfo = LoginUserInfo.Get();
+            this.CreateUserId = userinfo.userId;
+            this.CreateUserName = userinfo.realName;
+            this.CreateTime = DateTime.Now;
+            this.IsDelete = false;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+            var userinfo = LoginUserInfo.Get();
+            this.LastModifyUserId = userinfo.userId;
+            this.LastModifyName = userinfo.realName;
+            this.LastModifyTime = DateTime.Now;
+        }
+        #endregion
+        #region 扩展字段
+        
+        [NotMapped]
+        public string filecode { get; set; }
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ArchiveRecordInfo/ArchiveRecordInfoIBLL.cs

@@ -0,0 +1,53 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 16:30
+    /// 描 述：案卷著录
+    /// </summary>
+    public interface ArchiveRecordInfoIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ArchiveRecordInfoEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取ArchiveRecordInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        ArchiveRecordInfoEntity GetArchiveRecordInfoEntity(string keyValue);
+        /// <summary>
+        /// 获取流水号
+        /// </summary>
+        /// <returns></returns>
+        string GetNum();
+        #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, ArchiveRecordInfoEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ArchiveRecordInfo/ArchiveRecordInfoService.cs

@@ -0,0 +1,220 @@
+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.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-11 16:30
+    /// 描 述：案卷著录
+    /// </summary>
+    public class ArchiveRecordInfoService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ArchiveRecordInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.Name,
+                t.Type,
+                t.Code,
+                t.Year,
+                t.Number,
+                t.Nomination,
+                t.Classification,
+                t.CreateUserId,
+(t.Code+t.Year+t.Number) as filecode,t.StartTime,t.EndTime
+                ");
+                strSql.Append("  FROM ArchiveRecordInfo t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Name"].IsEmpty())
+                {
+                    dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Name Like @Name ");
+                }
+                if (!queryParam["Type"].IsEmpty())
+                {
+                    dp.Add("Type", queryParam["Type"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Type = @Type ");
+                }
+                if (!queryParam["Code"].IsEmpty())
+                {
+                    dp.Add("Code", "%" + queryParam["Code"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Code Like @Code ");
+                }
+                if (!queryParam["Classification"].IsEmpty())
+                {
+                    dp.Add("Classification", queryParam["Classification"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Classification = @Classification ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<ArchiveRecordInfoEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ArchiveRecordInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ArchiveRecordInfoEntity GetArchiveRecordInfoEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<ArchiveRecordInfoEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取流水号
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public string GetNum()
+        {
+            try
+            {
+                string str = "";
+                var year = DateTime.Now.Year;
+                var sql = $"select max(Number) from ArchiveRecordInfo where [year]='{year}' ";
+                var obj = this.BaseRepository("CollegeMIS").FindObject(sql);
+                //流水号4位数，不足前面补0，超过加一位数
+                int ws = 4;
+                if (obj == null)
+                {
+                    str = 1.ToString().PadLeft(ws, '0');
+                }
+                else
+                {
+                    var num = Convert.ToInt32(obj) + 1;
+                    if (Math.Abs(num).ToString().Length <= ws)
+                    {
+                        str = num.ToString().PadLeft(ws, '0');
+                    }
+                    else
+                    {
+                        str = num.ToString();
+                    }
+                }
+
+                return str;
+            }
+            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<ArchiveRecordInfoEntity>(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, ArchiveRecordInfoEntity 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/CustomFunction/OfficialSeal/OfficialSealBLL.cs

@@ -116,6 +116,31 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 }
             }
         }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void Return(string keyValue)
+        {
+            try
+            {
+                officialSealService.Return(keyValue);
+            }
+            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/CustomFunction/OfficialSeal/OfficialSealIBLL.cs

@@ -48,6 +48,11 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// <param name="keyValue"></param>
         /// <param name="Status"></param>
         void UpdateStatus(string keyValue, string Status);
+        /// <summary>
+        /// 归还
+        /// </summary>
+        /// <param name=""></param>
+        void Return(string keyValue);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/OfficialSeal/OfficialSealService.cs

@@ -144,6 +144,47 @@ t.Status
                 }
             }
         }
+
+
+        /// <summary>
+        /// 归还
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void Return(string keyValue)
+        {
+            try
+            {
+                var db = this.BaseRepository("CollegeMIS").BeginTrans();
+                var entity = this.BaseRepository("CollegeMIS").FindEntity<OfficialSealEntity>(keyValue);
+                entity.Status = "0";
+                db.Update(entity);
+
+                var userInfo = LoginUserInfo.Get();
+                OfficialSealRecordEntity RecordEntity = new OfficialSealRecordEntity();
+                RecordEntity.Create();
+                RecordEntity.SealId = entity.Id;
+                RecordEntity.SealType = entity.Type;
+                RecordEntity.Status = 3;//归还
+                RecordEntity.ApplyUserId = userInfo.userId;
+                RecordEntity.ApplyUserName = userInfo.realName;
+                RecordEntity.ApplyTime = DateTime.Now;
+                db.Insert(RecordEntity);
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/OfficialSealRecord/OfficialSealRecordService.cs

@@ -32,9 +32,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(@"
-                t.Id,
-                t.SealType,
-                t.SealId
+                t.*
                 ");
                 strSql.Append("  FROM OfficialSealRecord t ");
                 strSql.Append("  WHERE 1=1 ");

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/OfficialSealUse/OfficialSealUseEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
     /// 日 期：2021-06-09 16:19
     /// 描 述：公章申请审批
     /// </summary>
-    public class OfficialSealUseEntity 
+    public class OfficialSealUseEntity
     {
         #region 实体成员
         /// <summary>
@@ -64,7 +64,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         {
             this.Id = Guid.NewGuid().ToString();
             this.Status = 0;
-
+            this.ApplyUserName = LoginUserInfo.Get().realName;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/OfficialSealUse/OfficialSealUseService.cs

@@ -127,7 +127,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
 
 
         /// <summary>
-        /// 
+        /// 审批通过
         /// </summary>
         /// <param name="keyValue">主键</param>
         public void UpdateStatus(string keyValue, int Status)
@@ -138,13 +138,18 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 OfficialSealUseEntity entity = GetOfficialSealUseEntity(keyValue);
                 entity.Status = Status;
                 db.Update(entity);
-                if (Status == 2)
+                OfficialSealEntity sealEntity = this.BaseRepository("CollegeMIS")
+                    .FindEntity<OfficialSealEntity>(x => x.Id == entity.SealId);
+                sealEntity.Status = "1";
+                db.Update(sealEntity);
+
+                if (Status == 2)//审批通过
                 {
                     OfficialSealRecordEntity RecordEntity = new OfficialSealRecordEntity();
                     RecordEntity.Create();
                     RecordEntity.SealId = entity.SealId;
                     RecordEntity.SealType = entity.Type;
-                    RecordEntity.Status = 1;
+                    RecordEntity.Status = 1;//借出
                     RecordEntity.ApplyUserId = entity.ApplyUserId;
                     RecordEntity.ApplyUserName = entity.ApplyUserName;
                     RecordEntity.ApplyTime = DateTime.Now;
@@ -165,6 +170,9 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 }
             }
         }
+
+
+
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>

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

@@ -1706,6 +1706,14 @@
     <Compile Include="EducationalAdministration\DtStuLeave\DtStuLeaveService.cs" />
     <Compile Include="EducationalAdministration\DtStuLeave\DtStuLeaveBLL.cs" />
     <Compile Include="EducationalAdministration\DtStuLeave\DtStuLeaveIBLL.cs" />
+    <Compile Include="CustomFunction\ArchiveInfo\ArchiveInfoEntity.cs" />
+    <Compile Include="CustomFunction\ArchiveInfo\ArchiveInfoService.cs" />
+    <Compile Include="CustomFunction\ArchiveInfo\ArchiveInfoBLL.cs" />
+    <Compile Include="CustomFunction\ArchiveInfo\ArchiveInfoIBLL.cs" />
+    <Compile Include="CustomFunction\ArchiveRecordInfo\ArchiveRecordInfoEntity.cs" />
+    <Compile Include="CustomFunction\ArchiveRecordInfo\ArchiveRecordInfoService.cs" />
+    <Compile Include="CustomFunction\ArchiveRecordInfo\ArchiveRecordInfoBLL.cs" />
+    <Compile Include="CustomFunction\ArchiveRecordInfo\ArchiveRecordInfoIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">