【增加】人事：年度考核结果管理；

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

@@ -0,0 +1,164 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public class PM_YearAssessController : MvcControllerBase
+    {
+        private PM_YearAssessIBLL pM_YearAssessIBLL = new PM_YearAssessBLL();
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+
+        /// <summary>
+        /// 主页面-统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticIndex()
+        {
+            return View();
+        }
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pM_YearAssessIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var PM_YearAssessData = pM_YearAssessIBLL.GetPM_YearAssessEntity( keyValue );
+            var jsonData = new {
+                PM_YearAssess = PM_YearAssessData,
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageStatisticList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = pM_YearAssessIBLL.GetPageStatisticList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            pM_YearAssessIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            var loginUserInfo = LoginUserInfo.Get();
+            PM_YearAssessEntity entity = strEntity.ToObject<PM_YearAssessEntity>();
+            entity.Updater = loginUserInfo.userId;
+            entity.UpdateTime = DateTime.Now;
+            pM_YearAssessIBLL.SaveEntity(keyValue,entity);
+            return Success("保存成功！");
+        }
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="empId"></param>
+        /// <returns></returns>
+        public ActionResult Submit(string empId,bool status)
+        {
+            pM_YearAssessIBLL.Submit(empId,status);
+            if (status)
+            {
+                return Success("提交成功！");
+            }
+            else
+            {
+                return Success("取消提交成功");
+            }
+        }
+        #endregion
+
+    }
+}

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

@@ -38,6 +38,7 @@
         <li><a data-value="tab5">教师部门变更管理</a></li>
         <li><a data-value="tab6">家庭情况</a></li>
         <li><a data-value="tab7">教师聘任变更记录</a></li>
+        <li><a data-value="tab8">年度考核结果管理</a></li>
     </ul>
 </div>
 <div class="tab-content lr-tab-content" id="lr_tab_content">
@@ -420,6 +421,9 @@
     <div class="lr-form-wrap tab-pane" id="tab7">
         <iframe id="PM_PositionChange" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
     </div>
+    <div class="lr-form-wrap tab-pane" id="tab8">
+        <iframe id="PM_YearAssess" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+    </div>
 </div>
 
 <script src="~/Content/ueditor/ueditor.config.js"></script>

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

@@ -64,6 +64,7 @@ var bootstrap = function ($, learun) {
             $("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId);
             $("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId);
             $("#PM_PositionChange").attr("src", "/EducationalAdministration/PM_PositionChange/Index?empId=" + NewEmpId);
+            $("#PM_YearAssess").attr("src", "/EducationalAdministration/PM_YearAssess/Index?empId=" + NewEmpId);
             $('#lr_form_tabs').lrFormTab();
             $('#lr_form_tabs ul li').eq(0).trigger('click');
             //校区

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

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "年度考核结果管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="PM_YearAssess">
+        <div class="lr-form-item-title">考核时间<font face="宋体">*</font></div>
+        <input id="AssessTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AssessTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_YearAssess">
+        <div class="lr-form-item-title">考核年度<font face="宋体">*</font></div>
+        <input id="AssessYear" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_YearAssess">
+        <div class="lr-form-item-title">考核结果</div>
+        <textarea id="AssessResult" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_YearAssess">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_YearAssess">
+        <div class="lr-form-item-title">是否同步</div>
+        <div id="IsSync"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_YearAssess/Form.js")

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

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-06 14:08
+ * 描  述：年度考核结果管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var empId = request('empId');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#IsSync').lrDataItemSelect({ code: 'YesOrNoBit' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/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 data = $('body').lrGetFormData();
+        data["EmpId"] = empId;
+        var postData = {
+            strEntity: JSON.stringify(data)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.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="AssessTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AssessTime').trigger('change'); } })" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">考核年度</div>
+                                    <input id="AssessYear" 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_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;提交</a>
+                        <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;取消提交</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js")

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

@@ -0,0 +1,149 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-06 14:08
+ * 描  述：年度考核结果管理
+ */
+var refreshGirdData;
+var empId = request('empId');
+var status = false;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.refreshStatus();
+            page.initGird();
+            page.bind();
+        },
+        refreshStatus: function () {
+            //获取主表状态
+            learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/EmpInfo/GetFormData?keyValue=' + empId, function (res) {
+                if (res.code == 200) {
+                    if (res.data.EmpInfo != null) {
+                        status = res.data.EmpInfo.YearAssessStatus;
+                    }
+                }
+            });
+        },
+        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 () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                learun.layerForm({
+                    id: 'formInPM_YearAssess',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Form?empId=' + empId,
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formInPM_YearAssess',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Form?keyValue=' + keyValue + '&empId=' + empId,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 提交
+            $('#lr_check').on('click', function () {
+                if (status == 'true') {
+                    learun.alert.warning('已提交，不能再修改！');
+                    return;
+                }
+                learun.layerConfirm('是否确认提交！', function (res) {
+                    if (res) {
+                        learun.postForm( top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Submit', { empId: empId, status: true }, function (info) {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+            // 取消提交
+            $('#lr_uncheck').on('click', function () {
+                learun.layerConfirm('是否取消提交！', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Submit', { empId: empId, status: false }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/GetPageList',
+                headData: [
+                    { label: "考核时间", name: "AssessTime", width: 100, align: "left" },
+                    { label: "考核年度", name: "AssessYear", width: 100, align: "left" },
+                    { label: "考核结果", name: "AssessResult", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                    { label: "是否同步", name: "IsSync", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == true ? "是" : "否" } },
+                    {
+                        label: "提交状态", name: "SubmitStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx:'UpdateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.EmpId = empId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+        page.refreshStatus();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.cshtml

@@ -0,0 +1,39 @@
+@{
+    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="EmpName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">考核时间</div>
+                                    <input id="AssessTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AssessTime').trigger('change'); } })" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">考核年度</div>
+                                    <input id="AssessYear" 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>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.js

@@ -0,0 +1,73 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-11-06 14:08
+ * 描  述：年度考核结果管理
+ */
+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();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/GetPageStatisticList',
+                headData: [
+                    {
+                        label: "教师", name: "EmpId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                key: value,
+                                keyId: 'empid',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "考核时间", name: "AssessTime", width: 100, align: "left" },
+                    { label: "考核年度", name: "AssessYear", width: 100, align: "left" },
+                    { label: "考核结果", name: "AssessResult", width: 100, align: "left" },
+                    { label: "变更时间", name: "UpdateTime", width: 130, align: "left" },
+                    {
+                        label: "变更人", name: "Updater", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (item) {
+                                    callback(item.name);
+                                }
+                            });
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx:'UpdateTime desc'
+            });
+            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

@@ -340,6 +340,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\LeaveSchoolAController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\LR_Base_LogoController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\MealCardRunTabController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\PM_YearAssessController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\PM_PositionChangeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\PracticeBaseController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\R_EnterBuildingController.cs" />
@@ -1106,6 +1107,9 @@
     <Content Include="Areas\EducationalAdministration\Views\MealCardRunTab\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\MealCardRunTab\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\PM_EducationExperience\StatisticIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\StatisticIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\PM_Resume\StatisticIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\PM_TechnicalPost\StatisticIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\PM_PositionChange\Form.js" />
@@ -1258,6 +1262,9 @@
     <Content Include="Areas\EducationalAdministration\Views\PM_PositionChange\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\PM_PositionChange\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\PM_PositionChange\StatisticIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\PM_YearAssess\StatisticIndex.cshtml" />
     <None Include="Areas\EducationalAdministration\Views\StuInfoBasic\Printxjk.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticClassIndex.js" />

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

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public class PM_YearAssessMap : EntityTypeConfiguration<PM_YearAssessEntity>
+    {
+        public PM_YearAssessMap()
+        {
+            #region  表、主键
+            //表
+            this.ToTable("PM_YEARASSESS");
+            //主键
+            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

@@ -98,6 +98,7 @@
     <Compile Include="EducationalAdministration\Exam_InvigilateTeacherMap.cs" />
     <Compile Include="EducationalAdministration\LeaveSchoolMap.cs" />
     <Compile Include="EducationalAdministration\MealCardRunTabMap.cs" />
+    <Compile Include="EducationalAdministration\PM_YearAssessMap.cs" />
     <Compile Include="EducationalAdministration\PM_PositionChangeMap.cs" />
     <Compile Include="EducationalAdministration\PracticeBaseMap.cs" />
     <Compile Include="EducationalAdministration\R_EnterBuildingMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessBLL.cs

@@ -0,0 +1,171 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public class PM_YearAssessBLL : PM_YearAssessIBLL
+    {
+        private PM_YearAssessService pM_YearAssessService = new PM_YearAssessService();
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_YearAssessEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return pM_YearAssessService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取PM_YearAssess表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public PM_YearAssessEntity GetPM_YearAssessEntity(string keyValue)
+        {
+            try
+            {
+                return pM_YearAssessService.GetPM_YearAssessEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_YearAssessEntity> GetPageStatisticList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return pM_YearAssessService.GetPageStatisticList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                pM_YearAssessService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, PM_YearAssessEntity entity)
+        {
+            try
+            {
+                pM_YearAssessService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 修改提交状态
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void Submit(string keyValue, bool status)
+        {
+            try
+            {
+                pM_YearAssessService.Submit(keyValue, status);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessEntity.cs

@@ -0,0 +1,90 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public class PM_YearAssessEntity 
+    {
+        #region  实体成员
+        /// <summary>
+        /// 编号
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 人员ID
+        /// </summary>
+        [Column("EMPID")]
+        public string EmpId { get; set; }
+        /// <summary>
+        /// 考核时间
+        /// </summary>
+        [Column("ASSESSTIME")]
+        public DateTime? AssessTime { get; set; }
+        /// <summary>
+        /// 考核年度
+        /// </summary>
+        [Column("ASSESSYEAR")]
+        public string AssessYear { get; set; }
+        /// <summary>
+        /// 考核结果
+        /// </summary>
+        [Column("ASSESSRESULT")]
+        public string AssessResult { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 是否同步
+        /// </summary>
+        [Column("ISSYNC")]
+        public bool? IsSync { get; set; }
+        /// <summary>
+        /// 最后修改人
+        /// </summary>
+        [Column("UPDATER")]
+        public string Updater { get; set; }
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        [Column("UPDATETIME")]
+        public DateTime? UpdateTime { 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  扩展字段
+        /// <summary>
+        /// 提交状态
+        /// </summary>
+        [NotMapped]
+        public bool? SubmitStatus { get; set; }
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessIBLL.cs

@@ -0,0 +1,57 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public interface PM_YearAssessIBLL
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<PM_YearAssessEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取PM_YearAssess表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        PM_YearAssessEntity GetPM_YearAssessEntity(string keyValue);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<PM_YearAssessEntity> GetPageStatisticList(Pagination pagination, string queryJson);
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void SaveEntity(string keyValue, PM_YearAssessEntity entity);
+        void Submit(string keyValue, bool status);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessService.cs

@@ -0,0 +1,247 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-11-06 14:08
+    /// 描 述：年度考核结果管理
+    /// </summary>
+    public class PM_YearAssessService : RepositoryFactory
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_YearAssessEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,e.YearAssessStatus as SubmitStatus ");
+                strSql.Append("  FROM PM_YearAssess t ");
+                strSql.Append("  left join EmpInfo e on t.EmpId=e.EmpId ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["AssessYear"].IsEmpty())
+                {
+                    dp.Add("AssessYear", queryParam["AssessYear"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AssessYear = @AssessYear ");
+                }
+                if (!queryParam["AssessTime"].IsEmpty())
+                {
+                    dp.Add("AssessTime", queryParam["AssessTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND t.AssessTime = @AssessTime ");
+                }
+                if (!queryParam["EmpId"].IsEmpty())
+                {
+                    dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpId = @EmpId ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<PM_YearAssessEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取PM_YearAssess表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public PM_YearAssessEntity GetPM_YearAssessEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<PM_YearAssessEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<PM_YearAssessEntity> GetPageStatisticList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM PM_YearAssess t ");
+                strSql.Append("  left join EmpInfo e on t.EmpId=e.EmpId ");
+                strSql.Append("  WHERE 1=1 and t.IsSync=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["AssessYear"].IsEmpty())
+                {
+                    dp.Add("AssessYear", queryParam["AssessYear"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AssessYear = @AssessYear ");
+                }
+                if (!queryParam["AssessTime"].IsEmpty())
+                {
+                    dp.Add("AssessTime", queryParam["AssessTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND t.AssessTime = @AssessTime ");
+                }
+                if (!queryParam["EmpId"].IsEmpty())
+                {
+                    dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpId = @EmpId ");
+                }
+                if (!queryParam["EmpName"].IsEmpty())
+                {
+                    dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND e.EmpName like @EmpName ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<PM_YearAssessEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<PM_YearAssessEntity>(t => t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, PM_YearAssessEntity entity)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    db.Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    db.Insert(entity);
+                }
+
+                //“是否同步”：选是，则更新教师表；
+                if (entity.IsSync.HasValue && entity.IsSync.Value == true)
+                {
+                    db.ExecuteBySql("update EmpInfo set AssessTime='" + entity.AssessTime + "',AssessYear='"+entity.AssessYear+"',AssessResult='"+entity.AssessResult+"' where EmpId='" + entity.EmpId + "' ");
+                }
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 修改提交状态
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void Submit(string keyValue, bool status)
+        {
+            try
+            {
+                var empEntity = this.BaseRepository("CollegeMIS").FindEntity<EmpInfoEntity>(a => a.EmpId == keyValue);
+                if (empEntity != null)
+                {
+                    empEntity.YearAssessStatus = status;
+                    this.BaseRepository("CollegeMIS").Update(empEntity);
+                }
+            }
+            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

@@ -224,6 +224,10 @@
     <Compile Include="EducationalAdministration\OpenLessonPlan\OpenLessonPlanBLL.cs" />
     <Compile Include="EducationalAdministration\OpenLessonPlan\OpenLessonPlanIBLL.cs" />
     <Compile Include="EducationalAdministration\OpenLessonPlan\OpenLessonPlanService.cs" />
+    <Compile Include="EducationalAdministration\PM_YearAssess\PM_YearAssessBLL.cs" />
+    <Compile Include="EducationalAdministration\PM_YearAssess\PM_YearAssessEntity.cs" />
+    <Compile Include="EducationalAdministration\PM_YearAssess\PM_YearAssessIBLL.cs" />
+    <Compile Include="EducationalAdministration\PM_YearAssess\PM_YearAssessService.cs" />
     <Compile Include="EducationalAdministration\PM_PositionChange\PM_PositionChangeBLL.cs" />
     <Compile Include="EducationalAdministration\PM_PositionChange\PM_PositionChangeEntity.cs" />
     <Compile Include="EducationalAdministration\PM_PositionChange\PM_PositionChangeIBLL.cs" />