合并

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

@@ -0,0 +1,140 @@
+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-08-02 16:47
+    /// 描 述：合同审批管理
+    /// </summary>
+    public class ContractInfoController : MvcControllerBase
+    {
+        private ContractInfoIBLL contractInfoIBLL = new ContractInfoBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexFile()
+        {
+            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 = contractInfoIBLL.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 ContractInfoData = contractInfoIBLL.GetContractInfoEntity( keyValue );
+            var jsonData = new {
+                ContractInfo = ContractInfoData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            contractInfoIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 提交/审核
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult UpdateStatus(string keyValue,int Status)
+        {
+            contractInfoIBLL.UpdateStatus(keyValue, Status);
+            return Success("操作成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            ContractInfoEntity entity = strEntity.ToObject<ContractInfoEntity>();
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.Status = 0;
+            }
+            contractInfoIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/RetireForecastController.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-08-02 10:14
+    /// 描 述：人员退休预测
+    /// </summary>
+    public class RetireForecastController : MvcControllerBase
+    {
+        private RetireForecastIBLL retireForecastIBLL = new RetireForecastBLL();
+
+        #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 = retireForecastIBLL.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 RetireForecastData = retireForecastIBLL.GetRetireForecastEntity( keyValue );
+            var jsonData = new {
+                RetireForecast = RetireForecastData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            retireForecastIBLL.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)
+        {
+            RetireForecastEntity entity = strEntity.ToObject<RetireForecastEntity>();
+            retireForecastIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,55 @@
+@{
+    ViewBag.Title = "合同审批管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item"  data-table="ContractInfo" >
+        <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="ContractInfo" >
+        <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-6 lr-form-item"  data-table="ContractInfo" >
+        <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="ContractInfo" >
+        <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-12 lr-form-item"  data-table="ContractInfo" >
+        <div class="lr-form-item-title">合同标的</div>
+        <input id="Target" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="ContractInfo" >
+        <div class="lr-form-item-title">合同类型</div>
+        <div id="Type"  ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="ContractInfo" >
+        <div class="lr-form-item-title">合同金额</div>
+        <input id="Amount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ContractInfo" >
+        <div class="lr-form-item-title">对方单位名称</div>
+        <input id="OtherParty" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="ContractInfo" >
+        <div class="lr-form-item-title">对方单位联系人</div>
+        <input id="OtherPartyContacts" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="ContractInfo" >
+        <div class="lr-form-item-title">联系方式</div>
+        <input id="OtherPartyMobile" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="ContractInfo" >
+        <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="ContractInfo" >
+        <div class="lr-form-item-title">申报时间</div>
+        <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/ContractInfo/Form.js")

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

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-08-02 16:47
+ * 描  述：合同审批管理
+ */
+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: 'htlx' });
+            $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
+            $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/ContractInfo/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/ContractInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,48 @@
+@{
+    ViewBag.Title = "合同审批管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">合同名称</div>
+                                    <input id="Name" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">合同编号</div>
+                                    <input id="EnCode" 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_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
+                        <a id="lr_check" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核</a>
+                        <a id="lr_file" class="btn btn-default"><i class="fa fa-plus"></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/ContractInfo/Index.js")

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

@@ -0,0 +1,192 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-08-02 16:47
+ * 描  述：合同审批管理
+ */
+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: 'htlx' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/ContractInfo/Form',
+                    width: 700,
+                    height: 500,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != '0') {
+                        return learun.warning.alert('选中项已提交，不可编辑！');
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/CustomFunction/ContractInfo/Form?keyValue=' + keyValue,
+                        width: 700,
+                        height: 500,
+                        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/ContractInfo/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != '0') {
+                        learun.warning.alert('选中项已提交！');
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/CustomFunction/ContractInfo/UpdateStatus', { keyValue: keyValue, Status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //审核
+            $('#lr_check').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != '1') {
+                       return learun.warning.alert('请选择审核中的数据！');
+                    }
+                    learun.layerConfirm('是否确认审核该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/CustomFunction/ContractInfo/UpdateStatus', { keyValue: keyValue, Status: 2 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //归档
+            $('#lr_file').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != '2') {
+                        return learun.warning.alert('选中项未审核通过！');
+                    }
+                    learun.layerConfirm('是否确认归档该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/CustomFunction/ContractInfo/UpdateStatus', { keyValue: keyValue, Status: 5 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CustomFunction/ContractInfo/GetPageList',
+                headData: [
+                    { label: "合同名称", name: "Name", width: 100, align: "left" },
+                    { label: "合同编号", name: "EnCode", width: 100, align: "left" },
+                    { label: "合同开始时间", name: "StartTime", width: 100, align: "left" },
+                    { label: "合同结束时间", name: "EndTime", width: 100, align: "left" },
+                    { label: "合同标的", name: "Target", 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: 'htlx',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "合同金额", name: "Amount", width: 100, align: "left" },
+                    { label: "对方单位名称", name: "OtherParty", width: 100, align: "left" },
+                    { label: "对方单位联系人", name: "OtherPartyContacts", width: 100, align: "left" },
+                    { label: "联系方式", name: "OtherPartyMobile", width: 100, align: "left" },
+                    {
+                        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: "CreateTime", width: 100, align: "left" },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return "<span class=\"label label-default\">草稿</span>";
+                            } else if (cellvalue == 1) {
+                                return "<span class=\"label label-warning\">审批中</span>";
+                            } else if (cellvalue == 2) {
+                                return "<span class=\"label label-success\">审批通过</span>";
+                            }
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.SqlParameter = " and (Status<=2)";
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractInfo/IndexFile.cshtml

@@ -0,0 +1,42 @@
+@{
+    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>
+                                    <input id="EnCode" 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_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/ContractInfo/IndexFile.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractInfo/IndexFile.js

@@ -0,0 +1,97 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-08-02 16:47
+ * 描  述：合同审批管理
+ */
+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: 'htlx' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CustomFunction/ContractInfo/GetPageList',
+                headData: [
+                    { label: "合同名称", name: "Name", width: 100, align: "left" },
+                    { label: "合同编号", name: "EnCode", width: 100, align: "left" },
+                    { label: "合同开始时间", name: "StartTime", width: 100, align: "left" },
+                    { label: "合同结束时间", name: "EndTime", width: 100, align: "left" },
+                    { label: "合同标的", name: "Target", 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: 'htlx',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "合同金额", name: "Amount", width: 100, align: "left" },
+                    { label: "对方单位名称", name: "OtherParty", width: 100, align: "left" },
+                    { label: "对方单位联系人", name: "OtherPartyContacts", width: 100, align: "left" },
+                    { label: "联系方式", name: "OtherPartyMobile", width: 100, align: "left" },
+                    {
+                        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: "CreateTime", width: 100, align: "left" },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return "<span class=\"label label-default\">草稿</span>";
+                            } else if (cellvalue == 1) {
+                                return "<span class=\"label label-warning\">审批中</span>";
+                            } else if (cellvalue == 2) {
+                                return "<span class=\"label label-success\">审批通过</span>";
+                            } else if (cellvalue == 5) {
+                                return "<span class=\"label label-success\">已归档</span>";
+                            }
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.SqlParameter = " and Status=5";
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -0,0 +1,15 @@
+@{
+    ViewBag.Title = "人员退休预测";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="RetireForecast" >
+        <div class="lr-form-item-title">标题</div>
+        <input id="Title" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="RetireForecast" >
+        <div class="lr-form-item-title">备注</div>
+        <input id="Remark" type="text" class="form-control"  />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/RetireForecast/Form.js")

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

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

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

@@ -0,0 +1,37 @@
+@{
+    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="Title" 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/RetireForecast/Index.js")

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

@@ -0,0 +1,101 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-08-02 10:14
+ * 描  述：人员退休预测
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/RetireForecast/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/RetireForecast/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/RetireForecast/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CustomFunction/RetireForecast/GetPageList',
+                headData: [
+                    { label: "标题", name: "Title", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                    {
+                        label: "创建时间", name: "CreateTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "创建人", name: "CreateUserName", width: 100, align: "left" }
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime',
+                sord: 'DESC',
+            });
+            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/PersonnelManagement/Controllers/TeacherRetireController.cs

@@ -37,6 +37,16 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
              return View();
         }
+        /// <summary>
+        /// 统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexTJ()
+        {
+            return View();
+        }
+        
         #endregion
 
         #region  获取数据
@@ -75,6 +85,19 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             };
             return Success(jsonData);
         }
+
+
+        /// <summary>
+        /// 获取统计数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetListForTJ()
+        {
+            var data = teacherRetireIBLL.GetListForTJ();
+            return Success(data);
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTitleEvaluationController.cs

@@ -37,6 +37,16 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
              return View();
         }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexTJ()
+        {
+            return View();
+        }
+        
         #endregion
 
         #region  获取数据
@@ -75,6 +85,18 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             };
             return Success(jsonData);
         }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetListForTJ()
+        {
+            var data = teacherTitleEvaluationIBLL.GetListForTJ();
+            return Success(data);
+        }
+        
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherRetire/IndexTJ.cshtml

@@ -0,0 +1,27 @@
+@{
+    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>
+                </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">
+                       
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherRetire/IndexTJ.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherRetire/IndexTJ.js

@@ -0,0 +1,48 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-03-19 14:27
+ * 描  述：退休教职工
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+           
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/TeacherRetire/GetListForTJ',
+                headData: [
+                    {
+                        label: "年份", name: "year", width: 100, align: "left"
+                    },
+                    { label: "离职人数", name: "numlz", width: 100, align: "left" },
+                    { label: "退休人数", name: "numtx", width: 100, align: "left" },
+                ],
+                mainId: 'year',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.cshtml

@@ -17,6 +17,14 @@
                                     <div class="lr-form-item-title">教师姓名</div>
                                     <div id="EID"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">评定职称</div>
+                                    <div id="TTTitlesID"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">岗位等级</div>
+                                    <div id="TTTitlesPostLevel"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -46,6 +46,8 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#EID').lrUserSelect(0);
+            $('#TTTitlesID').lrDataItemSelect({ code: 'jszc' });
+            $('#TTTitlesPostLevel').lrDataItemSelect({ code: 'TeacherTitlePostLevel' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/IndexTJ.cshtml

@@ -0,0 +1,28 @@
+@{
+    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>
+                    </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">
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/IndexTJ.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/IndexTJ.js

@@ -0,0 +1,58 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-03-19 14:16
+ * 描  述：教师职称评定
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#EID').lrUserSelect(0);
+            $('#TTTitlesID').lrDataItemSelect({ code: 'jszc' });
+            $('#TTTitlesPostLevel').lrDataItemSelect({ code: 'TeacherTitlePostLevel' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/TeacherTitleEvaluation/GetListForTJ',
+                headData: [
+                    {
+                        label: "评定职称", name: "TTTitlesID", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'jszc',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "教师数量", name: "num", width: 100, align: "left" },
+                ],
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -840,6 +840,8 @@
     <Compile Include="Areas\CustomFunction\Controllers\RetireConditionController.cs" />
     <Compile Include="Areas\CustomFunction\Controllers\EstimateRetireController.cs" />
     <Compile Include="Areas\CustomFunction\Controllers\RetireReturnController.cs" />
+    <Compile Include="Areas\CustomFunction\Controllers\RetireForecastController.cs" />
+    <Compile Include="Areas\CustomFunction\Controllers\ContractInfoController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -955,6 +957,7 @@
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexTJ.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexYJ.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexData.js" />
+    <Content Include="Areas\CustomFunction\Views\ContractInfo\IndexFile.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" />
@@ -1458,6 +1461,8 @@
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForTeacher.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherReimbursementManagement\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherReimbursementManagement\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\TeacherRetire\IndexTJ.js" />
+    <Content Include="Areas\PersonnelManagement\Views\TeacherTitleEvaluation\IndexTJ.js" />
     <Content Include="Areas\Statistics\Views\ChargingReport\Index.js" />
     <Content Include="Areas\Statistics\Views\StudentAttendanceReport\Index.js" />
     <Content Include="Areas\Statistics\Views\TeacherAttendanceReport\Index.js" />
@@ -6540,6 +6545,14 @@
     <Content Include="Areas\CustomFunction\Views\RetireReturn\Index.js" />
     <Content Include="Areas\CustomFunction\Views\RetireReturn\Form.cshtml" />
     <Content Include="Areas\CustomFunction\Views\RetireReturn\Form.js" />
+    <Content Include="Areas\CustomFunction\Views\RetireForecast\Index.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\RetireForecast\Index.js" />
+    <Content Include="Areas\CustomFunction\Views\RetireForecast\Form.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\RetireForecast\Form.js" />
+    <Content Include="Areas\CustomFunction\Views\ContractInfo\Index.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ContractInfo\Index.js" />
+    <Content Include="Areas\CustomFunction\Views\ContractInfo\Form.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ContractInfo\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />
@@ -7366,6 +7379,9 @@
     <Content Include="Areas\EducationalAdministration\Views\DtStuLeave\FormView.cshtml" />
     <Content Include="Areas\CustomFunction\Views\EstimateRetire\IndexYT.cshtml" />
     <Content Include="Areas\CustomFunction\Views\EstimateRetire\FormYT.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\TeacherRetire\IndexTJ.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\TeacherTitleEvaluation\IndexTJ.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ContractInfo\IndexFile.cshtml" />
     <Content Include="Areas\LR_NewWorkFlow\Views\Index.cshtml" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ApplyForIndex.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/CustomFunction/ContractInfoMap.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-08-02 16:47
+    /// 描 述：合同审批管理
+    /// </summary>
+    public class ContractInfoMap : EntityTypeConfiguration<ContractInfoEntity>
+    {
+        public ContractInfoMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("CONTRACTINFO");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/CustomFunction/RetireForecastMap.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-08-02 10:14
+    /// 描 述：人员退休预测
+    /// </summary>
+    public class RetireForecastMap : EntityTypeConfiguration<RetireForecastEntity>
+    {
+        public RetireForecastMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("RETIREFORECAST");
+            //主键
+            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

@@ -589,6 +589,8 @@
     <Compile Include="CustomFunction\RetireConditionMap.cs" />
     <Compile Include="CustomFunction\EstimateRetireMap.cs" />
     <Compile Include="CustomFunction\RetireReturnMap.cs" />
+    <Compile Include="CustomFunction\RetireForecastMap.cs" />
+    <Compile Include="CustomFunction\ContractInfoMap.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/ContractInfo/ContractInfoBLL.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-08-02 16:47
+    /// 描 述：合同审批管理
+    /// </summary>
+    public class ContractInfoBLL : ContractInfoIBLL
+    {
+        private ContractInfoService contractInfoService = new ContractInfoService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ContractInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return contractInfoService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ContractInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ContractInfoEntity GetContractInfoEntity(string keyValue)
+        {
+            try
+            {
+                return contractInfoService.GetContractInfoEntity(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
+            {
+                contractInfoService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="Status"></param>
+        public void UpdateStatus(string keyValue, int Status)
+        {
+            try
+            {
+                contractInfoService.UpdateStatus(keyValue, Status);
+            }
+            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, ContractInfoEntity entity)
+        {
+            try
+            {
+                contractInfoService.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/ContractInfo/ContractInfoEntity.cs

@@ -0,0 +1,115 @@
+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-08-02 16:47
+    /// 描 述：合同审批管理
+    /// </summary>
+    public class ContractInfoEntity 
+    {
+        #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("STARTTIME")]
+        public DateTime? StartTime { get; set; }
+        /// <summary>
+        /// 合同结束时间
+        /// </summary>
+        [Column("ENDTIME")]
+        public DateTime? EndTime { get; set; }
+        /// <summary>
+        /// 合同标的
+        /// </summary>
+        [Column("TARGET")]
+        public string Target { get; set; }
+        /// <summary>
+        /// 合同类型
+        /// </summary>
+        [Column("TYPE")]
+        public string Type { get; set; }
+        /// <summary>
+        /// 合同金额
+        /// </summary>
+        [Column("AMOUNT")]
+        public decimal? Amount { get; set; }
+        /// <summary>
+        /// 对方单位名称
+        /// </summary>
+        [Column("OTHERPARTY")]
+        public string OtherParty { get; set; }
+        /// <summary>
+        /// 对方单位联系人
+        /// </summary>
+        [Column("OTHERPARTYCONTACTS")]
+        public string OtherPartyContacts { get; set; }
+        /// <summary>
+        /// 对方单位联系方式
+        /// </summary>
+        [Column("OTHERPARTYMOBILE")]
+        public string OtherPartyMobile { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Column("STATUS")]
+        public int? Status { 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; }
+        #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/CustomFunction/ContractInfo/ContractInfoIBLL.cs

@@ -0,0 +1,49 @@
+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-08-02 16:47
+    /// 描 述：合同审批管理
+    /// </summary>
+    public interface ContractInfoIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ContractInfoEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取ContractInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        ContractInfoEntity GetContractInfoEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        void UpdateStatus(string keyValue, int Status);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, ContractInfoEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractInfo/ContractInfoService.cs

@@ -0,0 +1,199 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-08-02 16:47
+    /// 描 述：合同审批管理
+    /// </summary>
+    public class ContractInfoService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ContractInfoEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.Name,
+                t.EnCode,
+                t.StartTime,
+                t.EndTime,
+                t.Target,
+                t.Type,
+                t.Amount,
+                t.OtherParty,
+                t.OtherPartyContacts,
+                t.OtherPartyMobile,
+                t.CreateUserId,
+                t.CreateTime,t.Status
+                ");
+                strSql.Append("  FROM ContractInfo 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["EnCode"].IsEmpty())
+                {
+                    dp.Add("EnCode", "%" + queryParam["EnCode"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.EnCode Like @EnCode ");
+                }
+                if (!queryParam["Type"].IsEmpty())
+                {
+                    dp.Add("Type", queryParam["Type"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Type = @Type ");
+                }
+                if (!queryParam["SqlParameter"].IsEmpty())
+                {
+                    strSql.Append(queryParam["SqlParameter"].ToString());
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<ContractInfoEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ContractInfo表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ContractInfoEntity GetContractInfoEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<ContractInfoEntity>(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<ContractInfoEntity>(t => t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void UpdateStatus(string keyValue, int Status)
+        {
+            try
+            {
+                string sql = $"update ContractInfo set Status={Status} where Id='{keyValue}'";
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
+            }
+            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, ContractInfoEntity 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/RetireForecast/RetireForecastBLL.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-08-02 10:14
+    /// 描 述：人员退休预测
+    /// </summary>
+    public class RetireForecastBLL : RetireForecastIBLL
+    {
+        private RetireForecastService retireForecastService = new RetireForecastService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<RetireForecastEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return retireForecastService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取RetireForecast表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public RetireForecastEntity GetRetireForecastEntity(string keyValue)
+        {
+            try
+            {
+                return retireForecastService.GetRetireForecastEntity(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
+            {
+                retireForecastService.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, RetireForecastEntity entity)
+        {
+            try
+            {
+                retireForecastService.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/RetireForecast/RetireForecastEntity.cs

@@ -0,0 +1,74 @@
+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-08-02 10:14
+    /// 描 述：人员退休预测
+    /// </summary>
+    public class RetireForecastEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 标题
+        /// </summary>
+        [Column("TITLE")]
+        public string Title { 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; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            var userinfo = LoginUserInfo.Get();
+            this.CreateUserId = userinfo.userId;
+            this.CreateUserName = userinfo.realName;
+        }
+        /// <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/RetireForecast/RetireForecastIBLL.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-08-02 10:14
+    /// 描 述：人员退休预测
+    /// </summary>
+    public interface RetireForecastIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<RetireForecastEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取RetireForecast表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        RetireForecastEntity GetRetireForecastEntity(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, RetireForecastEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/RetireForecast/RetireForecastService.cs

@@ -0,0 +1,151 @@
+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-08-02 10:14
+    /// 描 述：人员退休预测
+    /// </summary>
+    public class RetireForecastService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<RetireForecastEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.Title,
+                t.Remark,t.CreateTime,t.CreateUserName
+                ");
+                strSql.Append("  FROM RetireForecast t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Title"].IsEmpty())
+                {
+                    dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Title Like @Title ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<RetireForecastEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取RetireForecast表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public RetireForecastEntity GetRetireForecastEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<RetireForecastEntity>(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<RetireForecastEntity>(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, RetireForecastEntity 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

@@ -1774,6 +1774,14 @@
     <Compile Include="CustomFunction\RetireReturn\RetireReturnService.cs" />
     <Compile Include="CustomFunction\RetireReturn\RetireReturnBLL.cs" />
     <Compile Include="CustomFunction\RetireReturn\RetireReturnIBLL.cs" />
+    <Compile Include="CustomFunction\RetireForecast\RetireForecastEntity.cs" />
+    <Compile Include="CustomFunction\RetireForecast\RetireForecastService.cs" />
+    <Compile Include="CustomFunction\RetireForecast\RetireForecastBLL.cs" />
+    <Compile Include="CustomFunction\RetireForecast\RetireForecastIBLL.cs" />
+    <Compile Include="CustomFunction\ContractInfo\ContractInfoEntity.cs" />
+    <Compile Include="CustomFunction\ContractInfo\ContractInfoService.cs" />
+    <Compile Include="CustomFunction\ContractInfo\ContractInfoBLL.cs" />
+    <Compile Include="CustomFunction\ContractInfo\ContractInfoIBLL.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/TeacherRetire/TeacherRetireBLL.cs

@@ -42,6 +42,31 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeacherRetireEntity> GetListForTJ()
+        {
+            try
+            {
+                return teacherRetireService.GetListForTJ();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取TeacherRetire表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherRetire/TeacherRetireEntity.cs

@@ -69,6 +69,22 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         }
         #endregion
         #region  扩展字段
+        /// <summary>
+        /// 年份
+        /// </summary>
+        [NotMapped]
+        public int year { get; set; }
+        /// <summary>
+        /// 退休
+        /// </summary>
+        [NotMapped]
+        public int numtx { get; set; }
+        /// <summary>
+        /// 离职
+        /// </summary>
+        [NotMapped]
+        public int numlz { get; set; }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherRetire/TeacherRetireIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<TeacherRetireEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<TeacherRetireEntity> GetListForTJ();
         /// <summary>
         /// 获取TeacherRetire表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherRetire/TeacherRetireService.cs

@@ -63,6 +63,33 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        public IEnumerable<TeacherRetireEntity> GetListForTJ()
+        {
+            try
+            {
+                var sql = @"select (case when year1 is null or len(year1)<=0 then year2 else year1 end) as year,
+ISNULL(numtx,0) as numtx,ISNULL(numlz,0) as numlz from 
+(select year(trtime) as year1,count(1) as numtx from TeacherRetire group by year(trtime) ) a
+full join 
+(select year(tdtime) as year2,count(1) as numlz from TeacherDimission group by year(tdtime) ) b
+on a.year1=b.year2
+order by year desc
+";
+                return this.BaseRepository().FindList<TeacherRetireEntity>(sql);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取TeacherRetire表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationBLL.cs

@@ -42,6 +42,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<TeacherTitleEvaluationEntity> GetListForTJ()
+        {
+            try
+            {
+                return teacherTitleEvaluationService.GetListForTJ();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取TeacherTitleEvaluation表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs

@@ -109,6 +109,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [NotMapped]
         public DateTime? Birthday { get; set; }
+
+        [NotMapped]
+        public  int? num { get; set; }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<TeacherTitleEvaluationEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<TeacherTitleEvaluationEntity> GetListForTJ();
         /// <summary>
         /// 获取TeacherTitleEvaluation表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationService.cs

@@ -49,10 +49,40 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
                 if (!queryParam["EID"].IsEmpty())
                 {
-                    dp.Add("EID",queryParam["EID"].ToString(), DbType.String);
+                    dp.Add("EID", queryParam["EID"].ToString(), DbType.String);
                     strSql.Append(" AND t.EID = @EID ");
                 }
-                return this.BaseRepository().FindList<TeacherTitleEvaluationEntity>(strSql.ToString(),dp, pagination);
+                if (!queryParam["TTTitlesID"].IsEmpty())
+                {
+                    dp.Add("TTTitlesID", queryParam["TTTitlesID"].ToString(), DbType.String);
+                    strSql.Append(" AND t.TTTitlesID = @TTTitlesID ");
+                }
+                if (!queryParam["TTTitlesPostLevel"].IsEmpty())
+                {
+                    dp.Add("TTTitlesPostLevel", queryParam["TTTitlesPostLevel"].ToString(), DbType.String);
+                    strSql.Append(" AND t.TTTitlesPostLevel = @TTTitlesPostLevel ");
+                }
+                return this.BaseRepository().FindList<TeacherTitleEvaluationEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<TeacherTitleEvaluationEntity> GetListForTJ()
+        {
+            try
+            {
+                var sql = @"select TTTitlesID,count(1) num from TeacherTitleEvaluation group by TTTitlesID";
+                return this.BaseRepository().FindList<TeacherTitleEvaluationEntity>(sql);
             }
             catch (Exception ex)
             {
@@ -104,7 +134,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository().Delete<TeacherTitleEvaluationEntity>(t=>t.TTID == keyValue);
+                this.BaseRepository().Delete<TeacherTitleEvaluationEntity>(t => t.TTID == keyValue);
             }
             catch (Exception ex)
             {