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

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

@@ -37,6 +37,24 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
         {
              return View();
         }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexZJ()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormZJ()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据

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

@@ -106,10 +106,16 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             CostInvoiceEntity entity = strEntity.ToObject<CostInvoiceEntity>();
-            costInvoiceIBLL.SaveEntity(keyValue, entity);
-            if (string.IsNullOrEmpty(keyValue))
+            var InvoiceCode = costInvoiceIBLL.GetTicketEntity(entity.Number);
+            if (string.IsNullOrEmpty(keyValue) && InvoiceCode != null)
+            {
+                return Fail("编码已存在，请重新输入！");
+            }
+            else if (!string.IsNullOrEmpty(keyValue) && (InvoiceCode != null && InvoiceCode.Id != keyValue))
             {
+                return Fail("编码已存在，请重新输入！");
             }
+            costInvoiceIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/FormZJ.cshtml

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "合同台账管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">项目名称<font face="宋体">*</font></div>
+        <div id="ContractId" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">项目已支付金额<font face="宋体">*</font></div>
+        <input id="PayAmount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">剩余金额<font face="宋体">*</font></div>
+        <input id="Balance" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    @*<div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">合同份数</div>
+        <input id="Num" type="number" class="form-control"  />
+    </div>*@
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">执行情况</div>
+        <input id="Desc" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">备注</div>
+        <input id="Remark" type="text" class="form-control"  />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/ContractStandingBook/FormZJ.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/FormZJ.js

@@ -0,0 +1,51 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-08-05 16:45
+ * 描  述：合同台账管理
+ */
+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 () {
+            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo',value: 'id',text: 'name' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/ContractStandingBook/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/ContractStandingBook/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/IndexZJ.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>
+                                    <div id="ContractId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">项目已支付金额</div>
+                                    <input id="PayAmount" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">剩余金额</div>
+                                    <input id="Balance" type="text" class="form-control" />
+                                </div>
+                                @*<div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">资金份数</div>
+                                    <input id="Num" type="text" class="form-control" />
+                                </div>*@
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/ContractStandingBook/IndexZJ.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/IndexZJ.js

@@ -0,0 +1,107 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-08-05 16:45
+ * 描  述：资金台账管理
+ */
+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);
+            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo',value: 'id',text: 'name' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/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/ContractStandingBook/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/ContractStandingBook/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/GetPageList',
+                headData: [
+                    { label: "资金名称", name: "ContractId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ContractInfo',
+                                 key: value,
+                                 keyId: 'id',
+                                 callback: function (_data) {
+                                     callback(_data['name']);
+                                 }
+                             });
+                        }},
+                    { label: "项目已支付金额", name: "PayAmount", width: 100, align: "left"},
+                    { label: "剩余金额", name: "Balance", width: 100, align: "left"},
+                    //{ label: "资金份数", name: "Num", width: 100, align: "left"},
+                    { label: "执行情况", name: "Desc", width: 100, align: "left"},
+                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -105,10 +105,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             DtInvoiceEntity entity = strEntity.ToObject<DtInvoiceEntity>();
-            dtInvoiceIBLL.SaveEntity(keyValue,entity);
-            if (string.IsNullOrEmpty(keyValue))
+            var InvoiceCode = dtInvoiceIBLL.GetTicketEntity(entity.InvoiceNo);
+            if (string.IsNullOrEmpty(keyValue) && InvoiceCode != null)
+            {
+                return Fail("编码已存在，请重新输入！");
+            }
+            else if (!string.IsNullOrEmpty(keyValue) && (InvoiceCode != null && InvoiceCode.Id != keyValue))
             {
+                return Fail("编码已存在，请重新输入！");
             }
+            dtInvoiceIBLL.SaveEntity(keyValue,entity);
             return Success("保存成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/RegisterInfoController.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-14 12:31
+    /// 描 述：人员登记 班主任来访
+    /// </summary>
+    public class RegisterInfoController : MvcControllerBase
+    {
+        private RegisterInfoIBLL registerInfoIBLL = new RegisterInfoBLL();
+
+        #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 = registerInfoIBLL.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 RegisterInfoData = registerInfoIBLL.GetRegisterInfoEntity( keyValue );
+            var jsonData = new {
+                RegisterInfo = RegisterInfoData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            registerInfoIBLL.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)
+        {
+            RegisterInfoEntity entity = strEntity.ToObject<RegisterInfoEntity>();
+            registerInfoIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtHonorInfo/AuditForm.cshtml

@@ -11,12 +11,12 @@
         <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 class="col-xs-6 lr-form-item" data-table="DtHonorInfo">
+    @*<div class="col-xs-6 lr-form-item" data-table="DtHonorInfo">
         <div class="lr-form-item-title">所属系<font face="宋体">*</font></div>
         <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="DtHonorInfo">
-        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">荣誉称号<font face="宋体">*</font></div>
         <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="DtHonorInfo">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtHonorInfo/AuditForm.js

@@ -51,42 +51,7 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            //专业和班级
-            $('#MajorNo').lrDataSourceSelect({
-                code: 'CdDeptInfo',
-                value: 'deptno',
-                text: 'deptname',
-                maxHeight: 200,
-                select: function (item) {
-                    var DeptNo = $("#MajorNo").lrselectGet();
-                    if (DeptNo != null && DeptNo != "" && DeptNo != undefined) {
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: " 1=1 and deptno in (" + DeptNo + ")" },
-                            value: "classno",
-                            text: "classname",
-                            allowSearch: false,
-                            maxHeight: 200,
-                            select: function (item) {
-                                var ClassNo = $("#ClassNo").lrselectGet();
-                                if (ClassNo != null && ClassNo != "" && ClassNo != undefined) {
-                                    $('#StuNo').lrselectRefresh({
-                                        url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuList',
-                                        param: { strWhere: " 1=1 and classno in (" + ClassNo + ")" },
-                                        value: "stuid",
-                                        text: "stuname",
-                                        maxHeight: 200,
-                                        allowSearch: true
-                                    });
-                                }
-                            }
-                        });
-                    } else {
-                        $("#ClassNo").lrselect();
-                    }
-                }
-            });
-            $("#ClassNo").lrselect();
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#Emester').lrDataItemSelect({ code: 'Semester' });
             $('#CareteUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#CareteUser').val(learun.clientdata.get(['userinfo']).realName);

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

@@ -11,16 +11,16 @@
         <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 class="col-xs-6 lr-form-item"  data-table="DtHonorInfo" >
-        <div class="lr-form-item-title">所属系<font face="宋体">*</font></div>
+    @*<div class="col-xs-6 lr-form-item"  data-table="DtHonorInfo" >
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" isvalid="yes" checkexpession="NotNull" ></div>
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item"  data-table="DtHonorInfo" >
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
         <div id="ClassNo" isvalid="yes" checkexpession="NotNull" ></div>
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="DtHonorInfo" >
-        <div class="lr-form-item-title">类型<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">荣誉称号<font face="宋体">*</font></div>
         <div id="ItemId" isvalid="yes" checkexpession="NotNull" ></div>
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="DtHonorInfo" >

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

@@ -51,42 +51,7 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            //专业和班级
-            $('#MajorNo').lrDataSourceSelect({
-                code: 'CdDeptInfo',
-                value: 'deptno',
-                text: 'deptname',
-                maxHeight: 200,
-                select: function (item) {
-                    var DeptNo = $("#MajorNo").lrselectGet();
-                    if (DeptNo != null && DeptNo != "" && DeptNo != undefined) {
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: " 1=1 and deptno in (" + DeptNo + ")" },
-                            value: "classno",
-                            text: "classname",
-                            allowSearch: false,
-                            maxHeight: 200,
-                            select: function (item) {
-                                var ClassNo = $("#ClassNo").lrselectGet();
-                                if (ClassNo != null && ClassNo != "" && ClassNo != undefined) {
-                                    $('#StuNo').lrselectRefresh({
-                                        url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuList',
-                                        param: { strWhere: " 1=1 and classno in (" + ClassNo + ")" },
-                                        value: "stuid",
-                                        text: "stuname",
-                                        maxHeight: 200,
-                                        allowSearch: true
-                                    });
-                                }
-                            }
-                        });
-                    } else {
-                        $("#ClassNo").lrselect();
-                    }
-                }
-            });
-            $("#ClassNo").lrselect();
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#Emester').lrDataItemSelect({ code: 'Semester' });
             $('#CareteUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#CareteUser').val(learun.clientdata.get(['userinfo']).realName);

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

@@ -13,16 +13,16 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">所属系</div>
+                                @*<div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
+                                </div>*@
+                                <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">类型</div>
+                                    <div class="lr-form-item-title">荣誉称号</div>
                                     <div id="ItemId"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">

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

@@ -48,42 +48,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#ItemId').lrHonorTypeSelect();
             $('#Cycle').lrDataItemSelect({ code: 'ThisCycle' });
-            //专业和班级
-            $('#MajorNo').lrDataSourceSelect({
-                code: 'CdDeptInfo',
-                value: 'deptno',
-                text: 'deptname',
-                maxHeight: 200,
-                select: function (item) {
-                    var DeptNo = $("#MajorNo").lrselectGet();
-                    if (DeptNo != null && DeptNo != "" && DeptNo != undefined) {
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: " 1=1 and deptno in (" + DeptNo + ")" },
-                            value: "classno",
-                            text: "classname",
-                            allowSearch: false,
-                            maxHeight: 200,
-                            select: function (item) {
-                                var ClassNo = $("#ClassNo").lrselectGet();
-                                if (ClassNo != null && ClassNo != "" && ClassNo != undefined) {
-                                    $('#StuNo').lrselectRefresh({
-                                        url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuList',
-                                        param: { strWhere: " 1=1 and classno in (" + ClassNo + ")" },
-                                        value: "stuid",
-                                        text: "stuname",
-                                        maxHeight: 200,
-                                        allowSearch: true
-                                    });
-                                }
-                            }
-                        });
-                    } else {
-                        $("#ClassNo").lrselect();
-                    }
-                }
-            });
-            $("#ClassNo").lrselect();
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             //学年
             $('#SchoolYear').lrselect({
                 placeholder: "请选择学年",

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

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "人员登记 班主任来访";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="SignUpAboutOnline">
+        <div class="lr-form-item-title">类型<font face="宋体">*</font></div>
+        <div id="Type" type="text" class="form-control"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RegisterInfo">
+        <div class="lr-form-item-title">来访人员</div>
+        <input id="VisitorName" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RegisterInfo">
+        <div class="lr-form-item-title">宿舍</div>
+        <input id="Dorm" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RegisterInfo">
+        <div class="lr-form-item-title">寻访人员</div>
+        <input id="AddName" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RegisterInfo">
+        <div class="lr-form-item-title">时间</div>
+        <input id="AddTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AddTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="RegisterInfo">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Demo" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/RegisterInfo/Form.js")

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

@@ -0,0 +1,51 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-14 12:31
+ * 描  述：人员登记 班主任来访
+ */
+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: 'RegistrationType' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/RegisterInfo/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/RegisterInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,45 @@
+@{
+    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="Dorm" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">寻访人员</div>
+                                    <input id="AddName" 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/EducationalAdministration/Views/RegisterInfo/Index.js")

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

@@ -0,0 +1,96 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-14 12:31
+ * 描  述：人员登记 班主任来访
+ */
+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: 'RegistrationType' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/RegisterInfo/Form',
+                    width: 500,
+                    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/RegisterInfo/Form?keyValue=' + keyValue,
+                        width: 500,
+                        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/RegisterInfo/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/RegisterInfo/GetPageList',
+                headData: [
+                    { label: "时间", name: "AddTime", width: 100, align: "left"},
+                    { label: "来访人员", name: "VisitorName", width: 100, align: "left"},
+                    { label: "宿舍", name: "Dorm", width: 100, align: "left"},
+                    { label: "寻访人员", name: "AddName", width: 100, align: "left"},
+                    { label: "备注", name: "Demo", 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/LogisticsManagement/Views/Accommodation/Index.js

@@ -181,8 +181,8 @@ var bootstrap = function ($, learun) {
                                 });
                             }
                         },
-                        { label: "负责人", name: "Functionary", width: 100, align: "left" },
-                        { label: "负责人电话", name: "Phone", width: 100, align: "left" },
+                        { label: "舍长", name: "Functionary", width: 100, align: "left" },
+                        { label: "舍长电话", name: "Phone", width: 100, align: "left" },
                         { label: "价格", name: "Price", width: 100, align: "left" },
                         { label: "星级", name: "Starred", width: 100, align: "left" },
                         {
@@ -198,7 +198,7 @@ var bootstrap = function ($, learun) {
                             }
                         },
                         { label: "舍长", name: "Leader", width: 100, align: "left" },
-                        { label: "备注", name: "Remark", width: 100, align: "left" },
+                        { label: "指定生活委员", name: "Remark", width: 100, align: "left" },
                     ],
                     mainId: 'ID',
                     isPage: true,
@@ -275,9 +275,9 @@ var bootstrap = function ($, learun) {
                                 });
                             }
                         },
-                        { label: "负责人", name: "Functionary", width: 100, align: "left" },
-                        { label: "负责人电话", name: "Phone", width: 100, align: "left" },
-                        { label: "备注", name: "Remark", width: 100, align: "left" },
+                        { label: "舍长", name: "Functionary", width: 100, align: "left" },
+                        { label: "舍长电话", name: "Phone", width: 100, align: "left" },
+                        { label: "指定生活委员", name: "Remark", width: 100, align: "left" },
                     ],
                     mainId: 'ID',
                     isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchMent/Form.cshtml

@@ -3,6 +3,10 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="ResearchMent">
+        <div class="lr-form-item-title">负责部门</div>
+        <div id="DepartmentId"></div>
+    </div>
     <div class="col-xs-6 lr-form-item"  data-table="ResearchMent" >
         <div class="lr-form-item-title">姓名</div>
         <input id="MentName" type="text" class="form-control"  />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchMent/Form.js

@@ -23,6 +23,7 @@ var bootstrap = function ($, learun) {
             $('#Learn').lrDataItemSelect({ code: 'CollegeType' });
             $('#ResearchGroup').lrDataItemSelect({ code: 'SubjectSpecies' });
             $('#IfSchool').lrDataItemSelect({ code: 'EmpFullTime' });
+            $('#DepartmentId').lrDepartmentSelect();
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchMent/Index.js

@@ -73,7 +73,20 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/ResearchMent/GetPageList',
                 headData: [
-                    { label: "姓名", name: "MentName", width: 100, align: "left"},
+                    { label: "姓名", name: "MentName", width: 100, align: "left" },
+                    {
+                        label: "部门", name: "DepartmentId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
                     { label: "人员类型", name: "IfSchool", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('dataItem', {

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

@@ -872,6 +872,7 @@
     <Compile Include="Areas\CustomFunction\Controllers\CertificateInfoController.cs" />
     <Compile Include="Areas\CustomFunction\Controllers\BudgetApplyController.cs" />
     <Compile Include="Areas\CustomFunction\Controllers\CostInvoiceController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\RegisterInfoController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -997,6 +998,8 @@
     <Content Include="Areas\CustomFunction\Views\ContractInfo\FormSign.js" />
     <Content Include="Areas\CustomFunction\Views\ContractInfo\IndexSign.js" />
     <Content Include="Areas\CustomFunction\Views\ContractInfo\IndexFile.js" />
+    <Content Include="Areas\CustomFunction\Views\ContractStandingBook\FormZJ.js" />
+    <Content Include="Areas\CustomFunction\Views\ContractStandingBook\IndexZJ.js" />
     <Content Include="Areas\CustomFunction\Views\EstimateRetire\FormYT.js" />
     <Content Include="Areas\CustomFunction\Views\EstimateRetire\IndexYT.js" />
     <Content Include="Areas\CustomFunction\Views\OfficialSealRecord\Form.js" />
@@ -6732,6 +6735,10 @@
     <Content Include="Areas\CustomFunction\Views\CostInvoice\Index.js" />
     <Content Include="Areas\CustomFunction\Views\CostInvoice\Form.cshtml" />
     <Content Include="Areas\CustomFunction\Views\CostInvoice\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\RegisterInfo\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\RegisterInfo\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\RegisterInfo\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\RegisterInfo\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />
@@ -7629,6 +7636,8 @@
     <Content Include="Areas\CustomFunction\Views\SecurityCheckManage\Index2.cshtml" />
     <Content Include="Areas\CustomFunction\Views\BudgetApply\IndexAdjust.cshtml" />
     <Content Include="Areas\CustomFunction\Views\BudgetApply\FormAdjust.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ContractStandingBook\IndexZJ.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ContractStandingBook\FormZJ.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/RegisterInfoMap.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-14 12:31
+    /// 描 述：人员登记 班主任来访
+    /// </summary>
+    public class RegisterInfoMap : EntityTypeConfiguration<RegisterInfoEntity>
+    {
+        public RegisterInfoMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("REGISTERINFO");
+            //主键
+            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

@@ -621,6 +621,7 @@
     <Compile Include="CustomFunction\CertificateInfoMap.cs" />
     <Compile Include="CustomFunction\BudgetApplyMap.cs" />
     <Compile Include="CustomFunction\CostInvoiceMap.cs" />
+    <Compile Include="EducationalAdministration\RegisterInfoMap.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/CostInvoice/CostInvoiceBLL.cs

@@ -67,6 +67,30 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
             }
         }
 
+        /// <summary>
+        /// 获取发票号实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public CostInvoiceEntity GetTicketEntity(string Number)
+        {
+            try
+            {
+                return costInvoiceService.GetTicketEntity(Number);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/CostInvoice/CostInvoiceIBLL.cs

@@ -27,6 +27,13 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         CostInvoiceEntity GetCostInvoiceEntity(string keyValue);
+
+        /// <summary>
+        /// 获取发票号实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        CostInvoiceEntity GetTicketEntity(string Number);
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/CostInvoice/CostInvoiceService.cs

@@ -84,6 +84,29 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
             }
         }
 
+        /// <summary>
+        /// 获取发票号实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public CostInvoiceEntity GetTicketEntity(string Number)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<CostInvoiceEntity>(x => x.Number == Number);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtInvoice/DtInvoiceBLL.cs

@@ -67,6 +67,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取表票号实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public DtInvoiceEntity GetTicketEntity(string InvoiceNo)
+        {
+            try
+            {
+                return dtInvoiceService.GetTicketEntity(InvoiceNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtInvoice/DtInvoiceIBLL.cs

@@ -27,6 +27,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         DtInvoiceEntity GetDtInvoiceEntity(string keyValue);
+        /// <summary>
+        /// 获取表票号数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        DtInvoiceEntity GetTicketEntity(string InvoiceNo);
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtInvoice/DtInvoiceService.cs

@@ -52,15 +52,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["InvoiceType"].IsEmpty())
                 {
-                    dp.Add("InvoiceType",queryParam["InvoiceType"].ToString(), DbType.String);
+                    dp.Add("InvoiceType", queryParam["InvoiceType"].ToString(), DbType.String);
                     strSql.Append(" AND t.InvoiceType = @InvoiceType ");
                 }
                 if (!queryParam["TaxRate"].IsEmpty())
                 {
-                    dp.Add("TaxRate",queryParam["TaxRate"].ToString(), DbType.String);
+                    dp.Add("TaxRate", queryParam["TaxRate"].ToString(), DbType.String);
                     strSql.Append(" AND t.TaxRate = @TaxRate ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<DtInvoiceEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<DtInvoiceEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -99,6 +99,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取表票号实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public DtInvoiceEntity GetTicketEntity(string InvoiceNo)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<DtInvoiceEntity>(x => x.InvoiceNo == InvoiceNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据
@@ -111,7 +134,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<DtInvoiceEntity>(t=>t.Id == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<DtInvoiceEntity>(t => t.Id == keyValue);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/RegisterInfo/RegisterInfoBLL.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-14 12:31
+    /// 描 述：人员登记 班主任来访
+    /// </summary>
+    public class RegisterInfoBLL : RegisterInfoIBLL
+    {
+        private RegisterInfoService registerInfoService = new RegisterInfoService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<RegisterInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return registerInfoService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取RegisterInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public RegisterInfoEntity GetRegisterInfoEntity(string keyValue)
+        {
+            try
+            {
+                return registerInfoService.GetRegisterInfoEntity(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
+            {
+                registerInfoService.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, RegisterInfoEntity entity)
+        {
+            try
+            {
+                registerInfoService.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/RegisterInfo/RegisterInfoEntity.cs

@@ -0,0 +1,75 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-14 12:31
+    /// 描 述：人员登记 班主任来访
+    /// </summary>
+    public class RegisterInfoEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
+        [Column("ADDTIME")]
+        public DateTime? AddTime { get; set; }
+        /// <summary>
+        /// VisitorName
+        /// </summary>
+        [Column("VISITORNAME")]
+        public string VisitorName { get; set; }
+        /// <summary>
+        /// Dorm
+        /// </summary>
+        [Column("DORM")]
+        public string Dorm { get; set; }
+        /// <summary>
+        /// 人员
+        /// </summary>
+        [Column("ADDNAME")]
+        public string AddName { get; set; }
+        /// <summary>
+        /// Demo
+        /// </summary>
+        [Column("DEMO")]
+        public string Demo { get; set; }
+        /// <summary>
+        /// 0出 1 入 2 班主任来访
+        /// </summary>
+        [Column("TYPE")]
+        public string Type { 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/RegisterInfo/RegisterInfoIBLL.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-14 12:31
+    /// 描 述：人员登记 班主任来访
+    /// </summary>
+    public interface RegisterInfoIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<RegisterInfoEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取RegisterInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        RegisterInfoEntity GetRegisterInfoEntity(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, RegisterInfoEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/RegisterInfo/RegisterInfoService.cs

@@ -0,0 +1,159 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-09-14 12:31
+    /// 描 述：人员登记 班主任来访
+    /// </summary>
+    public class RegisterInfoService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<RegisterInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.AddTime,
+                t.VisitorName,
+                t.Dorm,
+                t.AddName,
+                t.Demo
+                ");
+                strSql.Append("  FROM RegisterInfo t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Dorm"].IsEmpty())
+                {
+                    dp.Add("Dorm", "%" + queryParam["Dorm"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Dorm Like @Dorm ");
+                }
+                if (!queryParam["AddName"].IsEmpty())
+                {
+                    dp.Add("AddName", "%" + queryParam["AddName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.AddName Like @AddName ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<RegisterInfoEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取RegisterInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public RegisterInfoEntity GetRegisterInfoEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<RegisterInfoEntity>(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<RegisterInfoEntity>(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, RegisterInfoEntity 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

@@ -1903,6 +1903,10 @@
     <Compile Include="CustomFunction\CostInvoice\CostInvoiceService.cs" />
     <Compile Include="CustomFunction\CostInvoice\CostInvoiceBLL.cs" />
     <Compile Include="CustomFunction\CostInvoice\CostInvoiceIBLL.cs" />
+    <Compile Include="EducationalAdministration\RegisterInfo\RegisterInfoEntity.cs" />
+    <Compile Include="EducationalAdministration\RegisterInfo\RegisterInfoService.cs" />
+    <Compile Include="EducationalAdministration\RegisterInfo\RegisterInfoBLL.cs" />
+    <Compile Include="EducationalAdministration\RegisterInfo\RegisterInfoIBLL.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/PersonnelManagement/ResearchMent/ResearchMentEntity.cs

@@ -89,6 +89,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("IFSCHOOL")]
         public string IfSchool { get; set; }
+        /// <summary>
+        /// 部门
+        /// </summary>
+        [Column("DEPARTMENTID")]
+        public string DepartmentId { get; set; }
+        
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchMent/ResearchMentService.cs

@@ -41,6 +41,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 t.iphone,
                 t.Learn,
                 t.IdNumber
+                t.DepartmentId
                 ");
                 strSql.Append("  FROM ResearchMent t ");
                 strSql.Append("  WHERE 1=1 ");

Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln

@@ -1600,7 +1600,7 @@ Global
 		{CF8AE293-88AB-436C-9720-A8386BA5D7B7} = {5C21750D-4143-4749-9489-F739765F542D}
 		{AD556B7A-E0D1-41BD-9D5B-18F8502E9F33} = {5C21750D-4143-4749-9489-F739765F542D}
 		{81C03609-AE0D-414C-829B-16B990487ADD} = {0922D521-971B-48E1-A1FF-7AB7B1E8EF61}
-		{13808645-2013-4896-8EE2-65144E222C69} = {BBB63BC5-EBF2-4ED2-8804-7187223C3DF5}
+		{13808645-2013-4896-8EE2-65144E222C69} = {8533DB03-B16B-4192-BF8B-137FC33AAF12}
 		{68902FCF-C439-4010-B17B-2499C972EE33} = {BBB63BC5-EBF2-4ED2-8804-7187223C3DF5}
 		{975F2CB8-605C-4ADD-B365-B97BF844F0FE} = {BBB63BC5-EBF2-4ED2-8804-7187223C3DF5}
 		{D27E14DC-B68C-408D-A2E3-FDB38665ECBB} = {8533DB03-B16B-4192-BF8B-137FC33AAF12}
@@ -1637,7 +1637,7 @@ Global
 		{E05A2B9A-A939-450F-9A44-A8B3201D055A} = {ED258CD0-0A0C-490B-9D8F-B4CEC4467251}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35
 		SolutionGuid = {968C278F-4142-4DFF-96B0-B3D70A649451}
+		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35
 	EndGlobalSection
 EndGlobal