收文信息

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -6,16 +6,16 @@
 //    webapi: 'http://112.230.201.53:31173/',
 //    web:"http://112.230.201.53/:8081/"//web地址，用于配置logo
 //};
-var config = {
-   webapi: 'http://localhost:31173/',
-   web: "http://localhost:20472/"//web地址，用于配置logo
-}; 
+//var config = {
+//    webapi: 'http://localhost:31173/',
+//    web: "http://localhost:20472/"//web地址，用于配置logo
+//}; 
 
 
-// var config = {
-// 	webapi: 'http://localhost:8081/',
-// 	web: "http://localhost:8087/" //web地址，用于配置logo
-// };
+var config = {
+    webapi: 'http://localhost:8081/',
+    web: "http://localhost:8087/"//web地址，用于配置logo
+}; 
 // var config = {
 //    webapi: 'http://123.57.209.16:31173/',
 //    web: "http://123.57.209.16:31175/"//web地址，用于配置logo
@@ -30,4 +30,4 @@ var config = {
 // var config = {
 //    webapi: 'http://123.57.209.16:31174/',
 //    web: "http://123.57.209.16:31175/"//web地址，用于配置logo
-// };
+// }; 

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

@@ -0,0 +1,131 @@
+using Learun.Application.TwoDevelopment.CustomFunction;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.CustomFunction.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-08 11:15
+    /// 描 述：科研项目级别管理
+    /// </summary>
+    public class SRProjectLevelController : MvcControllerBase
+    {
+        private SRProjectLevelIBLL sRProjectLevelIBLL = new SRProjectLevelBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRProjectLevelIBLL.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 SRProjectLevelData = sRProjectLevelIBLL.GetSRProjectLevelEntity(keyValue);
+            var jsonData = new
+            {
+                SRProjectLevel = SRProjectLevelData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRProjectLevelIBLL.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)
+        {
+            SRProjectLevelEntity entity = strEntity.ToObject<SRProjectLevelEntity>();
+            sRProjectLevelIBLL.SaveEntity(keyValue, entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 启用 禁用
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult UpdateStatus(string keyValue, int status)
+        {
+            sRProjectLevelIBLL.UpdateStatus(keyValue, status);
+            return Success("保存成功！");
+        }
+
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.CustomFunction;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.CustomFunction.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-09 10:30
+    /// 描 述：项目计划管理
+    /// </summary>
+    public class SRProjectPlanController : MvcControllerBase
+    {
+        private SRProjectPlanIBLL sRProjectPlanIBLL = new SRProjectPlanBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRProjectPlanIBLL.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 SRProjectPlanData = sRProjectPlanIBLL.GetSRProjectPlanEntity( keyValue );
+            var jsonData = new {
+                SRProjectPlan = SRProjectPlanData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRProjectPlanIBLL.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)
+        {
+            SRProjectPlanEntity entity = strEntity.ToObject<SRProjectPlanEntity>();
+            sRProjectPlanIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,139 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.CustomFunction;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.CustomFunction.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-08 11:51
+    /// 描 述：科研项目类型管理
+    /// </summary>
+    public class SRProjectTypeController : MvcControllerBase
+    {
+        private SRProjectTypeIBLL sRProjectTypeIBLL = new SRProjectTypeBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRProjectTypeIBLL.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 SRProjectTypeData = sRProjectTypeIBLL.GetSRProjectTypeEntity(keyValue);
+            var jsonData = new
+            {
+                SRProjectType = SRProjectTypeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRProjectTypeIBLL.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)
+        {
+            SRProjectTypeEntity entity = strEntity.ToObject<SRProjectTypeEntity>();
+            var data = sRProjectTypeIBLL.GetEntityByCode(entity.TypeCode);
+            if (string.IsNullOrEmpty(keyValue) && data != null)
+            {
+                return Fail("编码已存在，请重新输入！");
+            }
+            else if (!string.IsNullOrEmpty(keyValue) && (data != null && data.TypeID != keyValue))
+            {
+                return Fail("编码已存在，请重新输入！");
+            }
+
+            sRProjectTypeIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        
+
+            /// <summary>
+            /// 删除实体数据
+            /// </summary>
+            /// <param name="keyValue">主键</param>
+            /// <returns></returns>
+            [HttpPost]
+        [AjaxOnly]
+        public ActionResult UpdateStatus(string keyValue,int status)
+        {
+            sRProjectTypeIBLL.UpdateStatus(keyValue, status);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.CustomFunction;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.CustomFunction.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-09 10:51
+    /// 描 述：项目工作管理
+    /// </summary>
+    public class SRProjectWorkController : MvcControllerBase
+    {
+        private SRProjectWorkIBLL sRProjectWorkIBLL = new SRProjectWorkBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sRProjectWorkIBLL.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 SRProjectWorkData = sRProjectWorkIBLL.GetSRProjectWorkEntity( keyValue );
+            var jsonData = new {
+                SRProjectWork = SRProjectWorkData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sRProjectWorkIBLL.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)
+        {
+            SRProjectWorkEntity entity = strEntity.ToObject<SRProjectWorkEntity>();
+            sRProjectWorkIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/CustomFunctionAreaRegistration.cs

@@ -0,0 +1,24 @@
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.CustomFunction
+{
+    public class CustomFunctionAreaRegistration : AreaRegistration 
+    {
+        public override string AreaName 
+        {
+            get 
+            {
+                return "CustomFunction";
+            }
+        }
+
+        public override void RegisterArea(AreaRegistrationContext context) 
+        {
+            context.MapRoute(
+                "CustomFunction_default",
+                "CustomFunction/{controller}/{action}/{id}",
+                new { action = "Index", id = UrlParameter.Optional }
+            );
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "科研项目级别管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="SRProjectLevel" >
+        <div class="lr-form-item-title">级别名称<font face="宋体">*</font></div>
+        <input id="LevName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SRProjectLevel" >
+        <div class="lr-form-item-title">排序</div>
+        <input id="LevSort" type="text" class="form-control" isvalid="yes" checkexpession="NumOrNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SRProjectLevel" >
+        <div class="lr-form-item-title">状态<font face="宋体">*</font></div>
+        <div id="LevStatus"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectLevel/Form.js")

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

@@ -0,0 +1,59 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-08 11:15
+ * 描  述：科研项目级别管理
+ */
+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 () {
+            $('#LevStatus').lrRadioCheckbox({
+                type: 'radio',
+                code: 'EnableStatus',
+            }); 
+            
+            //$('#LevStatus').lrRadioCheckbox({
+            //    type: 'radio',
+            //    code: 'EnableStatus',
+            //});
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/SRProjectLevel/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/CustomFunction/SRProjectLevel/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,45 @@
+@{
+    ViewBag.Title = "科研项目级别管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">级别名称</div>
+                                    <input id="LevName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">状态</div>
+                                    <div id="LevStatus"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr-enable"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 启用</a>
+                        <a id="lr-disable"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 禁用</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectLevel/Index.js")

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

@@ -0,0 +1,153 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-08 11:15
+ * 描  述：科研项目级别管理
+ */
+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);
+            $('#LevStatus').lrRadioCheckbox({
+                type: 'radio',
+                code: 'EnableStatus',
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/SRProjectLevel/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('LevID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/CustomFunction/SRProjectLevel/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('LevID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/CustomFunction/SRProjectLevel/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+            //  启用
+            $('#lr-enable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('LevID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认启用选中记录！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/CustomFunction/SRProjectLevel/UpdateStatus', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //  禁用
+            $('#lr-disable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('LevID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认禁用选中记录！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/CustomFunction/SRProjectLevel/UpdateStatus', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/CustomFunction/SRProjectLevel/GetPageList',
+                headData: [
+                    { label: "级别名称", name: "LevName", width: 100, align: "left" },
+                    { label: "排序", name: "LevSort", width: 100, align: "left" },
+                    { label: "创建用户", name: "LevCreateUserName", width: 100, align: "left" },
+                    {
+                        label: "创建时间", name: "LevCreateTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "状态", name: "LevStatus", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 1) {
+                                return '<span class=\"label label-success\">启用</span>';
+                            } else if (cellvalue == 0) {
+                                return '<span class=\"label label-danger\">禁用</span>';
+                            }
+                        }
+
+
+                    }
+                    //formatterAsync: function (callback, value, row, op,$cell) {
+                    //     learun.clientdata.getAsync('dataItem', {
+                    //         key: value,
+                    //         code: 'EnableStatus',
+                    //         callback: function (_data) {
+                    //             callback(_data.text);
+                    //         }
+                    //     });
+                    //}},
+                ],
+                mainId: 'LevID',
+                isPage: true,
+                sidx: 'LevSort',
+                sord: 'ASC',
+                isMultiselect: true,
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -0,0 +1,23 @@
+@{
+    ViewBag.Title = "项目计划管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="SRProjectPlan" >
+        <div class="lr-form-item-title">项目编号<font face="宋体">*</font></div>
+        <input id="EnCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SRProjectPlan" >
+        <div class="lr-form-item-title">项目名称<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SRProjectPlan" >
+        <div class="lr-form-item-title">项目计划名称<font face="宋体">*</font></div>
+        <input id="PlanName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SRProjectPlan" >
+        <div class="lr-form-item-title">项目计划文件</div>
+        <div id="PlanUrl"  ></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectPlan/Form.js")

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

@@ -0,0 +1,51 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-09 10:30
+ * 描  述：项目计划管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#PlanUrl').lrUploader();
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/SRProjectPlan/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/CustomFunction/SRProjectPlan/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,45 @@
+@{
+    ViewBag.Title = "项目计划管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">项目编号</div>
+                                    <input id="EnCode" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">项目名称</div>
+                                    <input id="Name" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">项目计划名称</div>
+                                    <input id="PlanName" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectPlan/Index.js")

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

@@ -0,0 +1,100 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-09 10:30
+ * 描  述：项目计划管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/SRProjectPlan/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/CustomFunction/SRProjectPlan/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/CustomFunction/SRProjectPlan/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/CustomFunction/SRProjectPlan/GetPageList',
+                headData: [
+                    { label: "项目编号", name: "EnCode", width: 100, align: "left"},
+                    { label: "项目名称", name: "Name", width: 100, align: "left"},
+                    { label: "项目计划名称", name: "PlanName", width: 100, align: "left"},
+                    { label: "创建人", name: "CreateUserName", width: 100, align: "left" },
+                    {
+                        label: "创建时间", name: "CreateTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    }
+                ],
+                mainId:'ID',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -0,0 +1,28 @@
+@{
+    ViewBag.Title = "科研项目类型管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="SRProjectType">
+        <div class="lr-form-item-title">分类编码<font face="宋体">*</font></div>
+        <input id="TypeCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SRProjectType">
+        <div class="lr-form-item-title">分类名称<font face="宋体">*</font></div>
+        <input id="TypeName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SRProjectType">
+        <div class="lr-form-item-title">上级</div>
+        <div id="TypeParentId"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SRProjectType">
+        <div class="lr-form-item-title">排序</div>
+        <input id="TypeSort" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SRProjectType">
+        <div class="lr-form-item-title">状态<font face="宋体">*</font></div>
+        <div id="TypeStatus"></div>
+    </div>
+</div>
+
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectType/Form.js")

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

@@ -0,0 +1,55 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-08 11:51
+ * 描  述：科研项目类型管理
+ */
+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 () {
+            $('#TypeParentId').lrDataSourceSelect({ code: 'SRProjectType', value: 'typeid', text: 'typename' });
+            $('#TypeStatus').lrRadioCheckbox({
+                type: 'radio',
+                code: 'EnableStatus',
+            });
+        }, 
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/SRProjectType/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    } 
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/CustomFunction/SRProjectType/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,49 @@
+@{
+    ViewBag.Title = "科研项目类型管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">分类编码</div>
+                                    <input id="TypeCode" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">分类名称</div>
+                                    <input id="TypeName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">状态</div>
+                                    <div id="TypeStatus"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr-enable"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 启用</a>
+                        <a id="lr-disable"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 禁用</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectType/Index.js")

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

@@ -0,0 +1,150 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-08 11:51
+ * 描  述：科研项目类型管理
+ */
+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);
+            $('#TypeStatus').lrRadioCheckbox({
+                type: 'radio',
+                code: 'EnableStatus',
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/SRProjectType/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('TypeID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/CustomFunction/SRProjectType/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('TypeID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/CustomFunction/SRProjectType/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+            //  启用
+            $('#lr-enable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('TypeID');
+                
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认启用选中记录！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/CustomFunction/SRProjectType/UpdateStatus', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //  禁用
+            $('#lr-disable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('TypeID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认禁用选中记录！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/CustomFunction/SRProjectType/UpdateStatus', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/CustomFunction/SRProjectType/GetPageList',
+                headData: [
+                    { label: "分类编码", name: "TypeCode", width: 100, align: "left"},
+                    { label: "分类名称", name: "TypeName", width: 100, align: "left"},
+                    { label: "上级", name: "TypeParentId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('dataItem', {
+                                 key: value,
+                                 code: 'ResearchType',
+                                 callback: function (_data) {
+                                     callback(_data.text);
+                                 }
+                             });
+                        }},
+                    { label: "排序", name: "TypeSort", width: 100, align: "left"},
+                    {
+                        label: "状态",
+                        name: "TypeStatus",
+                        width: 100,
+                        align: "left",
+                        formatter: function(cellvalue, row) {
+                            if (cellvalue == 1) {
+                                return '<span class=\"label label-success\">启用</span>';
+                            } else if (cellvalue == 0) {
+                                return '<span class=\"label label-danger\">禁用</span>';
+                            }
+                        }
+                    }
+                ],
+                mainId:'TypeID',
+                isPage: true,
+                isMultiselect: true,
+                isTree: true,
+                parentId: 'TypeParentId'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "项目工作管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item"  data-table="SRProjectWork" >
+        <div class="lr-form-item-title">项目编号<font face="宋体">*</font></div>
+        <input id="EnCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SRProjectWork" >
+        <div class="lr-form-item-title">项目名称<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SRProjectWork" >
+        <div class="lr-form-item-title">工作名称<font face="宋体">*</font></div>
+        <input id="WorkName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SRProjectWork" >
+        <div class="lr-form-item-title">工作进度</div>
+        <input id="PlannedSpeed" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SRProjectWork">
+        <div class="lr-form-item-title">工作人员</div>
+        <div id="People">工作人员</div>
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SRProjectWork" >
+        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <input id="StartTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#StartTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SRProjectWork" >
+        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#EndTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SRProjectWork" >
+        <div class="lr-form-item-title">附件</div>
+        <div id="Url"  ></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectWork/Form.js")

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

@@ -0,0 +1,53 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-09 10:51
+ * 描  述：项目工作管理
+ */
+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 () {
+            $('#Url').lrUploader();
+            $('#People').lrUserSelect({ type: '1' });
+
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/SRProjectWork/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/CustomFunction/SRProjectWork/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,48 @@
+@{
+    ViewBag.Title = "项目工作管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">项目编号</div>
+                                    <input id="EnCode" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">项目名称</div>
+                                    <input id="Name" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">工作名称</div>
+                                    <input id="WorkName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">开始时间</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/SRProjectWork/Index.js")

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

@@ -0,0 +1,114 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-09 10:51
+ * 描  述：项目工作管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/SRProjectWork/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/CustomFunction/SRProjectWork/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/CustomFunction/SRProjectWork/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/CustomFunction/SRProjectWork/GetPageList',
+                headData: [
+                    { label: "项目编号", name: "EnCode", width: 100, align: "left" },
+                    { label: "项目名称", name: "Name", width: 100, align: "left" },
+                    { label: "工作名称", name: "WorkName", width: 100, align: "left" },
+                    { label: "工作进度", name: "PlannedSpeed", width: 100, align: "left" },
+                    { label: "工作人员", name: "People", width: 100, align: "left" },
+                    {
+                        label: "开始时间", name: "StartTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "结束时间", name: "EndTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "创建人", name: "CreateUserName", width: 100, align: "left" },
+                    {
+                        label: "创建时间", name: "CreateTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/web.config

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<configuration>
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+
+  <system.web.webPages.razor>
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    <pages pageBaseType="System.Web.Mvc.WebViewPage">
+      <namespaces>
+        <add namespace="System.Web.Mvc" />
+        <add namespace="System.Web.Mvc.Ajax" />
+        <add namespace="System.Web.Mvc.Html" />
+        <add namespace="System.Web.Routing" />
+        <add namespace="Learun.Application.Web" />
+        
+      </namespaces>
+    </pages>
+  </system.web.webPages.razor>
+
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
+  </appSettings>
+
+  <system.webServer>
+    <handlers>
+      <remove name="BlockViewHandler"/>
+      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
+    </handlers>
+  </system.webServer>
+</configuration>

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

@@ -27,7 +27,7 @@
                         <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>
+                        <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;异动恢复</a>
                     </div>
                 </div>
             </div>

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

@@ -90,16 +90,16 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            //去审核
+            //去审核/异动恢复
             $('#lr_uncheck').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
                     if (CheckStatus != 1) {
-                        learun.alert.warning("当前项目未审核无法去审！");
+                        learun.alert.warning("当前项目未审核无法恢复！");
                         return;
                     }
-                    learun.layerConfirm('是否确认去审核该项！', function (res) {
+                    learun.layerConfirm('是否确认恢复该项！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/UnCheckForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
@@ -225,7 +225,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: "审核状态", name: "CheckStatus", width: 100, align: "left",
                         formatter: function (cellvalue) {
-                            return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
+                            return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : cellvalue == "2" ? "<span class=\"label label-warning\">已恢复</span>" : "<span class=\"label label-danger\">未审核</span>";
                         }
                     },
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CollectManageController.cs

@@ -0,0 +1,121 @@
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-02 16:12
+    /// 描 述：网上办事大厅拖拽版-可用应用收藏管理
+    /// </summary>
+    public class SSO_Drag_CollectManageController : MvcControllerBase
+    {
+        private SSO_Drag_CollectManageIBLL sSO_Drag_CollectManageIBLL = new SSO_Drag_CollectManageBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = sSO_Drag_CollectManageIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <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 = sSO_Drag_CollectManageIBLL.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 data = sSO_Drag_CollectManageIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sSO_Drag_CollectManageIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,SSO_Drag_CollectManageEntity entity)
+        {
+            sSO_Drag_CollectManageIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.cshtml

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "网上办事大厅拖拽版-可用应用收藏管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">主键<font face="宋体">*</font></div>
+        <input id="Id" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">用户<font face="宋体">*</font></div>
+        <input id="UserId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">模式编号：one办事大厅模式，two效率优先模式，three管理驾驶舱模式<font face="宋体">*</font></div>
+        <input id="ModelCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">可用应用Id<font face="宋体">*</font></div>
+        <input id="SchemeInfoId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">收藏时间<font face="宋体">*</font></div>
+        <input id="Time" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Form.js

@@ -0,0 +1,38 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-02 16:12
+ * 描  述：网上办事大厅拖拽版-可用应用收藏管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CollectManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "网上办事大厅拖拽版-可用应用收藏管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">树形目录</div>
+            <div id="tree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">标题</div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </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>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CollectManage/Index.js

@@ -0,0 +1,94 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-02 16:12
+ * 描  述：网上办事大厅拖拽版-可用应用收藏管理
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CollectManage/Form',
+                    width: 700,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CollectManage/Form?keyValue=' + keyValue,
+                        width: 700,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CollectManage/DeleteForm', { keyValue: keyValue}, function () {
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CollectManage/GetPageList',
+                headData: [
+                        { label: '主键', name: 'Id', width: 200, align: "left" },
+                        { label: '用户', name: 'UserId', width: 200, align: "left" },
+                        { label: '模式编号：one办事大厅模式，two效率优先模式，three管理驾驶舱模式', name: 'ModelCode', width: 200, align: "left" },
+                        { label: '可用应用Id', name: 'SchemeInfoId', width: 200, align: "left" },
+                        { label: '收藏时间', name: 'Time', width: 200, align: "left" },
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -56,6 +56,25 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 主页面-我参加的会议
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfMyJoin()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 报表统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexStatistics()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据
@@ -94,6 +113,18 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return Success(data);
         }
         /// <summary>
+        /// 获取报表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetStatisticList(string queryJson)
+        {
+            var data = meetingManagementIBLL.GetStatisticList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
         /// 获取表单数据
         /// <summary>
         /// <returns></returns>

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

@@ -37,6 +37,25 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 会议考勤
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexAttendance()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 会议考勤-查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormViewAttendance()
+        {
+            return View();
+        }
+
         #endregion
 
         #region 获取数据

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

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -71,8 +71,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var ResourceImportData = resourceImportIBLL.GetResourceImportEntity( keyValue );
-            var jsonData = new {
+            var ResourceImportData = resourceImportIBLL.GetResourceImportEntity(keyValue);
+            var jsonData = new
+            {
                 ResourceImport = ResourceImportData,
             };
             return Success(jsonData);
@@ -93,6 +94,20 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             resourceImportIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
         }
+
+
+        /// <summary>
+        /// 发布
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult Publish(string keyValue, int ImportState)
+        {
+            resourceImportIBLL.Publish(keyValue, ImportState);
+            return Success("删除成功！");
+        }
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
@@ -105,7 +120,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             ResourceImportEntity entity = strEntity.ToObject<ResourceImportEntity>();
-            resourceImportIBLL.SaveEntity(keyValue,entity);
+            resourceImportIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }

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

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -71,8 +71,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var StudyGuideData = studyGuideIBLL.GetStudyGuideEntity( keyValue );
-            var jsonData = new {
+            var StudyGuideData = studyGuideIBLL.GetStudyGuideEntity(keyValue);
+            var jsonData = new
+            {
                 StudyGuide = StudyGuideData,
             };
             return Success(jsonData);
@@ -94,6 +95,18 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return Success("删除成功！");
         }
         /// <summary>
+        /// 发布
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult Publish(string keyValue,int GuideState)
+        {
+            studyGuideIBLL.Publish(keyValue, GuideState);
+            return Success("发布成功！");
+        }
+        /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
         /// <param name="keyValue">主键</param>
@@ -105,7 +118,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             StudyGuideEntity entity = strEntity.ToObject<StudyGuideEntity>();
-            studyGuideIBLL.SaveEntity(keyValue,entity);
+            studyGuideIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml

@@ -1,7 +1,7 @@
 @{
     /**/
 
-    ViewBag.Title = "会议管理";
+    ViewBag.Title = "我参加的会议";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
 <div class="lr-layout ">
@@ -33,19 +33,9 @@
                         <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-plus"></i>&nbsp;查看</a>
-                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
-                    </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_attendance" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;考勤</a>
-                        <a id="lr_minutes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;纪要</a>
-                        <a id="lr_notice" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;通知</a>
-                        <a id="lr_checkyes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核通过</a>
-                        <a id="lr_checkno" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核不通过</a>
                     </div>
+                   
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js

@@ -28,79 +28,6 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            // 新增
-            $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'addform',
-                    title: '新增',
-                    url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form',
-                    width: 1000,
-                    height: 800,
-                    callBack: function (id) {
-                        var res = false;
-                        // 验证数据
-                        res = top[id].validForm();
-                        // 保存数据
-                        if (res) {
-                            res = top[id].save('', function () {
-                                page.search();
-                            });
-                        }
-                        return res;
-                    }
-                });
-            });
-            // 编辑
-            $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckStatus == "1") {
-                        learun.alert.warning("当前项已审核通过！");
-                        return false;
-                    } else if (CheckStatus == "3") {
-                        learun.alert.warning("当前项审核中！");
-                        return false;
-                    }
-                    learun.layerForm({
-                        id: 'editform',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form?keyValue=' + keyValue,
-                        width: 1000,
-                        height: 800,
-                        callBack: function (id) {
-                            var res = false;
-                            // 验证数据
-                            res = top[id].validForm();
-                            // 保存数据
-                            if (res) {
-                                res = top[id].save('', function () {
-                                    page.search();
-                                });
-                            }
-                            return res;
-                        }
-                    });
-                }
-            });
-            // 删除
-            $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckStatus != "0") {
-                        learun.alert.warning("当前项已审核或审核中！");
-                        return false;
-                    }
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
             // 查看
             $('#lr_view').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -115,67 +42,7 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            //提交
-            $('#lr_submit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckStatus == "1") {
-                        learun.alert.warning("当前项已审核通过！");
-                        return false;
-                    } else if (CheckStatus == "3") {
-                        learun.alert.warning("当前项审核中！");
-                        return false;
-                    }
-                    learun.layerConfirm('是否确认提交该项！', function (res) {
-                        if (res) {
-                            processId = learun.newGuid();
-                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoSubmit', { keyValue: keyValue, status: '3', processId: processId }, function (res) {
-                                refreshGirdData(res, {});
-                            });
-                        }
-                    });
-                }
-            });
-            // 考勤
-            // 纪要
-            // 通知
-            // 审核通过
-            $('#lr_checkyes').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckStatus == '1') {
-                        learun.alert.warning("该项已审核通过！");
-                        return false;
-                    }
-                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
-                        if (res) {
-                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '1' }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
-            // 审核不通过
-            $('#lr_checkno').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckStatus == '2') {
-                        learun.alert.warning("该项已审核不通过！");
-                        return false;
-                    }
-                    learun.layerConfirm('是否确认审核不通过该项！', function (res) {
-                        if (res) {
-                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '2' }, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
+            
         },
         // 初始化列表
         initGird: function () {
@@ -247,17 +114,6 @@ var bootstrap = function ($, learun) {
         }
     };
     refreshGirdData = function (res, postData) {
-        if (res && res.code && res.code == 200) {
-            // 发起流程
-            var postData = {
-                schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号
-                processId: processId,
-                level: '1',
-            };
-            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
-                learun.loading(false);
-            });
-        }
         page.search();
     };
     page.init();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexStatistics.cshtml

@@ -0,0 +1,46 @@
+@{
+    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>
+                                    <input id="meetingtitle" type="text" class="form-control" />
+                                </div>
+                                @*<div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">开始时间</div>
+                                    <input id="begintime" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">结束时间</div>
+                                    <input id="endtime" 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_outport" class="btn btn-default"><i class="fa fa-sign-out"></i> 导出</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i> 打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/IndexStatistics.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexStatistics.js

@@ -0,0 +1,188 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-07 16:39
+ * 描  述：a
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var map = {};
+    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);
+            }, 120, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+            // 导出
+            $('#lr_outport').on('click', function () {
+                learun.download({
+                    method: 'POST',
+                    url: '/Utility/ExportExcel',
+                    param: {
+                        fileName: '导出数据列表',
+                        columnJson: JSON.stringify($('#gridtable').jfGridGet('settingInfo').headData),
+                        dataJson: JSON.stringify($('#gridtable').jfGridGet('settingInfo').rowdatas)
+                    }
+                });
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetStatisticList',
+                headData: [
+                    { label: "会议标题", name: "meetingtitle", width: 100, align: "left" },
+                    { label: "会议开始时间", name: "begintime", width: 200, align: "left" },
+                    { label: "会议结束时间", name: "endtime", width: 200, align: "left" },
+                    { label: "正常(人)", name: "正常", width: 100, align: "left" },
+                    { label: "未到(人)", name: "未到", width: 100, align: "left" },
+                ],
+            });
+        },
+        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/Areas/PersonnelManagement/Views/MeetingSignInRecord/FormViewAttendance.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "会议考勤";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item"  data-table="MeetingSignInRecord" >
+        <div class="lr-form-item-title">考勤类型</div>
+        <div id="IsSignIn" readonly="readonly" ></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingSignInRecord/FormViewAttendance.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/FormViewAttendance.js

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/IndexAttendance.cshtml

@@ -0,0 +1,44 @@
+@{
+    /**/
+
+    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="MeetingTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">用户</div>
+                                    <input id="ParticipantName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">考勤类型</div>
+                                    <div id="IsSignIn"></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_view" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查看</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingSignInRecord/IndexAttendance.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/IndexAttendance.js

@@ -0,0 +1,81 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:16
+ * 描  述：会议考勤管理
+ */
+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);
+            $('#IsSignIn').lrDataItemSelect({ code: 'meetingAdType' }); 
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查看',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/FormViewAttendance?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/GetPageList',
+                headData: [
+                    { label: "姓名", name: "ParticipantName", width: 100, align: "left" },
+                    { label: "会议", name: "MeetingTitle", width: 150, align: "left" },
+                    {
+                        label: "考勤类型", name: "IsSignIn", width: 100, align: "left",
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.clientdata.getAsync('dataItem', {
+                        //        key: value,
+                        //        code: 'meetingAdType',
+                        //        callback: function (_data) {
+                        //            callback(_data.text);
+                        //        }
+                        //    });
+                        //}
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "正常" : "未到";
+                        }
+                    },
+                    { label: "考勤时间", name: "SignInTime", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'MeetID,ParticipantID'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -7,13 +7,15 @@
         <div class="lr-form-item-title">组织名称<font face="宋体">*</font></div>
         <input id="GerName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
+    <div class="col-xs-12 lr-form-item" data-table="ResearchGER">
         <div class="lr-form-item-title">专业组长<font face="宋体">*</font></div>
-        <input id="GerBoss" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div id="GerBoss"></div>
+        @*<input id="GerBoss" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />*@
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
+    <div class="col-xs-12 lr-form-item" data-table="ResearchGER">
         <div class="lr-form-item-title">组织成员<font face="宋体">*</font></div>
-        <textarea id="Gerpeople" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+        <div id="Gerpeople"></div>
+        @*<textarea id="Gerpeople" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>*@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
         <div class="lr-form-item-title">成立时间</div>

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

@@ -15,6 +15,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#GerBoss').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' });
+            $('#Gerpeople').lrUserSelect({ type: '1' });
             $('#GerState').lrRadioCheckbox({
                 type: 'radio',
                 code: 'EnableStatus',

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

@@ -1,103 +1,129 @@
-/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
- * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
- * 创建人：超级管理员
- * 日  期：2021-05-11 18:17
- * 描  述：教科研组管理
- */
-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);
-            }, 130, 200);
-            // 刷新
-            $('#lr_refresh').on('click', function () {
-                location.reload();
-            });
-            // 新增
-            $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/Form',
-                    width: 600,
-                    height: 400,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
-                });
-            });
-            // 编辑
-            $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('GerID');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'form',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
-            // 删除
-            $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('GerID');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ResearchGER/DeleteForm', { keyValue: keyValue}, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
-            // 打印
-            $('#lr_print').on('click', function () {
-                $('#gridtable').jqprintTable();
-            });
-        },
-        // 初始化列表
-        initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/GetPageList',
-                headData: [
-                    { label: "组织名称", name: "GerName", width: 100, align: "left"},
-                    { label: "专业组长", name: "GerBoss", width: 100, align: "left"},
-                    { label: "成立时间", name: "Gertiem", width: 100, align: "left"},
-                    { label: "状态", name: "GerState", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'EnableStatus',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
-                        }},
-                ],
-                mainId:'GerID',
-                isPage: true
-            });
-            page.search();
-        },
-        search: function (param) {
-            param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
-        }
-    };
-    refreshGirdData = function () {
-        $('#gridtable').jfGridSet('reload');
-    };
-    page.init();
-}
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-05-11 18:17
+ * 描  述：教科研组管理
+ */
+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);
+            }, 130, 200);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/Form',
+                    width: 600,
+                    height: 450,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('GerID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 450,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('GerID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ResearchGER/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/GetPageList',
+                headData: [
+                    { label: "组织名称", name: "GerName", width: 100, align: "left"},
+                    {
+                        label: "专业组长", name: "GerBoss", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "成立时间", name: "Gertiem", width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        },
+                        sort: true
+                    },
+                    { label: "状态", name: "GerState", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 1) {
+                                return '<span class=\"label label-success\">启用</span>';
+                            } else if (cellvalue == 0) {
+                                return '<span class=\"label label-danger\">禁用</span>';
+                            }
+                        }
+                        //formatterAsync: function (callback, value, row, op,$cell) {
+                        //     learun.clientdata.getAsync('dataItem', {
+                        //         key: value,
+                        //         code: 'EnableStatus',
+                        //         callback: function (_data) {
+                        //             callback(_data.text);
+                        //         }
+                        //     });
+                        //}
+                    },
+                ],
+                mainId:'GerID',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -11,14 +11,14 @@
         <div class="lr-form-item-title">内容</div>
         <div id="ImportContent" style="height:200px;"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ResourceImport" style="display: none; " >
+    @*<div class="col-xs-12 lr-form-item"  data-table="ResourceImport" style="display: none; " >
         <div class="lr-form-item-title">添加时间</div>
         <input id="ImportTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ResourceImport" style="display: none; " >
         <div class="lr-form-item-title">创建用户</div>
         <input id="ImportUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
-    </div>
+    </div>*@
     <div class="col-xs-12 lr-form-item"  data-table="ResourceImport" >
         <div class="lr-form-item-title">附件</div>
         <div id="ImportLetter"  ></div>

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

@@ -16,13 +16,15 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             var ImportContentUE =  UE.getEditor('ImportContent');
-            $('#ImportContent')[0].ue =  ImportContentUE;            $('#ImportTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
-            $('#ImportUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
-            $('#ImportUser').val(learun.clientdata.get(['userinfo']).realName);
+            $('#ImportContent')[0].ue = ImportContentUE;
+            //$('#ImportTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            //$('#ImportUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            //$('#ImportUser').val(learun.clientdata.get(['userinfo']).realName);
             $('#ImportLetter').lrUploader();
+            
             $('#ImportState').lrRadioCheckbox({
                 type: 'radio',
-                code: 'YesOrNoInt',
+                code: 'publishStatus',
             });
         },
         initData: function () {

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

@@ -23,10 +23,12 @@
                         <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_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_publish" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;发布</a>
+                        <a id="lr_nopublish" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;取消发布</a>
+                        
                     </div>
                 </div>
             </div>

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

@@ -26,8 +26,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/ResourceImport/Form',
-                    width: 600,
-                    height: 400,
+                    width: 800,
+                    height: 600,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -41,8 +41,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/ResourceImport/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 800,
+                        height: 600,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -55,7 +55,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ResourceImport/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ResourceImport/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -66,42 +66,78 @@ var bootstrap = function ($, learun) {
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
             });
+            //发布
+            $('#lr_publish').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ImportId');
+                var ImportState = $('#gridtable').jfGridValue('ImportState');
+                if (learun.checkrow(keyValue)) {
+                    if (ImportState.indexOf('0') != -1) {
+                        return learun.alert.warning('选中记录包含已发布的记录！');
+                    }
+                    learun.layerConfirm('是否确认发布选中记录！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ResourceImport/Publish', { keyValue: keyValue, ImportState: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //取消发布
+            $('#lr_nopublish').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ImportId');
+                var ImportState = $('#gridtable').jfGridValue('ImportState');
+                if (learun.checkrow(keyValue)) {
+                    if (ImportState.indexOf('1') != -1) {
+                        return learun.alert.warning('选中记录包含未发布的记录！');
+                    }
+                    learun.layerConfirm('是否确认发布选中记录！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ResourceImport/Publish', { keyValue: keyValue, ImportState: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/ResourceImport/GetPageList',
                 headData: [
-                    { label: "标题", name: "ImportName", width: 100, align: "left"},
-                    { label: "添加时间", name: "ImportTime", width: 100, align: "left"},
-                    { label: "创建用户", name: "ImportUser", 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: "ImportState", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoInt',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
-                        }},
+                    { label: "标题", name: "ImportName", width: 100, align: "left" },
+                    {
+                        label: "创建用户", name: "ImportUser", width: 100, align: "left"
+                    },
+                    {
+                        label: "添加时间", name: "ImportTime", width: 100, align: "left", formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "发布状态",
+                        name: "ImportState",
+                        width: 100,
+                        align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-success\">发布</span>';
+                            } else if (cellvalue == 1) {
+                                return '<span class=\"label label-danger\">暂未发布</span>';
+                            }
+                        }
+                    }
                 ],
-                mainId:'ImportId',
-                isPage: true
+                mainId: 'ImportId',
+                isPage: true,
+                isMultiselect: true,
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

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

@@ -11,14 +11,14 @@
         <div class="lr-form-item-title">附件上传</div>
         <div id="AttachmentUp"  ></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudyGuide" >
+    @*<div class="col-xs-12 lr-form-item"  data-table="StudyGuide" >
         <div class="lr-form-item-title">创建用户</div>
         <input id="GuideName" type="text" class="form-control"  />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="StudyGuide" >
         <div class="lr-form-item-title">添加时间</div>
         <input id="Guidetime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#Guidetime').trigger('change'); } })"   />
-    </div>
+    </div>*@
     <div class="col-xs-12 lr-form-item"  data-table="StudyGuide" >
         <div class="lr-form-item-title">是否发布</div>
         <div id="GuideState"  ></div>

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

@@ -16,7 +16,10 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#AttachmentUp').lrUploader();
-            $('#GuideState').lrDataItemSelect({ code: 'YesOrNoInt' });
+            $('#GuideState').lrRadioCheckbox({
+                type: 'radio',
+                code: 'publishStatus',
+            });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -2,7 +2,7 @@
     ViewBag.Title = "研究指导";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -23,10 +23,12 @@
                         <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_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_publish" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;发布</a>
+                        <a id="lr_nopublish" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;取消发布</a>
+                        @*<a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>*@
                     </div>
                 </div>
             </div>

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

@@ -55,7 +55,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/StudyGuide/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/StudyGuide/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -66,34 +66,74 @@ var bootstrap = function ($, learun) {
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
             });
+            //发布
+            $('#lr_publish').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StudyID');
+                var GuideState = $('#gridtable').jfGridValue('GuideState');
+                if (learun.checkrow(keyValue)) {
+                    if (GuideState.indexOf('0') != -1) {
+                        return learun.alert.warning('选中记录包含已发布的记录！');
+                    }
+                    learun.layerConfirm('是否确认发布选中记录！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/StudyGuide/Publish', { keyValue: keyValue, GuideState: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //取消发布
+            $('#lr_nopublish').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StudyID');
+                var GuideState = $('#gridtable').jfGridValue('GuideState');
+                if (learun.checkrow(keyValue)) {
+                    if (GuideState.indexOf('1') != -1) {
+                        return learun.alert.warning('选中记录包含未发布的记录！');
+                    }
+                    learun.layerConfirm('是否确认发布选中记录！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/StudyGuide/Publish', { keyValue: keyValue, GuideState: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/StudyGuide/GetPageList',
                 headData: [
-                    { label: "标题", name: "StudyName", width: 100, align: "left"},
-                    { label: "创建用户", name: "GuideName", width: 100, align: "left"},
-                    { label: "添加时间", name: "Guidetime", width: 100, align: "left"},
-                    { label: "是否发布", name: "GuideState", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoInt',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
-                        }},
+                    { label: "标题", name: "StudyName", width: 100, align: "left" },
+                    { label: "创建用户", name: "CreateUserName", width: 100, align: "left" },
+                    {
+                        label: "添加时间", name: "CreateTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "发布状态", name: "GuideState", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-success\">发布</span>';
+                            } else if (cellvalue == 1) {
+                                return '<span class=\"label label-danger\">暂未发布</span>';
+                            }
+                        }
+                    },
                 ],
-                mainId:'StudyID',
-                isPage: true
+                mainId: 'StudyID',
+                isPage: true,
+                isMultiselect: true,
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js

@@ -24,7 +24,7 @@ $(document).ready(function () {
             var keyword = $('#headSearchInput').val();
             if ($.trim(keyword) != "") {
                 $.each($('.search').find('.searchLi'), function (i, item) {
-                    if ($(item).children('.searchLiTxt').html().indexOf(keyword) != -1) {
+                    if ($(item).find('.searchLiTxt').html().indexOf(keyword) != -1) {
                         $(item).show();
                     } else {
                         $(item).hide();
@@ -77,12 +77,85 @@ $(document).ready(function () {
                 }
             }
         });
-    }).on('click', '.inSec1List2 .fa', function () {
+    }).on('click', '#flowList .fa', function () {//可用应用
         //是否收藏
+        var modelCode = $('#ModelCode').val();
+        var userId = $('#UserId').val();
+        var Id = $(this).parent('li').attr('data-Id');
+        var isCollect = true;
+        var tipMsg = "";
         if ($(this).hasClass('fa-heart')) {
-            $(this).removeClass('fa-heart').addClass('fa-heart-o');
+            //ajax取消收藏操作
+            isCollect = false;
+            tipMsg = "取消收藏成功！";
         } else {
-            $(this).removeClass('fa-heart-o').addClass('fa-heart');
+            //ajax收藏操作
+            isCollect = true;
+            tipMsg = "收藏成功！";
+        }
+        if (userId != "" && userId != undefined && modelCode != "" && modelCode != undefined && Id != "" && Id != undefined) {
+            $.ajax({
+                url: "/SSOSystem/DoCollectFlow",
+                headers: { __RequestVerificationToken: $.lrToken },
+                data: { userId: userId, modelCode: modelCode, id: Id, isCollect: isCollect },
+                type: "post",
+                dataType: "json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        //操作成功执行代码
+                        layer.msg(tipMsg);
+                        //刷新可用应用列表
+                        flowListJson = res.data.flowList;
+                        $("#flowTypeList").find("li.active .itemName").trigger("click");
+                        //刷新我的收藏列表
+                        flowListOfCollectJson = res.data.flowListOfCollect;
+                        updateCollectCount(flowListOfCollectJson);
+                        $("#flowTypeListOfCollect").find("li.active .itemName").trigger("click");
+                    }
+                    else if (res.code == 400) {
+                        layer.msg(res.info);
+                    }
+                    else if (res.code == 500) {
+                        layer.msg('服务端异常，请联系管理员');
+                    }
+                }
+            });
+        }
+    }).on('click', '#flowListOfCollect .fa', function () {//我的收藏
+        //是否收藏
+        var modelCode = $('#ModelCode').val();
+        var userId = $('#UserId').val();
+        var Id = $(this).parent('li').attr('data-Id');
+        if ($(this).hasClass('fa-heart')) {
+            //ajax取消收藏操作
+            if (userId != "" && userId != undefined && modelCode != "" && modelCode != undefined && Id != "" && Id != undefined) {
+                $.ajax({
+                    url: "/SSOSystem/DoCollectFlow",
+                    headers: { __RequestVerificationToken: $.lrToken },
+                    data: { userId: userId, modelCode: modelCode, id: Id, isCollect: false },
+                    type: "post",
+                    dataType: "json",
+                    success: function (res) {
+                        if (res.code == 200) {
+                            //操作成功执行代码
+                            layer.msg('取消收藏成功！');
+                            //刷新我的收藏列表
+                            flowListOfCollectJson = res.data.flowListOfCollect;
+                            updateCollectCount(flowListOfCollectJson);
+                            $("#flowTypeListOfCollect").find("li.active .itemName").trigger("click");
+                            //刷新可用应用列表
+                            flowListJson = res.data.flowList;
+                            $("#flowTypeList").find("li.active .itemName").trigger("click");
+                        }
+                        else if (res.code == 400) {
+                            layer.msg(res.info);
+                        }
+                        else if (res.code == 500) {
+                            layer.msg('服务端异常，请联系管理员');
+                        }
+                    }
+                });
+            }
         }
     });
     //登录

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

@@ -56,6 +56,7 @@ namespace Learun.Application.Web.Controllers
         private TeachSwitchIBLL teachSwitchIBLL = new TeachSwitchBLL();
         private StuSaverecordIBLL stuSaverecordIBLL = new StuSaverecordBLL();
         private StuConsumptionIBLL stuConsumptionIBLL = new StuConsumptionBLL();
+        private SSO_Drag_CollectManageIBLL sSO_Drag_CollectManageIBLL = new SSO_Drag_CollectManageBLL();
 
         #region 统一身份认证2.0
         /// <summary>
@@ -1190,18 +1191,34 @@ namespace Learun.Application.Web.Controllers
             ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor);
             //流程
             var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
-            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
+            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList().OrderBy(x => x.F_Id);
+            var flowListOfCollect = sSO_Drag_CollectManageIBLL.GetList("{\"UserId\":\"" + userInfo.userId + "\",\"ModelCode\":\"one\"}").OrderBy(x => x.SchemeInfoId);
+            foreach (var item in flowList)
+            {
+                item.IsCollect = false;
+                if (flowListOfCollect.Where(x => x.SchemeInfoId == item.F_Id).Any())
+                {
+                    item.IsCollect = true;
+                }
+            }
             var allCount = 0;
+            var allCountOfCollect = 0;
             foreach (var flow in flowType)
             {
-                var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
+                var count = flowList.Count(a => a.F_Category == flow.F_ItemValue);
                 flow.FlowCount = count;
                 allCount += count;
+                var countOfCollect = flowListOfCollect.Count(x => x.F_Category == flow.F_ItemValue);
+                flow.FlowCountOfCollect = countOfCollect;
+                allCountOfCollect += countOfCollect;
 
             }
             ViewBag.AllCount = allCount;
             ViewBag.FlowType = flowType;
             ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
+            //流程-收藏
+            ViewBag.AllCountOfCollect = allCountOfCollect;
+            ViewBag.FlowListOfCollect = JsonConvert.SerializeObject(flowListOfCollect);
             //校园一卡通余额
             ViewBag.StuSaveRecordTotalNum = 0;
             var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE);
@@ -1471,15 +1488,6 @@ namespace Learun.Application.Web.Controllers
             }).ToList();
             ViewBag.OffenusedGroup = mm;
             ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup);
-            //todo:
-            //删begin
-            ViewBag.OffenusedJiao = modulelist.Where(x => x.F_FullName.Contains("教"));
-            ViewBag.OffenusedGuan = modulelist.Where(x => x.F_FullName.Contains("管理"));
-            ViewBag.Offenused = modulelist.Except(modulelist.Where(x => x.F_FullName.Contains("教") || x.F_FullName.Contains("管理"))).Take(6);
-            ViewBag.OffenusedJiaoStr = JsonConvert.SerializeObject(ViewBag.OffenusedJiao);
-            ViewBag.OffenusedGuanStr = JsonConvert.SerializeObject(ViewBag.OffenusedGuan);
-            ViewBag.OffenusedStr = JsonConvert.SerializeObject(ViewBag.Offenused);
-            //删end
             //查找服务
             List<ModuleEntity> searchmodulelist = new List<ModuleEntity>();
             foreach (var item in moduledata)
@@ -1520,18 +1528,34 @@ namespace Learun.Application.Web.Controllers
             ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor);
             //流程
             var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
-            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
+            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList().OrderBy(x => x.F_Id);
+            var flowListOfCollect = sSO_Drag_CollectManageIBLL.GetList("{\"UserId\":\"" + userInfo.userId + "\",\"ModelCode\":\"two\"}").OrderBy(x => x.SchemeInfoId);
+            foreach (var item in flowList)
+            {
+                item.IsCollect = false;
+                if (flowListOfCollect.Where(x => x.SchemeInfoId == item.F_Id).Any())
+                {
+                    item.IsCollect = true;
+                }
+            }
             var allCount = 0;
+            var allCountOfCollect = 0;
             foreach (var flow in flowType)
             {
-                var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
+                var count = flowList.Count(a => a.F_Category == flow.F_ItemValue);
                 flow.FlowCount = count;
                 allCount += count;
+                var countOfCollect = flowListOfCollect.Count(x => x.F_Category == flow.F_ItemValue);
+                flow.FlowCountOfCollect = countOfCollect;
+                allCountOfCollect += countOfCollect;
 
             }
             ViewBag.AllCount = allCount;
             ViewBag.FlowType = flowType;
             ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
+            //流程-收藏
+            ViewBag.AllCountOfCollect = allCountOfCollect;
+            ViewBag.FlowListOfCollect = JsonConvert.SerializeObject(flowListOfCollect);
             //校园一卡通余额
             ViewBag.StuSaveRecordTotalNum = 0;
             var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE);
@@ -1815,5 +1839,38 @@ namespace Learun.Application.Web.Controllers
             return Success("操作成功");
         }
 
+        /// <summary>
+        /// 网上办事大厅拖拽版-收藏应用
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="modelCode"></param>
+        /// <param name="id"></param>
+        /// <param name="isCollect">true:收藏，false:取消收藏</param>
+        /// <returns></returns>
+        public ActionResult DoCollectFlow(string userId, string modelCode, string id, bool isCollect)
+        {
+            sSO_Drag_CollectManageIBLL.DoCollectFlow(userId, modelCode, id, isCollect);
+
+            //可用应用列表数据
+            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList().OrderBy(x => x.F_Id);
+            //我的收藏列表数据
+            var flowListOfCollect = sSO_Drag_CollectManageIBLL.GetList("{\"UserId\":\"" + userId + "\",\"ModelCode\":\"" + modelCode + "\"}").OrderBy(x => x.SchemeInfoId);
+            foreach (var item in flowList)
+            {
+                item.IsCollect = false;
+                if (flowListOfCollect.Where(x => x.SchemeInfoId == item.F_Id).Any())
+                {
+                    item.IsCollect = true;
+                }
+            }
+            var data = new
+            {
+                flowList = flowList,
+                flowListOfCollect = flowListOfCollect
+            };
+
+            return Success("操作成功", data);
+        }
+
     }
 }

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

@@ -315,6 +315,7 @@
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_SupplierController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_UserChangeInfoController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_WarningController.cs" />
+    <Compile Include="Areas\CustomFunction\CustomFunctionAreaRegistration.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeLessonSyncController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeLessonTermAttemperController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\CertificateManageController.cs" />
@@ -805,6 +806,11 @@
     <Compile Include="Areas\PersonnelManagement\Controllers\ReleaseMettingController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\StudyGuideController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\ResourceImportController.cs" />
+    <Compile Include="Areas\LR_Desktop\Controllers\SSO_Drag_CollectManageController.cs" />
+    <Compile Include="Areas\CustomFunction\Controllers\SRProjectLevelController.cs" />
+    <Compile Include="Areas\CustomFunction\Controllers\SRProjectTypeController.cs" />
+    <Compile Include="Areas\CustomFunction\Controllers\SRProjectPlanController.cs" />
+    <Compile Include="Areas\CustomFunction\Controllers\SRProjectWorkController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\DispatchController.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -1387,8 +1393,12 @@
     <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexStatistics.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\FormViewAttendance.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.js" />
     <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.css" />
@@ -6374,6 +6384,26 @@
     <Content Include="Areas\PersonnelManagement\Views\ResourceImport\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\ResourceImport\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\ResourceImport\Form.js" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CollectManage\Index.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CollectManage\Index.js" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CollectManage\Form.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CollectManage\Form.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectLevel\Index.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectLevel\Index.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectLevel\Form.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectLevel\Form.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectType\Index.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectType\Index.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectType\Form.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectType\Form.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectPlan\Index.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectPlan\Index.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectPlan\Form.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectPlan\Form.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectWork\Index.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectWork\Index.js" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectWork\Form.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\SRProjectWork\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />
@@ -7175,11 +7205,17 @@
     <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\PaperView.cshtml" />
     <Content Include="Areas\Ask\Views\Ask_MainOfTeacher\TeacherIndex.cshtml" />
     <Content Include="Areas\LR_OrganizationModule\Views\User\FamilyIndex.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\web.config" />
     <Content Include="Areas\EducationalAdministration\Views\Dispatch\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Dispatch\FormView.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Dispatch\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Dispatch\Print.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\FormViewAttendance.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexStatistics.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml

@@ -308,7 +308,7 @@
             html += '</div>'
                 + '</div>';
         }
-        
+
             html+='</div>'
             +'</div>'
             +'</div>'
@@ -732,6 +732,7 @@
     .desktopSetBox b {
         font-weight: normal;
     }
+
     .searchLi > a {
         width: 100%;
     }
@@ -739,7 +740,15 @@
         .searchLi > a > * {
             display: inline-block;
             vertical-align: middle;
-        } 
+        }
+    .inSec1List2 li{
+        padding-right:30px;
+        position:relative;
+    }
+    .inSec1List2 .fa{
+        right:15px;
+        top:5px;
+    }
 </style>
 <!--  / warpper  -->
 <div class="warpper">
@@ -765,29 +774,29 @@
         </div>
         <div class="searchR">
             @*<div class="searchTop">
-                <span>服务角色</span>
-                <ul class="searchTopList">
-                    <li class="active">全部</li>
-                    <li>校领导</li>
-                    <li>游客</li>
-                    <li>教师</li>
-                    <li>学生</li>
-                </ul>
-            </div>
-            <div class="searchTop">
-                <span>服务角色</span>
-                <ul class="searchTopList">
-                    <li class="active">全部</li>
-                    <li>最新应用</li>
-                    <li>常用链接</li>
-                </ul>
-            </div>*@
+                    <span>服务角色</span>
+                    <ul class="searchTopList">
+                        <li class="active">全部</li>
+                        <li>校领导</li>
+                        <li>游客</li>
+                        <li>教师</li>
+                        <li>学生</li>
+                    </ul>
+                </div>
+                <div class="searchTop">
+                    <span>服务角色</span>
+                    <ul class="searchTopList">
+                        <li class="active">全部</li>
+                        <li>最新应用</li>
+                        <li>常用链接</li>
+                    </ul>
+                </div>*@
             <div class="searchRBox">
                 @{
                     var searchModule = ViewBag.SearchModule as List<ModuleEntity>;
 
                     <div class="searchRTop">
-                        <b>A-D</b> (<span>@searchModule.Where(x=>"abcd".Contains(x.FirstLetter)).Count()</span>)
+                        <b>A-D</b> (<span>@searchModule.Where(x => "abcd".Contains(x.FirstLetter)).Count()</span>)
                     </div>
                     <div class="searchList clearfix">
                         @{
@@ -951,21 +960,24 @@
             <div class="indSec1Box">
                 <div class="inSec1Box">
                     <!-- 第一级列表 -->
-                    <ul class="inSec1List1">
+                    <ul class="inSec1List1" id="flowTypeListOfCollect">
                         <li class="active">
-                            <a href="#">
-                                <span>全部</span> <span>0</span>
+                            <a href="#" class="itemName" itemName="全部">
+                                <span>全部</span> <span class="collectCount">@ViewBag.AllCountOfCollect</span>
                             </a>
                         </li>
+                        @foreach (DataItemDetailEntity item in ViewBag.FlowType)
+                        {
+                            <li>
+                                <a href="#" class="itemName" itemName="@item.F_ItemValue">
+                                    <span>@item.F_ItemName</span>  <span class="collectCount">@item.FlowCountOfCollect</span>
+                                </a>
+                            </li>
+                        }
                     </ul>
                     <!-- 第一级列表 -->
                     <!-- 第二级列表 -->
-                    <ul class="inSec1List2 inSecShadow">
-                        @*<li class="active">
-                            <a href="/Home/Index?autoopen=92a85055-67f2-4a06-902a-f10ec5576d92" target="_blank">
-                                <img src="~/Content/images/DragSSO/inSec1-2.png" alt="" /><span>人事管理系统</span>
-                            </a>
-                        </li>*@
+                    <ul class="inSec1List2 inSecShadow" id="flowListOfCollect">
                     </ul>
                     <!-- 第二级列表 -->
                 </div>
@@ -980,7 +992,7 @@
                         @foreach (DataItemDetailEntity item in ViewBag.FlowType)
                         {
                             <li>
-                                <a href="#" class="itemName" itemName="@item.F_ItemName">
+                                <a href="#" class="itemName" itemName="@item.F_ItemValue">
                                     <span>@item.F_ItemName</span>  <span>@item.FlowCount</span>
                                 </a>
                             </li>
@@ -1648,15 +1660,59 @@
         var category = $(this).attr("itemName");
         $('#flowTypeList').find('li.active').removeClass('active');
         $(this).parent('li').addClass("active");
-        $.each(flowListJson,function(i, item) {
+        $.each(flowListJson, function (i, item) {
+            var collectClass = "fa-heart-o";
+            if (item.IsCollect == true) {
+                collectClass = "fa-heart";
+            }
                 if (category == "全部") {
-                    html += "<li> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id="+item.F_Id+"&shcemeCode="+item.F_Code+"\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-"+Math.floor(Math.random()*21+2)+".png\" /><span>"+item.F_Name+"</span> </a> </li>";
+                    html += "<li data-Id=\""+item.F_Id+"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.F_Id + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
                 }else if (item.F_Category==category) {
-                    html += "<li> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.F_Id + "&shcemeCode=" + item.F_Code +"\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-"+Math.floor(Math.random()*21+2)+".png\" /><span>"+item.F_Name+"</span> </a> </li>";
+                    html += "<li data-Id=\"" + item.F_Id +"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.F_Id + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
                 }
             });
         $("#flowList").html(html);
     })
     $("#flowTypeList").find(".itemName").eq(0).trigger("click");
 
+    //左侧-我的收藏
+    var flowListOfCollect = '@ViewBag.FlowListOfCollect';
+    flowListOfCollect = flowListOfCollect.replace(/&quot;/g, "\"");
+    var flowListOfCollectJson = JSON.parse(flowListOfCollect);
+    $("#flowTypeListOfCollect").find(".itemName").bind("click", function() {
+        var html = "";
+        var category = $(this).attr("itemName");
+        $('#flowTypeListOfCollect').find('li.active').removeClass('active');
+        $(this).parent('li').addClass("active");
+        $.each(flowListOfCollectJson, function (i, item) {
+            var collectClass = "fa-heart";
+                if (category == "全部") {
+                    html += "<li data-Id=\"" + item.SchemeInfoId +"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.SchemeInfoId + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
+                }else if (item.F_Category==category) {
+                    html += "<li data-Id=\"" + item.SchemeInfoId +"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.SchemeInfoId + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
+                }
+            });
+        $("#flowListOfCollect").html(html);
+    })
+    $("#flowTypeListOfCollect").find(".itemName").eq(0).trigger("click");
+
+    //更新“左侧-我的收藏”左侧分类数量
+    var updateCollectCount = function (data) {
+        $.each($("#flowTypeListOfCollect").find(".itemName"), function (i, item) {
+            var category = $(item).attr("itemName");
+            if (category == "全部") {
+                $(item).find('.collectCount').html(data.length);
+            } else {
+                var count = 0;
+                $.each(data, function (j, jtem) {
+                    if (jtem.F_Category == category) {
+                        count++;
+                    }
+                });
+                $(item).find('.collectCount').html(count);
+            }
+        });
+    };
+
+
 </script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml

@@ -740,7 +740,16 @@
         .searchLi > a > * {
             display: inline-block;
             vertical-align: middle;
-        } 
+        }
+    .inSec1List2 li {
+        padding-right: 30px;
+        position: relative;
+    }
+
+    .inSec1List2 .fa {
+        right: 15px;
+        top: 5px;
+    }
 </style>
 <!--  / warpper  -->
 <div class="warpper">
@@ -952,22 +961,24 @@
             <div class="indSec1Box">
                 <div class="inSec1Box">
                     <!-- 第一级列表 -->
-                    <ul class="inSec1List1">
+                    <ul class="inSec1List1" id="flowTypeListOfCollect">
                         <li class="active">
-                            <a href="#">
-                                <span>全部</span> <span>0</span>
+                            <a href="#" class="itemName" itemName="全部">
+                                <span>全部</span> <span class="collectCount">@ViewBag.AllCountOfCollect</span>
                             </a>
                         </li>
+                        @foreach (DataItemDetailEntity item in ViewBag.FlowType)
+                        {
+                            <li>
+                                <a href="#" class="itemName" itemName="@item.F_ItemValue">
+                                    <span>@item.F_ItemName</span>  <span class="collectCount">@item.FlowCountOfCollect</span>
+                                </a>
+                            </li>
+                        }
                     </ul>
                     <!-- 第一级列表 -->
                     <!-- 第二级列表 -->
-                    <ul class="inSec1List2 inSecShadow">
-                        @*<li class="active">
-                            <a href="/Home/Index?autoopen=92a85055-67f2-4a06-902a-f10ec5576d92" target="_blank">
-                                <img src="~/Content/images/DragSSO/inSec1-2.png" alt="" /><span>人事管理系统</span>
-                            </a>
-                        </li>*@
-                    </ul>
+                    <ul class="inSec1List2 inSecShadow" id="flowListOfCollect"></ul>
                     <!-- 第二级列表 -->
                 </div>
                 <div class="inSec1Box">
@@ -981,7 +992,7 @@
                         @foreach (DataItemDetailEntity item in ViewBag.FlowType)
                         {
                             <li>
-                                <a href="#" class="itemName" itemName="@item.F_ItemName">
+                                <a href="#" class="itemName" itemName="@item.F_ItemValue">
                                     <span>@item.F_ItemName</span>  <span>@item.FlowCount</span>
                                 </a>
                             </li>
@@ -1599,15 +1610,59 @@
         var category = $(this).attr("itemName");
         $('#flowTypeList').find('li.active').removeClass('active');
         $(this).parent('li').addClass("active");
-        $.each(flowListJson,function(i, item) {
+        $.each(flowListJson, function (i, item) {
+            var collectClass = "fa-heart-o";
+            if (item.IsCollect == true) {
+                collectClass = "fa-heart";
+            }
                 if (category == "全部") {
-                    html += "<li> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id="+item.F_Id+"&shcemeCode="+item.F_Code+"\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-"+Math.floor(Math.random()*21+2)+".png\" /><span>"+item.F_Name+"</span> </a> </li>";
+                    html += "<li data-Id=\""+item.F_Id+"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.F_Id + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
                 }else if (item.F_Category==category) {
-                    html += "<li> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.F_Id + "&shcemeCode=" + item.F_Code +"\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-"+Math.floor(Math.random()*21+2)+".png\" /><span>"+item.F_Name+"</span> </a> </li>";
+                    html += "<li data-Id=\"" + item.F_Id +"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.F_Id + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
                 }
             });
         $("#flowList").html(html);
     })
     $("#flowTypeList").find(".itemName").eq(0).trigger("click");
 
+    //左侧-我的收藏
+    var flowListOfCollect = '@ViewBag.FlowListOfCollect';
+    flowListOfCollect = flowListOfCollect.replace(/&quot;/g, "\"");
+    var flowListOfCollectJson = JSON.parse(flowListOfCollect);
+    $("#flowTypeListOfCollect").find(".itemName").bind("click", function() {
+        var html = "";
+        var category = $(this).attr("itemName");
+        $('#flowTypeListOfCollect').find('li.active').removeClass('active');
+        $(this).parent('li').addClass("active");
+        $.each(flowListOfCollectJson, function (i, item) {
+            var collectClass = "fa-heart";
+                if (category == "全部") {
+                    html += "<li data-Id=\"" + item.SchemeInfoId +"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.SchemeInfoId + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
+                }else if (item.F_Category==category) {
+                    html += "<li data-Id=\"" + item.SchemeInfoId +"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.SchemeInfoId + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
+                }
+            });
+        $("#flowListOfCollect").html(html);
+    })
+    $("#flowTypeListOfCollect").find(".itemName").eq(0).trigger("click");
+
+    //更新“左侧-我的收藏”左侧分类数量
+    var updateCollectCount = function (data) {
+        $.each($("#flowTypeListOfCollect").find(".itemName"), function (i, item) {
+            var category = $(item).attr("itemName");
+            if (category == "全部") {
+                $(item).find('.collectCount').html(data.length);
+            } else {
+                var count = 0;
+                $.each(data, function (j, jtem) {
+                    if (jtem.F_Category == category) {
+                        count++;
+                    }
+                });
+                $(item).find('.collectCount').html(count);
+            }
+        });
+    };
+
+
 </script>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs

@@ -142,6 +142,11 @@ namespace Learun.Application.Base.SystemModule
         /// </summary>
         [NotMapped]
         public int FlowCount { get; set; }
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        [NotMapped]
+        public int FlowCountOfCollect { get; set; }
         public void Create()
         {
             this.F_ItemDetailId = Guid.NewGuid().ToString();

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

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

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

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

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

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

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

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_CollectManageMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-02 16:12
+    /// 描 述：网上办事大厅拖拽版-可用应用收藏管理
+    /// </summary>
+    public class SSO_Drag_CollectManageMap : EntityTypeConfiguration<SSO_Drag_CollectManageEntity>
+    {
+        public SSO_Drag_CollectManageMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("SSO_DRAG_COLLECTMANAGE");
+            //主键
+            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

@@ -559,6 +559,11 @@
     <Compile Include="PersonnelManagement\ReleaseMettingMap.cs" />
     <Compile Include="PersonnelManagement\StudyGuideMap.cs" />
     <Compile Include="PersonnelManagement\ResourceImportMap.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CollectManageMap.cs" />
+    <Compile Include="CustomFunction\SRProjectLevelMap.cs" />
+    <Compile Include="CustomFunction\SRProjectTypeMap.cs" />
+    <Compile Include="CustomFunction\SRProjectPlanMap.cs" />
+    <Compile Include="CustomFunction\SRProjectWorkMap.cs" />
     <Compile Include="EducationalAdministration\DispatchMap.cs" />
   </ItemGroup>
   <ItemGroup>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectLevel/SRProjectLevelBLL.cs

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

@@ -0,0 +1,98 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-08 11:15
+    /// 描 述：科研项目级别管理
+    /// </summary>
+    public class SRProjectLevelEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column("LEVID")]
+        public string LevID { get; set; }
+        /// <summary>
+        /// 级别名称
+        /// </summary>
+        [Column("LEVNAME")]
+        public string LevName { get; set; }
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [Column("LEVSORT")]
+        public int? LevSort { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Column("LEVSTATUS")]
+        public int? LevStatus { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("LEVCREATEUSERID")]
+        public string LevCreateUserId { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("LEVCREATEUSERNAME")]
+        public string LevCreateUserName { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("LEVCREATETIME")]
+        public DateTime? LevCreateTime { get; set; }
+        /// <summary>
+        /// 最后一次修改人
+        /// </summary>
+        [Column("LEVMODIFYUSERID")]
+        public string LevModifyUserId { get; set; }
+        /// <summary>
+        /// 最后一次修改人
+        /// </summary>
+        [Column("LEVMODIFYUSERNAME")]
+        public string LevModifyUserName { get; set; }
+        /// <summary>
+        /// 最后一次修改时间
+        /// </summary>
+        [Column("LEVMODIFYTIME")]
+        public DateTime? LevModifyTime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.LevID = Guid.NewGuid().ToString();
+            var userinfo = LoginUserInfo.Get();
+            this.LevCreateUserId = userinfo.userId;
+            this.LevCreateUserName = userinfo.realName;
+            this.LevCreateTime = DateTime.Now;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.LevID = keyValue;
+            var userinfo = LoginUserInfo.Get();
+            this.LevModifyUserId = userinfo.userId;
+            this.LevModifyUserName = userinfo.realName;
+            this.LevModifyTime = DateTime.Now;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectLevel/SRProjectLevelIBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectLevel/SRProjectLevelService.cs

@@ -0,0 +1,182 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-08 11:15
+    /// 描 述：科研项目级别管理
+    /// </summary>
+    public class SRProjectLevelService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SRProjectLevelEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.*
+                ");
+                strSql.Append("  FROM SRProjectLevel t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["LevName"].IsEmpty())
+                {
+                    dp.Add("LevName", "%" + queryParam["LevName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.LevName Like @LevName ");
+                }
+                if (!queryParam["LevStatus"].IsEmpty())
+                {
+                    dp.Add("LevStatus", queryParam["LevStatus"].ToString(), DbType.String);
+                    strSql.Append(" AND t.LevStatus = @LevStatus ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<SRProjectLevelEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SRProjectLevel表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SRProjectLevelEntity GetSRProjectLevelEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<SRProjectLevelEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<SRProjectLevelEntity>(t => t.LevID == 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, SRProjectLevelEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 启用 禁用
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void UpdateStatus(string keyValue, int status)
+        {
+            try
+            {
+                if (keyValue.Contains(","))
+                {
+                    keyValue = string.Join("','", keyValue.Split(','));
+                }
+
+                string sql = $" update SRProjectLevel set LevStatus={status} where LevID in ('{keyValue}')";
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectPlan/SRProjectPlanBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectPlan/SRProjectPlanEntity.cs

@@ -0,0 +1,103 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-09 10:30
+    /// 描 述：项目计划管理
+    /// </summary>
+    public class SRProjectPlanEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 项目编号
+        /// </summary>
+        [Column("ENCODE")]
+        public string EnCode { get; set; }
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        [Column("NAME")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 项目计划名称
+        /// </summary>
+        [Column("PLANNAME")]
+        public string PlanName { get; set; }
+        /// <summary>
+        /// 项目计划文件
+        /// </summary>
+        [Column("PLANURL")]
+        public string PlanUrl { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("CREATEUSERNAME")]
+        public string CreateUserName { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// ModifyUserId
+        /// </summary>
+        [Column("MODIFYUSERID")]
+        public string ModifyUserId { get; set; }
+        /// <summary>
+        /// ModifyUserName
+        /// </summary>
+        [Column("MODIFYUSERNAME")]
+        public string ModifyUserName { get; set; }
+        /// <summary>
+        /// ModifyTime
+        /// </summary>
+        [Column("MODIFYTIME")]
+        public DateTime? ModifyTime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+            var userinfo = LoginUserInfo.Get();
+            this.CreateUserId = userinfo.userId;
+            this.CreateUserName = userinfo.realName;
+            this.CreateTime=DateTime.Now;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+            var userinfo = LoginUserInfo.Get();
+            this.ModifyUserId = userinfo.userId;
+            this.ModifyUserName = userinfo.realName;
+            this.ModifyTime = DateTime.Now;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectPlan/SRProjectPlanIBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectPlan/SRProjectPlanService.cs

@@ -0,0 +1,164 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-09 10:30
+    /// 描 述：项目计划管理
+    /// </summary>
+    public class SRProjectPlanService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SRProjectPlanEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.ID,
+                t.EnCode,
+                t.Name,
+                t.PlanName,
+                t.CreateUserName,
+t.CreateTime
+                ");
+                strSql.Append("  FROM SRProjectPlan t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["EnCode"].IsEmpty())
+                {
+                    dp.Add("EnCode", "%" + queryParam["EnCode"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.EnCode Like @EnCode ");
+                }
+                if (!queryParam["Name"].IsEmpty())
+                {
+                    dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Name Like @Name ");
+                }
+                if (!queryParam["PlanName"].IsEmpty())
+                {
+                    dp.Add("PlanName", "%" + queryParam["PlanName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.PlanName Like @PlanName ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<SRProjectPlanEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SRProjectPlan表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SRProjectPlanEntity GetSRProjectPlanEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<SRProjectPlanEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<SRProjectPlanEntity>(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, SRProjectPlanEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectType/SRProjectTypeBLL.cs

@@ -0,0 +1,173 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-08 11:51
+    /// 描 述：科研项目类型管理
+    /// </summary>
+    public class SRProjectTypeBLL : SRProjectTypeIBLL
+    {
+        private SRProjectTypeService sRProjectTypeService = new SRProjectTypeService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SRProjectTypeEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return sRProjectTypeService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SRProjectType表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SRProjectTypeEntity GetSRProjectTypeEntity(string keyValue)
+        {
+            try
+            {
+                return sRProjectTypeService.GetSRProjectTypeEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SRProjectType表实体数据
+        /// </summary>
+        /// <param name="code">code</param>
+        /// <returns></returns>
+        public SRProjectTypeEntity GetEntityByCode(string code)
+        {
+            try
+            {
+                return sRProjectTypeService.GetEntityByCode(code);
+            }
+            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
+            {
+                sRProjectTypeService.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, SRProjectTypeEntity entity)
+        {
+            try
+            {
+                sRProjectTypeService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="status">状态</param>
+        /// <returns></returns>
+        public void UpdateStatus(string keyValue, int status)
+        {
+            try
+            {
+                sRProjectTypeService.UpdateStatus(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/CustomFunction/SRProjectType/SRProjectTypeEntity.cs

@@ -0,0 +1,108 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-08 11:51
+    /// 描 述：科研项目类型管理
+    /// </summary>
+    public class SRProjectTypeEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column("TYPEID")]
+        public string TypeID { get; set; }
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        [Column("TYPENAME")]
+        public string TypeName { get; set; }
+        /// <summary>
+        /// 分类编码
+        /// </summary>
+        [Column("TYPECODE")]
+        public string TypeCode { get; set; }
+        /// <summary>
+        /// 上级Id
+        /// </summary>
+        [Column("TYPEPARENTID")]
+        public string TypeParentId { get; set; }
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [Column("TYPESORT")]
+        public int? TypeSort { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Column("TYPESTATUS")]
+        public int? TypeStatus { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("TYPECREATEUSERID")]
+        public string TypeCreateUserId { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("TYPECREATEUSERNAME")]
+        public string TypeCreateUserName { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("TYPECREATETIME")]
+        public DateTime? TypeCreateTime { get; set; }
+        /// <summary>
+        /// 最后一次修改人
+        /// </summary>
+        [Column("TYPEMODIFYUSERID")]
+        public string TypeModifyUserId { get; set; }
+        /// <summary>
+        /// 最后一次修改人
+        /// </summary>
+        [Column("TYPEMODIFYUSERNAME")]
+        public string TypeModifyUserName { get; set; }
+        /// <summary>
+        /// 最后一次修改时间
+        /// </summary>
+        [Column("TYPEMODIFYTIME")]
+        public DateTime? TypeModifyTime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.TypeID = Guid.NewGuid().ToString();
+            var userinfo = LoginUserInfo.Get();
+            this.TypeCreateUserId = userinfo.userId;
+            this.TypeCreateUserName = userinfo.realName;
+            this.TypeCreateTime = DateTime.Now;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.TypeID = keyValue;
+            var userinfo = LoginUserInfo.Get();
+            this.TypeModifyUserId = userinfo.userId;
+            this.TypeModifyUserName = userinfo.realName;
+            this.TypeModifyTime = DateTime.Now;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectType/SRProjectTypeIBLL.cs

@@ -0,0 +1,53 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-08 11:51
+    /// 描 述：科研项目类型管理
+    /// </summary>
+    public interface SRProjectTypeIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SRProjectTypeEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取SRProjectType表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        SRProjectTypeEntity GetSRProjectTypeEntity(string keyValue);
+
+        SRProjectTypeEntity GetEntityByCode(string code);
+        #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, SRProjectTypeEntity entity);
+
+        void UpdateStatus(string keyValue, int status);
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectType/SRProjectTypeService.cs

@@ -0,0 +1,209 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-08 11:51
+    /// 描 述：科研项目类型管理
+    /// </summary>
+    public class SRProjectTypeService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SRProjectTypeEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.*
+                ");
+                strSql.Append("  FROM SRProjectType t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["TypeCode"].IsEmpty())
+                {
+                    dp.Add("TypeCode", "%" + queryParam["TypeCode"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.TypeCode Like @TypeCode ");
+                }
+                if (!queryParam["TypeName"].IsEmpty())
+                {
+                    dp.Add("TypeName", "%" + queryParam["TypeName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.TypeName Like @TypeName ");
+                }
+                if (!queryParam["TypeStatus"].IsEmpty())
+                {
+                    dp.Add("TypeStatus", queryParam["TypeStatus"].ToString(), DbType.String);
+                    strSql.Append(" AND t.TypeStatus = @TypeStatus ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<SRProjectTypeEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SRProjectType表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SRProjectTypeEntity GetSRProjectTypeEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<SRProjectTypeEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SRProjectType表实体数据
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public SRProjectTypeEntity GetEntityByCode(string code)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<SRProjectTypeEntity>(x => x.TypeCode == code);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<SRProjectTypeEntity>(t => t.TypeID == 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, SRProjectTypeEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 启用 禁用
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void UpdateStatus(string keyValue, int status)
+        {
+            try
+            {
+                if (keyValue.Contains(","))
+                {
+                    keyValue = string.Join("','", keyValue.Split(','));
+                }
+
+                string sql = $" update SRProjectType set TypeStatus={status} where TypeID in ('{keyValue}')";
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectWork/SRProjectWorkBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectWork/SRProjectWorkEntity.cs

@@ -0,0 +1,123 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-09 10:51
+    /// 描 述：项目工作管理
+    /// </summary>
+    public class SRProjectWorkEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 项目编号
+        /// </summary>
+        [Column("ENCODE")]
+        public string EnCode { get; set; }
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        [Column("NAME")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 工作名称
+        /// </summary>
+        [Column("WORKNAME")]
+        public string WorkName { get; set; }
+        /// <summary>
+        /// 工作进度
+        /// </summary>
+        [Column("PLANNEDSPEED")]
+        public decimal? PlannedSpeed { get; set; }
+        /// <summary>
+        /// 工作人员
+        /// </summary>
+        [Column("PEOPLE")]
+        public string People { get; set; }
+        /// <summary>
+        /// 项目计划文件
+        /// </summary>
+        [Column("URL")]
+        public string Url { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [Column("STARTTIME")]
+        public DateTime? StartTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [Column("ENDTIME")]
+        public DateTime? EndTime { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("CREATEUSERNAME")]
+        public string CreateUserName { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// ModifyUserId
+        /// </summary>
+        [Column("MODIFYUSERID")]
+        public string ModifyUserId { get; set; }
+        /// <summary>
+        /// ModifyUserName
+        /// </summary>
+        [Column("MODIFYUSERNAME")]
+        public string ModifyUserName { get; set; }
+        /// <summary>
+        /// ModifyTime
+        /// </summary>
+        [Column("MODIFYTIME")]
+        public DateTime? ModifyTime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+            var userinfo = LoginUserInfo.Get();
+            this.CreateUserId = userinfo.userId;
+            this.CreateUserName = userinfo.realName;
+            this.CreateTime = DateTime.Now;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+            var userinfo = LoginUserInfo.Get();
+            this.ModifyUserId = userinfo.userId;
+            this.ModifyUserName = userinfo.realName;
+            this.ModifyTime = DateTime.Now;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectWork/SRProjectWorkIBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/SRProjectWork/SRProjectWorkService.cs

@@ -0,0 +1,171 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-09 10:51
+    /// 描 述：项目工作管理
+    /// </summary>
+    public class SRProjectWorkService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SRProjectWorkEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.ID,
+                t.EnCode,
+                t.Name,
+                t.WorkName,
+                t.PlannedSpeed,
+                t.People,
+                t.StartTime,
+                t.EndTime,t.CreateUserName,t.CreateTime
+                ");
+                strSql.Append("  FROM SRProjectWork t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["EnCode"].IsEmpty())
+                {
+                    dp.Add("EnCode", "%" + queryParam["EnCode"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.EnCode Like @EnCode ");
+                }
+                if (!queryParam["Name"].IsEmpty())
+                {
+                    dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Name Like @Name ");
+                }
+                if (!queryParam["WorkName"].IsEmpty())
+                {
+                    dp.Add("WorkName", "%" + queryParam["WorkName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.WorkName Like @WorkName ");
+                }
+                if (!queryParam["StartTime"].IsEmpty())
+                {
+                    dp.Add("StartTime",queryParam["StartTime"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StartTime = @StartTime ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<SRProjectWorkEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SRProjectWork表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SRProjectWorkEntity GetSRProjectWorkEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<SRProjectWorkEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<SRProjectWorkEntity>(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, SRProjectWorkEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs

@@ -95,7 +95,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("CHECKUSERID")]
         public string CheckUserId { get; set; }
         /// <summary>
-        /// 审核状态：0未审核，1已审核
+        /// 审核状态：0未审核，1已审核，2已恢复
         /// </summary>
         [Column("CHECKSTATUS")]
         public int? CheckStatus { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs

@@ -220,7 +220,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     }
 
                     //修改状态
-                    db.ExecuteBySql("update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0 where Id='" + keyValue + "' ");
+                    //db.ExecuteBySql("update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0 where Id='" + keyValue + "' ");
+                    entity.CheckTime = DateTime.Now;
+                    entity.CheckUserId = LoginUserInfo.Get().account;
+                    entity.CheckStatus = 2;
+                    db.Update(entity);
                 }
                 db.Commit();
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageEntity.cs

@@ -27,7 +27,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         [Column("USERID")]
         public string UserId { get; set; }
         /// <summary>
-        /// 模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式
+        /// 模式编号：one办事大厅模式，two效率优先模式，three管理驾驶舱模式
         /// </summary>
         /// <returns></returns>
         [Column("MODELCODE")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageBLL.cs

@@ -0,0 +1,171 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-02 16:12
+    /// 描 述：网上办事大厅拖拽版-可用应用收藏管理
+    /// </summary>
+    public class SSO_Drag_CollectManageBLL : SSO_Drag_CollectManageIBLL
+    {
+        private SSO_Drag_CollectManageService sSO_Drag_CollectManageService = new SSO_Drag_CollectManageService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_CollectManageEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return sSO_Drag_CollectManageService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_CollectManageEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return sSO_Drag_CollectManageService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SSO_Drag_CollectManageEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return sSO_Drag_CollectManageService.GetEntity(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
+            {
+                sSO_Drag_CollectManageService.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>
+        public void SaveEntity(string keyValue, SSO_Drag_CollectManageEntity entity)
+        {
+            try
+            {
+                sSO_Drag_CollectManageService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 收藏
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoCollectFlow(string userId, string modelCode, string id, bool isCollect)
+        {
+            try
+            {
+                sSO_Drag_CollectManageService.DoCollectFlow(userId, modelCode, id, isCollect);
+            }
+            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/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageEntity.cs

@@ -0,0 +1,86 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-02 16:12
+    /// 描 述：网上办事大厅拖拽版-可用应用收藏管理
+    /// </summary>
+    public class SSO_Drag_CollectManageEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        /// <returns></returns>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 用户
+        /// </summary>
+        /// <returns></returns>
+        [Column("USERID")]
+        public string UserId { get; set; }
+        /// <summary>
+        /// 模式编号：one办事大厅模式，two效率优先模式，three管理驾驶舱模式
+        /// </summary>
+        /// <returns></returns>
+        [Column("MODELCODE")]
+        public string ModelCode { get; set; }
+        /// <summary>
+        /// 可用应用Id
+        /// </summary>
+        /// <returns></returns>
+        [Column("SCHEMEINFOID")]
+        public string SchemeInfoId { get; set; }
+        /// <summary>
+        /// 收藏时间
+        /// </summary>
+        /// <returns></returns>
+        [Column("TIME")]
+        public DateTime? Time { 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 string F_Category { get; set; }
+        /// <summary>
+        /// 流程设计编号
+        /// </summary>
+        [NotMapped]
+        public string F_Code { get; set; }
+        /// <summary>
+        /// 流程设计名称
+        /// </summary>
+        [NotMapped]
+        public string F_Name { get; set; }
+
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageIBLL.cs

@@ -0,0 +1,61 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-02 16:12
+    /// 描 述：网上办事大厅拖拽版-可用应用收藏管理
+    /// </summary>
+    public interface SSO_Drag_CollectManageIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SSO_Drag_CollectManageEntity> GetList(string queryJson);
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SSO_Drag_CollectManageEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        SSO_Drag_CollectManageEntity GetEntity(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, SSO_Drag_CollectManageEntity entity);
+
+        /// <summary>
+        /// 收藏
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DoCollectFlow(string userId, string modelCode, string id, bool isCollect);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CollectManage/SSO_Drag_CollectManageService.cs

@@ -0,0 +1,242 @@
+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.LR_Desktop
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-02 16:12
+    /// 描 述：网上办事大厅拖拽版-可用应用收藏管理
+    /// </summary>
+    public class SSO_Drag_CollectManageService : RepositoryFactory
+    {
+        #region 构造函数和属性
+
+        private string fieldSql;
+        /// <summary>
+        /// 构造方法
+        /// </summary>
+        public SSO_Drag_CollectManageService()
+        {
+            fieldSql = @"
+                t.Id,
+                t.UserId,
+                t.ModelCode,
+                t.SchemeInfoId,
+                t.Time
+            ";
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_CollectManageEntity> GetList(string queryJson)
+        {
+            try
+            {
+                //参考写法
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,s.F_Category,s.F_Code,s.F_Name ");
+                strSql.Append(" FROM SSO_Drag_CollectManage t ");
+                strSql.Append(" left join LR_NWF_SchemeInfo s on t.SchemeInfoId=s.F_Id ");
+                strSql.Append(" where 1=1 ");
+                if (!queryParam["UserId"].IsEmpty())
+                {
+                    dp.Add("UserId", queryParam["UserId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.UserId = @UserId ");
+                }
+                if (!queryParam["ModelCode"].IsEmpty())
+                {
+                    dp.Add("ModelCode", queryParam["ModelCode"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ModelCode = @ModelCode ");
+                }
+                return this.BaseRepository().FindList<SSO_Drag_CollectManageEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_CollectManageEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append(" FROM SSO_Drag_CollectManage t ");
+                return this.BaseRepository().FindList<SSO_Drag_CollectManageEntity>(strSql.ToString(), pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SSO_Drag_CollectManageEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<SSO_Drag_CollectManageEntity>(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<SSO_Drag_CollectManageEntity>(t => t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// </summary>
+        public void SaveEntity(string keyValue, SSO_Drag_CollectManageEntity 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);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 收藏
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoCollectFlow(string userId, string modelCode, string id, bool isCollect)
+        {
+            try
+            {
+                if (isCollect)
+                {
+                    //收藏
+                    var model = this.BaseRepository().FindEntity<SSO_Drag_CollectManageEntity>(x => x.UserId == userId && x.ModelCode == modelCode && x.SchemeInfoId == id);
+                    if (model == null)
+                    {
+                        var entity = new SSO_Drag_CollectManageEntity()
+                        {
+                            UserId = userId,
+                            ModelCode = modelCode,
+                            SchemeInfoId = id,
+                            Time = DateTime.Now
+                        };
+                        entity.Create();
+                        this.BaseRepository().Insert(entity);
+                    }
+                }
+                else
+                {
+                    //取消收藏
+                    this.BaseRepository().Delete<SSO_Drag_CollectManageEntity>(x => x.UserId == userId && x.ModelCode == modelCode && x.SchemeInfoId == id);
+                }
+            }
+            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

@@ -1654,6 +1654,26 @@
     <Compile Include="PersonnelManagement\ResourceImport\ResourceImportService.cs" />
     <Compile Include="PersonnelManagement\ResourceImport\ResourceImportBLL.cs" />
     <Compile Include="PersonnelManagement\ResourceImport\ResourceImportIBLL.cs" />
+    <Compile Include="CustomFunction\SRProjectLevel\SRProjectLevelEntity.cs" />
+    <Compile Include="CustomFunction\SRProjectLevel\SRProjectLevelService.cs" />
+    <Compile Include="CustomFunction\SRProjectLevel\SRProjectLevelBLL.cs" />
+    <Compile Include="CustomFunction\SRProjectLevel\SRProjectLevelIBLL.cs" />
+    <Compile Include="CustomFunction\SRProjectType\SRProjectTypeEntity.cs" />
+    <Compile Include="CustomFunction\SRProjectType\SRProjectTypeService.cs" />
+    <Compile Include="CustomFunction\SRProjectType\SRProjectTypeBLL.cs" />
+    <Compile Include="CustomFunction\SRProjectType\SRProjectTypeIBLL.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CollectManage\SSO_Drag_CollectManageEntity.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CollectManage\SSO_Drag_CollectManageService.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CollectManage\SSO_Drag_CollectManageIBLL.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CollectManage\SSO_Drag_CollectManageBLL.cs" />
+    <Compile Include="CustomFunction\SRProjectPlan\SRProjectPlanEntity.cs" />
+    <Compile Include="CustomFunction\SRProjectPlan\SRProjectPlanService.cs" />
+    <Compile Include="CustomFunction\SRProjectPlan\SRProjectPlanBLL.cs" />
+    <Compile Include="CustomFunction\SRProjectPlan\SRProjectPlanIBLL.cs" />
+    <Compile Include="CustomFunction\SRProjectWork\SRProjectWorkEntity.cs" />
+    <Compile Include="CustomFunction\SRProjectWork\SRProjectWorkService.cs" />
+    <Compile Include="CustomFunction\SRProjectWork\SRProjectWorkBLL.cs" />
+    <Compile Include="CustomFunction\SRProjectWork\SRProjectWorkIBLL.cs" />
     <Compile Include="EducationalAdministration\Dispatch\DispatchEntity.cs" />
     <Compile Include="EducationalAdministration\Dispatch\DispatchService.cs" />
     <Compile Include="EducationalAdministration\Dispatch\DispatchBLL.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs

@@ -114,6 +114,31 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
+
+        /// <summary>
+        /// 获取MeetingManagement表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public DataTable GetStatisticList(string queryJson)
+        {
+            try
+            {
+                return meetingManagementService.GetStatisticList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs

@@ -40,6 +40,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         MeetingManagementEntity GetMeetingManagementEntityByProcessId(string processId);
+        /// <summary>
+        /// 获取报表数据
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        DataTable GetStatisticList(string queryJson);
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs

@@ -166,6 +166,55 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取报表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public DataTable GetStatisticList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT  ");
+                strSql.Append(@"
+                t.meetingtitle,
+                t.begintime,
+                t.endtime,
+                t.正常,
+                t.未到
+                ");
+                strSql.Append("  FROM (select m.MeetingTitle,isnull(t.正常,0) 正常,isnull(t.未到,0) 未到,m.BeginTime,m.EndTime from MeetingManagement m left join (select meetid,sum(case issignin when 1 then 1 else 0 end) as 正常, sum(case issignin when 0 then 1 else 0 end) as 未到  from MeetingSignInRecord group by meetid) t on t.MeetID=m.Id)t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["meetingtitle"].IsEmpty())
+                {
+                    dp.Add("meetingtitle", "%" + queryParam["meetingtitle"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.meetingtitle Like @meetingtitle ");
+                }
+                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.begintime >= @startTime AND t.begintime <= @endTime ) ");
+                }
+                return this.BaseRepository("CollegeMIS").FindTable(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs

@@ -46,6 +46,18 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("ParticipantName", "%" + queryParam["ParticipantName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.ParticipantName like @ParticipantName ");
                 }
+                if (!queryParam["IsSignIn"].IsEmpty())
+                {
+                    if (queryParam["IsSignIn"].ToString() == "true")
+                    {
+                        strSql.Append(" AND t.IsSignIn=1 ");
+                    }
+                    else
+                    {
+                        strSql.Append(" AND t.IsSignIn=0 ");
+                    }
+
+                }
 
                 return this.BaseRepository("CollegeMIS").FindList<MeetingSignInRecordEntity>(strSql.ToString(), dp, pagination);
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGEREntity.cs

@@ -49,6 +49,21 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("POSTSCRIPT")]
         public string postscript { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("GERCREATEUSERID")]
+        public string GerCreateUserId { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("GERCREATEUSERNAME")]
+        public string GerCreateUserName { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("GERCREATETIME")]
+        public DateTime? GerCreateTime { get; set; }
         #endregion
 
         #region 扩展操作
@@ -58,6 +73,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         public void Create()
         {
             this.GerID = Guid.NewGuid().ToString();
+            var userinfo = LoginUserInfo.Get();
+            this.GerCreateUserId = userinfo.userId;
+            this.GerCreateUserName = userinfo.realName;
+            this.GerCreateTime = DateTime.Now;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResourceImport/ResourceImportBLL.cs

@@ -93,6 +93,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
+        
+        /// <summary>
+        /// 发布
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void Publish(string keyValue, int ImportState)
+        {
+            try
+            {
+                resourceImportService.Publish(keyValue, ImportState);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
 
         /// <summary>
         /// 保存实体数据（新增、修改）

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResourceImport/ResourceImportEntity.cs

@@ -58,6 +58,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         public void Create()
         {
             this.ImportId = Guid.NewGuid().ToString();
+            this.ImportTime=DateTime.Now;
+            this.ImportUser = LoginUserInfo.Get().realName;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResourceImport/ResourceImportIBLL.cs

@@ -37,6 +37,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="keyValue">主键</param>
         void DeleteEntity(string keyValue);
         /// <summary>
+        /// 发布
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="ImportState"></param>
+        void Publish(string keyValue, int ImportState);
+        /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResourceImport/ResourceImportService.cs

@@ -48,7 +48,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("ImportName", "%" + queryParam["ImportName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.ImportName Like @ImportName ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<ResourceImportEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<ResourceImportEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -99,7 +99,36 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<ResourceImportEntity>(t=>t.ImportId == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<ResourceImportEntity>(t => t.ImportId == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 发布
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void Publish(string keyValue, int ImportState)
+        {
+            try
+            {
+                if (keyValue.Contains(","))
+                {
+                    keyValue = string.Join("','", keyValue.Split(','));
+                }
+
+                string sql = $" update ResourceImport set ImportState={ImportState} where ImportId in ('{keyValue}')";
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StudyGuide/StudyGuideBLL.cs

@@ -94,6 +94,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 发布
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void Publish(string keyValue,int GuideState)
+        {
+            try
+            {
+                studyGuideService.Publish(keyValue, GuideState);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        
+
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>