冲突合并

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

@@ -0,0 +1,127 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-24 14:32
+    /// 描 述：教师发展
+    /// </summary>
+    public class TeacherDevelopController : MvcControllerBase
+    {
+        private TeacherDevelopIBLL teacherDevelopIBLL = new TeacherDevelopBLL();
+
+        #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 FormView()
+        {
+            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 = teacherDevelopIBLL.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 TeacherDevelopData = teacherDevelopIBLL.GetTeacherDevelopEntity( keyValue );
+            var jsonData = new {
+                TeacherDevelop = TeacherDevelopData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teacherDevelopIBLL.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)
+        {
+            TeacherDevelopEntity entity = strEntity.ToObject<TeacherDevelopEntity>();
+            teacherDevelopIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,84 @@
+@{
+    ViewBag.Title = "教师发展";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">教师</div>
+        <div id="EmpNo"></div>
+       @* <input id="EmpNo" type="text" class="form-control currentInfo lr-currentInfo-user" />*@
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">时间<font face="宋体">*</font></div>
+        <input id="JoinTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#JoinTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">证书名称</div>
+        <input id="CertificateName" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">证书级别</div>
+        <div id="CertificateType"  ></div>
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">分值</div>
+        <input id="CertificateScore" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">附件</div>
+        <div id="CertificatePath"  ></div>
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">荣誉名称</div>
+        <input id="HonorName" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">荣誉级别</div>
+        <div id="HonorType"  ></div>
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">分值</div>
+        <input id="HonorScore" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">附件</div>
+        <div id="HonorPath"  ></div>
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">论文名称</div>
+        <input id="ThesisName" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">论文级别</div>
+        <div id="ThesisType"  ></div>
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">分值</div>
+        <input id="ThesisScore" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">附件</div>
+        <div id="ThesisPath"  ></div>
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">课题名称</div>
+        <input id="ProjectName" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">课题级别</div>
+        <div id="ProjectType"  ></div>
+    </div>
+    <div class="col-xs-4 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">分值</div>
+        <input id="ProjectScore" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="ProjectPath"  ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TeacherDevelop" >
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherDevelop/Form.js")

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

@@ -0,0 +1,59 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-24 14:32
+ * 描  述：教师发展
+ */
+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 () {
+            $('#EmpNo').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            $('#CertificateType').lrDataItemSelect({ code: 'CertificateLevel' });
+            $('#CertificatePath').lrUploader();
+            $('#HonorType').lrDataItemSelect({ code: 'HonorLevel' });
+            $('#HonorPath').lrUploader();
+            $('#ThesisType').lrDataItemSelect({ code: 'ThesisLevel' });
+            $('#ThesisPath').lrUploader();
+            $('#ProjectType').lrDataItemSelect({ code: 'SubjectLevelLevel' });
+            $('#ProjectPath').lrUploader();
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeacherDevelop/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 + '/PersonnelManagement/TeacherDevelop/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherDevelop/FormView.cshtml

@@ -0,0 +1,83 @@
+@{
+    ViewBag.Title = "教师发展";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">教师</div>
+        <div id="EmpNo"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">时间<font face="宋体">*</font></div>
+        <input id="JoinTime" type="text" readonly class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#JoinTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">证书名称</div>
+        <input id="CertificateName" readonly type="text" class="form-control" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">证书级别</div>
+        <div id="CertificateType" readonly></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">分值</div>
+        <input id="CertificateScore" readonly type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">附件</div>
+        <div id="CertificatePath"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">荣誉名称</div>
+        <input id="HonorName" readonly type="text" class="form-control" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">荣誉级别</div>
+        <div id="HonorType" readonly></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">分值</div>
+        <input id="HonorScore" readonly type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">附件</div>
+        <div id="HonorPath"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">论文名称</div>
+        <input id="ThesisName" readonly type="text" class="form-control" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">论文级别</div>
+        <div id="ThesisType" readonly></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">分值</div>
+        <input id="ThesisScore" readonly type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">附件</div>
+        <div id="ThesisPath"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">课题名称</div>
+        <input id="ProjectName" readonly type="text" class="form-control" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">课题级别</div>
+        <div id="ProjectType" readonly></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">分值</div>
+        <input id="ProjectScore" readonly type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="ProjectPath"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherDevelop">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" readonly class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherDevelop/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherDevelop/FormView.js

@@ -0,0 +1,59 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-24 14:32
+ * 描  述：教师发展
+ */
+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 () {
+            $('#EmpNo').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });          
+            $('#CertificateType').lrDataItemSelect({ code: 'CertificateLevel' });
+            $('#CertificatePath').lrUploader({ isUpload: false});
+            $('#HonorType').lrDataItemSelect({ code: 'HonorLevel' });
+            $('#HonorPath').lrUploader({ isUpload: false});
+            $('#ThesisType').lrDataItemSelect({ code: 'ThesisLevel' });
+            $('#ThesisPath').lrUploader({ isUpload: false});
+            $('#ProjectType').lrDataItemSelect({ code: 'SubjectLevelLevel' });
+            $('#ProjectPath').lrUploader({ isUpload: false});
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeacherDevelop/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 + '/PersonnelManagement/TeacherDevelop/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,73 @@
+@{
+    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="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教师</div>
+                                    <div id="EmpNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">证书名称</div>
+                                    <input id="CertificateName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">证书级别</div>
+                                    <div id="CertificateType"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">荣誉名称</div>
+                                    <input id="HonorName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">荣誉级别</div>
+                                    <div id="HonorType"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">论文名称</div>
+                                    <input id="ThesisName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">论文级别</div>
+                                    <div id="ThesisType"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">课题名称</div>
+                                    <input id="ProjectName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">论文级别</div>
+                                    <div id="ThesisType"></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_view" class="btn btn-default"><i class="fa fa-search-minus"></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/PersonnelManagement/Views/TeacherDevelop/Index.js")

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

@@ -0,0 +1,201 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-24 14:32
+ * 描  述：教师发展
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 240, 400);
+            $('#EmpNo').lrUserSelect(0);
+            $('#CertificateType').lrDataItemSelect({ code: 'CertificateLevel' });
+            $('#HonorType').lrDataItemSelect({ code: 'HonorLevel' });
+            $('#ThesisType').lrDataItemSelect({ code: 'ThesisLevel' });
+            $('#ProjectType').lrDataItemSelect({ code: 'SubjectLevelLevel' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/TeacherDevelop/Form',
+                    width: 600,
+                    height: 600,
+                    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 + '/PersonnelManagement/TeacherDevelop/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 600,
+                        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 + '/PersonnelManagement/TeacherDevelop/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //查看 
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formteachertrain',
+                        title: '查看',
+                        url: top.$.rootUrl + '/PersonnelManagement/TeacherDevelop/FormView?keyValue=' + keyValue,
+                        width: 600,
+                        height: 600,
+                        btn: '',
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/TeacherDevelop/GetPageList',
+                headData: [
+                    { label: "教师", name: "EmpNo", 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: "JoinTime", width: 100, align: "left"},
+                    { label: "证书名称", name: "CertificateName", width: 100, align: "left"},
+                    { label: "证书级别", name: "CertificateType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: '',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "分值", name: "CertificateScore", width: 100, align: "left"},
+                    { label: "荣誉名称", name: "HonorName", width: 100, align: "left"},
+                    { label: "荣誉级别", name: "HonorType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: '',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "分值", name: "HonorScore", width: 100, align: "left"},
+                    { label: "论文名称", name: "ThesisName", width: 100, align: "left"},
+                    { label: "论文级别", name: "ThesisType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: '',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "分值", name: "ThesisScore", width: 100, align: "left"},
+                    { label: "课题名称", name: "ProjectName", width: 100, align: "left"},
+                    { label: "课题级别", name: "ProjectType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: '',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "分值", name: "ProjectScore", width: 100, align: "left"},
+                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                ],
+                mainId:'ID',
+                isPage: true
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs

@@ -153,6 +153,55 @@ namespace Learun.Application.Web.Controllers
                 return Fail("未授权的appid");
         }
 
+        /// <summary>
+        /// 获取统一认证用户信息
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult UserInfo()
+        {
+            string appid = Request.QueryString["appid"];
+            string appkey = Request.QueryString["appkey"];
+            string m = Request.QueryString["m"];
+            string t = Request.QueryString["t"];
+            if (string.IsNullOrEmpty(appid))
+            {
+                return Fail("参数:appid不能为空");
+            }
+            if (string.IsNullOrEmpty(appkey))
+            {
+                return Fail("参数:appkey不能为空");
+            }
+            if (string.IsNullOrEmpty(m))
+            {
+                return Fail("参数:m不能为空");
+            }
+            if (string.IsNullOrEmpty(t))
+            {
+                return Fail("参数:t不能为空");
+            }
+            var application = perm_FunctionIBLL.GetPerm_FunctionEntity(appid);
+            if (application != null)
+            {
+                if (Md5Helper.Encrypt(application.FSecret, 32) == appkey)
+                {
+                    OperatorResult res = OperatorHelper.Instance.IsOnLine(DESEncrypt.Decrypt(t), DESEncrypt.Decrypt(m));
+                    if (res.stateCode == 1)
+                    {
+                        return Success(res.userInfo);
+                    }
+                    else
+                    {
+                        return Fail("登录无效");
+                    }
+                }
+                else
+                {
+                    return Fail("appkey错误");
+                }
+            }
+            else
+                return Fail("未授权的appid");
+        }
         #endregion
 
         #region 统一身份认证2.0

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

@@ -23,7 +23,8 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress>false</Use64BitIISExpress>
+    <Use64BitIISExpress>
+    </Use64BitIISExpress>
     <SccProjectName>
     </SccProjectName>
     <SccLocalPath>
@@ -916,6 +917,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\FixedAssetsController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\SafetyCheckController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\OfficeEquipmentController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeacherDevelopController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\CompetitionManagerController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\CompetitionGroupManagerController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\CompetitionInfoManagerController.cs" />
@@ -1921,6 +1923,7 @@
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForStudent.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForTeacher.js" />
+    <Content Include="Areas\PersonnelManagement\Views\TeacherDevelop\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherLeaveManagement\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherLeaveManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherLeaveManagement\Index.js" />
@@ -7222,6 +7225,10 @@
     <Content Include="Areas\EducationalAdministration\Views\CompetitionInfoManager\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\CompetitionInfoManager\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\CompetitionInfoManager\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\TeacherDevelop\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\TeacherDevelop\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\TeacherDevelop\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\TeacherDevelop\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />
@@ -8236,6 +8243,7 @@
     <Content Include="Areas\EducationalAdministration\Views\JobPerformance\IndexPrint.cshtml" />
     <Content Include="Content\excel\JobPerformanceImport.xls" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherTrain\FormView.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\TeacherDevelop\FormView.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

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

@@ -681,6 +681,7 @@
     <Compile Include="EducationalAdministration\CompetitionManagerMap.cs" />
     <Compile Include="EducationalAdministration\CompetitionGroupManagerMap.cs" />
     <Compile Include="EducationalAdministration\CompetitionInfoMap.cs" />
+    <Compile Include="PersonnelManagement\TeacherDevelopMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/TeacherDevelopMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-24 14:32
+    /// 描 述：教师发展
+    /// </summary>
+    public class TeacherDevelopMap : EntityTypeConfiguration<TeacherDevelopEntity>
+    {
+        public TeacherDevelopMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("TEACHERDEVELOP");
+            //主键
+            this.HasKey(t => t.ID);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

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

@@ -2144,6 +2144,10 @@
     <Compile Include="EducationalAdministration\CompetitionInfoManager\CompetitionInfoManagerService.cs" />
     <Compile Include="EducationalAdministration\CompetitionInfoManager\CompetitionInfoManagerBLL.cs" />
     <Compile Include="EducationalAdministration\CompetitionInfoManager\CompetitionInfoManagerIBLL.cs" />
+    <Compile Include="PersonnelManagement\TeacherDevelop\TeacherDevelopEntity.cs" />
+    <Compile Include="PersonnelManagement\TeacherDevelop\TeacherDevelopService.cs" />
+    <Compile Include="PersonnelManagement\TeacherDevelop\TeacherDevelopBLL.cs" />
+    <Compile Include="PersonnelManagement\TeacherDevelop\TeacherDevelopIBLL.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/TeacherDevelop/TeacherDevelopBLL.cs

@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-24 14:32
+    /// 描 述：教师发展
+    /// </summary>
+    public class TeacherDevelopBLL : TeacherDevelopIBLL
+    {
+        private TeacherDevelopService teacherDevelopService = new TeacherDevelopService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeacherDevelopEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return teacherDevelopService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TeacherDevelop表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TeacherDevelopEntity GetTeacherDevelopEntity(string keyValue)
+        {
+            try
+            {
+                return teacherDevelopService.GetTeacherDevelopEntity(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
+            {
+                teacherDevelopService.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, TeacherDevelopEntity entity)
+        {
+            try
+            {
+                teacherDevelopService.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/PersonnelManagement/TeacherDevelop/TeacherDevelopEntity.cs

@@ -0,0 +1,152 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-24 14:32
+    /// 描 述：教师发展
+    /// </summary>
+    public class TeacherDevelopEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 教师
+        /// </summary>
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary>
+        /// 日期
+        /// </summary>
+        [Column("JOINTIME")]
+        public DateTime? JoinTime { get; set; }
+        /// <summary>
+        /// 证书
+        /// </summary>
+        [Column("CERTIFICATENAME")]
+        public string CertificateName { get; set; }
+        /// <summary>
+        /// 证书级别
+        /// </summary>
+        [Column("CERTIFICATETYPE")]
+        public string CertificateType { get; set; }
+        /// <summary>
+        /// 证书分值
+        /// </summary>
+        [Column("CERTIFICATESCORE")]
+        public decimal? CertificateScore { get; set; }
+        /// <summary>
+        /// 证书附件
+        /// </summary>
+        [Column("CERTIFICATEPATH")]
+        public string CertificatePath { get; set; }
+        /// <summary>
+        /// 荣誉名称
+        /// </summary>
+        [Column("HONORNAME")]
+        public string HonorName { get; set; }
+        /// <summary>
+        /// 荣誉级别
+        /// </summary>
+        [Column("HONORTYPE")]
+        public string HonorType { get; set; }
+        /// <summary>
+        /// 荣誉分值
+        /// </summary>
+        [Column("HONORSCORE")]
+        public decimal? HonorScore { get; set; }
+        /// <summary>
+        /// 荣誉附件
+        /// </summary>
+        [Column("HONORPATH")]
+        public string HonorPath { get; set; }
+        /// <summary>
+        /// 论文
+        /// </summary>
+        [Column("THESISNAME")]
+        public string ThesisName { get; set; }
+        /// <summary>
+        /// 论文级别
+        /// </summary>
+        [Column("THESISTYPE")]
+        public string ThesisType { get; set; }
+        /// <summary>
+        /// 论文分值
+        /// </summary>
+        [Column("THESISSCORE")]
+        public decimal? ThesisScore { get; set; }
+        /// <summary>
+        /// 论文附件
+        /// </summary>
+        [Column("THESISPATH")]
+        public string ThesisPath { get; set; }
+        /// <summary>
+        /// 课题
+        /// </summary>
+        [Column("PROJECTNAME")]
+        public string ProjectName { get; set; }
+        /// <summary>
+        /// 课题级别
+        /// </summary>
+        [Column("PROJECTTYPE")]
+        public string ProjectType { get; set; }
+        /// <summary>
+        /// 课题分值
+        /// </summary>
+        [Column("PROJECTSCORE")]
+        public decimal? ProjectScore { get; set; }
+        /// <summary>
+        /// 课题附件
+        /// </summary>
+        [Column("PROJECTPATH")]
+        public string ProjectPath { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [Column("CREATEUSER")]
+        public string CreateUser { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            this.CreateUser = LoginUserInfo.Get().userId;
+        }
+        /// <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/PersonnelManagement/TeacherDevelop/TeacherDevelopIBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherDevelop/TeacherDevelopService.cs

@@ -0,0 +1,202 @@
+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.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-24 14:32
+    /// 描 述：教师发展
+    /// </summary>
+    public class TeacherDevelopService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeacherDevelopEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" t.* ");
+                strSql.Append("  FROM TeacherDevelop t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.JoinTime >= @startTime AND t.JoinTime <= @endTime ) ");
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpNo = @EmpNo ");
+                }
+                if (!queryParam["CertificateName"].IsEmpty())
+                {
+                    dp.Add("CertificateName", "%" + queryParam["CertificateName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.CertificateName Like @CertificateName ");
+                }
+                if (!queryParam["CertificateType"].IsEmpty())
+                {
+                    dp.Add("CertificateType", queryParam["CertificateType"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CertificateType = @CertificateType ");
+                }
+                if (!queryParam["HonorName"].IsEmpty())
+                {
+                    dp.Add("HonorName", "%" + queryParam["HonorName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.HonorName Like @HonorName ");
+                }
+                if (!queryParam["HonorType"].IsEmpty())
+                {
+                    dp.Add("HonorType", queryParam["HonorType"].ToString(), DbType.String);
+                    strSql.Append(" AND t.HonorType = @HonorType ");
+                }
+                if (!queryParam["ThesisName"].IsEmpty())
+                {
+                    dp.Add("ThesisName", "%" + queryParam["ThesisName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.ThesisName Like @ThesisName ");
+                }
+                if (!queryParam["ThesisType"].IsEmpty())
+                {
+                    dp.Add("ThesisType", queryParam["ThesisType"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ThesisType = @ThesisType ");
+                }
+                if (!queryParam["ProjectName"].IsEmpty())
+                {
+                    dp.Add("ProjectName", "%" + queryParam["ProjectName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.ProjectName Like @ProjectName ");
+                }
+                if (!queryParam["ThesisType"].IsEmpty())
+                {
+                    dp.Add("ThesisType", queryParam["ThesisType"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ThesisType = @ThesisType ");
+                }
+                var user = LoginUserInfo.Get();
+                if (!user.isSystem)//非超级管理员继续执行
+                {
+                    //角色非教师发展只能查看自己的
+                    if (!user.roleIds.Contains("f2c1ecc0-dec3-4458-a0fb-524eeffa8eb8"))
+                    {
+                        strSql.Append(" AND t.empno = '" + user.userId + "' ");
+                    }
+                }
+                return this.BaseRepository().FindList<TeacherDevelopEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TeacherDevelop表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TeacherDevelopEntity GetTeacherDevelopEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<TeacherDevelopEntity>(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().Delete<TeacherDevelopEntity>(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, TeacherDevelopEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository().Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository().Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}