冲突合并

Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证oauth2.0对接说明V1.0.docx

@@ -48,7 +48,7 @@ http://数字化智慧校园部署地址 / 测试用户名：thirdtest密码：1
 至此，统一应用端配置完毕。
 
 第二步 获取授权用户信息
-  接上一步，在跳转到应用时会在应用地址上携带参数：appkey=" xxxx"&name="xxxx"&no="xxxx"&type=0&a="xxx"，appkey  是DES 密钥的 32位MD5（自行判断正确性，错误即非法请求。），name和no代表用户姓名和编号，都为DES加密后字符，type是类型，0为老师，1为学生。DES 密钥为约定项，自行配置在系统参数里。解密后得到用户信息自行在系统里配置该用户的登录认证及权限。
+  接上一步，在跳转到应用时会在应用地址上携带参数：appkey=" xxxx"&name="xxxx"&no="xxxx"&acc="xxxx"&type=0&a="xxx"，appkey  是DES 密钥的 32位MD5（自行判断正确性，错误即非法请求。），name和no代表用户姓名和身份证号，都为DES加密后字符，acc为账号，为DES加密密文，type是类型，0为老师，1为学生。DES 密钥为约定项，自行配置在系统参数里。解密后得到用户信息自行在系统里配置该用户的登录认证及权限。
 
 登录跳转的身份认证
 	数校登录页如果携带returnUrl参数，在登录后会自动跳转returnUrl，跳转时也会携带参数：appkey=" xxxx"&name="xxxx"&no="xxxx"&type=0&m="xxx"&t="xxx"，验证方法同上。

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs

@@ -31,6 +31,7 @@ namespace Learun.Application.Organization
         private string cacheKey = "learun_adms_user_";       // +公司主键
         private string cacheKeyAccount = "learun_adms_user_account_";// +用户账号（账号不允许改动）
         private string cacheKeyId = "learun_adms_user_Id_";// +用户账号（账号不允许改动）
+        private string cacheKeynos = "learun_adms_usernostu_";       // +公司主键
         #endregion
 
         #region  获取数据
@@ -735,7 +736,68 @@ namespace Learun.Application.Organization
                 }
             }
         }
-
+        /// <summary>
+        /// 获取映射数据
+        /// </summary>
+        /// <returns></returns>
+        public Dictionary<string, UserModel> GetModelMap(string description)
+        {
+            try
+            {
+                Dictionary<string, UserModel> dic = cache.Read<Dictionary<string, UserModel>>(cacheKeynos + "dic", CacheId.usernostu);
+                if (dic == null)
+                {
+                    dic = new Dictionary<string, UserModel>();
+                    var list = userService.GetAllListForMap(description);
+                    string fileHeadImg = Config.GetValue("fileHeadImg");
+                    foreach (var item in list)
+                    {
+                        UserModel model = new UserModel()
+                        {
+                            companyId = item.F_CompanyId,
+                            departmentId = item.F_DepartmentId,
+                            name = item.F_RealName,
+                            mobile = item.F_Mobile ?? ""
+                        };
+                        string img = "";
+                        if (!string.IsNullOrEmpty(item.F_HeadIcon))
+                        {
+                            string fileImg = string.Format("{0}/{1}{2}", fileHeadImg, item.F_UserId, item.F_HeadIcon);
+                            if (DirFileHelper.IsExistFile(fileImg))
+                            {
+                                img = item.F_HeadIcon;
+                            }
+                        }
+                        if (string.IsNullOrEmpty(img))
+                        {
+                            if (item.F_Gender == 0)
+                            {
+                                img = "0";
+                            }
+                            else
+                            {
+                                img = "1";
+                            }
+                        }
+                        model.img = img;
+                        dic.Add(item.F_UserId, model);
+                        cache.Write(cacheKeynos + "dic", dic, CacheId.usernostu);
+                    }
+                }
+                return dic;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserIBLL.cs

@@ -110,6 +110,12 @@ namespace Learun.Application.Organization
         /// </summary>
         /// <returns></returns>
         Dictionary<string, UserModel> GetModelMap();
+        /// <summary>
+        /// 除学生之外所有用户
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns></returns>
+        Dictionary<string, UserModel> GetModelMap(string Description);
         List<UserEntity> GetSaveClassMap();
 
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs

@@ -295,7 +295,40 @@ namespace Learun.Application.Organization
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(fieldStr.Replace("t.F_Password,", "").Replace("t.F_Secretkey,", ""));
-                strSql.Append(" FROM LR_Base_User t WHERE t.F_DeleteMark = 0  ORDER BY t.F_CompanyId,t.F_DepartmentId,t.F_RealName ");
+                strSql.Append(" FROM LR_Base_User t WHERE t.F_DeleteMark = 0  and F_EnabledMark =1 ORDER BY t.F_CompanyId,t.F_DepartmentId,t.F_RealName ");
+                return this.BaseRepository().FindList<UserEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 用户列表,全部
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<UserEntity> GetAllListForMap(string description)
+        {
+            try
+            {
+                var fieldStr = @"t.F_CompanyId,t.F_DepartmentId,t.F_RealName,t.F_Mobile,t.F_HeadIcon,
+                             t.F_UserId,t.F_Gender ";
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldStr.Replace("t.F_Password,", "").Replace("t.F_Secretkey,", ""));
+                strSql.Append(" FROM LR_Base_User t WHERE t.F_DeleteMark = 0  ");
+                if (!description.IsEmpty())
+                {
+                    strSql.Append(" and  F_Description !='学生'");
+                }
+                strSql.Append("ORDER BY t.F_CompanyId,t.F_DepartmentId,t.F_RealName ");
                 return this.BaseRepository().FindList<UserEntity>(strSql.ToString());
             }
             catch (Exception ex)
@@ -310,7 +343,6 @@ namespace Learun.Application.Organization
                 }
             }
         }
-
         /// <summary>
         /// 用户列表（导出Excel）
         /// </summary>

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

@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-11 10:51
+    /// 描 述：固定资产登记管理
+    /// </summary>
+    public class FixedAssetsController : MvcControllerBase
+    {
+        private FixedAssetsIBLL fixedAssetsIBLL = new FixedAssetsBLL();
+
+        #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 = fixedAssetsIBLL.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 FixedAssetsData = fixedAssetsIBLL.GetFixedAssetsEntity( keyValue );
+            var jsonData = new {
+                FixedAssets = FixedAssetsData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            fixedAssetsIBLL.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)
+        {
+            FixedAssetsEntity entity = strEntity.ToObject<FixedAssetsEntity>();
+            fixedAssetsIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,136 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-18 10:42
+    /// 描 述：配置描述
+    /// </summary>
+    public class OfficeEquipmentController : MvcControllerBase
+    {
+        private OfficeEquipmentIBLL officeEquipmentIBLL = new OfficeEquipmentBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 生成二维码
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult QRCode(string keyValue)
+        {
+            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 = officeEquipmentIBLL.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 OfficeEquipmentData = officeEquipmentIBLL.GetOfficeEquipmentEntity( keyValue );
+            var jsonData = new {
+                OfficeEquipment = OfficeEquipmentData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            officeEquipmentIBLL.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)
+        {
+            OfficeEquipmentEntity entity = strEntity.ToObject<OfficeEquipmentEntity>();
+            officeEquipmentIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        public ActionResult Search(string keyValue)
+        {
+            var OfficeEquipmentData = officeEquipmentIBLL.GetOfficeEquipmentEntity(keyValue);
+            var jsonData = new
+            {
+                OfficeEquipment = OfficeEquipmentData,
+            };
+            return Success(jsonData);
+        }
+
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,165 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-12 09:46
+    /// 描 述：安全排查流程
+    /// </summary>
+    public class SafetyCheckController : MvcControllerBase
+    {
+        private SafetyCheckIBLL safetyCheckIBLL = new SafetyCheckBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单查看页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 部门审查
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormCheck()
+        {
+            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 = safetyCheckIBLL.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 SafetyCheckData = safetyCheckIBLL.GetSafetyCheckEntity(keyValue);
+            var jsonData = new
+            {
+                SafetyCheck = SafetyCheckData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            safetyCheckIBLL.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)
+        {
+            SafetyCheckEntity entity = strEntity.ToObject<SafetyCheckEntity>();
+            safetyCheckIBLL.SaveEntity(keyValue, entity);
+            if (!string.IsNullOrEmpty(keyValue))
+            {
+
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SubmitForm(string keyValue)
+        {
+            safetyCheckIBLL.SubmitEnity(keyValue);
+            return Success("提交成功！");
+        }
+
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DepartmentForm(string keyValue, string strEntity)
+        {
+            SafetyCheckEntity entity = strEntity.ToObject<SafetyCheckEntity>();
+            if (entity.Status != 0)
+            {
+                entity.Status = 2;
+            }
+            else
+            {
+                entity.Status = 0;
+            }
+            safetyCheckIBLL.SaveEntity(keyValue, entity);
+            return Success("操作成功！");
+        }
+    }
+}

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

@@ -0,0 +1,55 @@
+@{
+    ViewBag.Title = "固定资产登记管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
+        <input id="AssetsName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">生产厂家<font face="宋体">*</font></div>
+        <input id="Manufacturer" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">品牌</div>
+        <input id="Brand" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">单位<font face="宋体">*</font></div>
+        <div id="Unit" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
+        <input id="Nuantity" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">价值(元)</div>
+        <input id="Cost" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">存放地址</div>
+        <input id="Address" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">验收人<font face="宋体">*</font></div>
+        <div id="Acceptor" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">使用管理人<font face="宋体">*</font></div>
+        <div id="UsePeople" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">登记人<font face="宋体">*</font></div>
+        <div id="Registrant" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">使用状态</div>
+        <div id="Status"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FixedAssets">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FixedAssets/Form.js")

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

@@ -0,0 +1,55 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-11 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 () {
+            $('#Unit').lrDataItemSelect({ code: 'sldw', allowSearch: true });
+            $('#Acceptor').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+            $('#UsePeople').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+            $('#Registrant').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+            $('#Status').lrDataItemSelect({ code: 'NewAssState' });
+        }, 
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/FixedAssets/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/FixedAssets/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,65 @@
+@{
+    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-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产名称</div>
+                                    <input id="AssetsName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">生产厂家</div>
+                                    <input id="Manufacturer" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">存放地址</div>
+                                    <input id="Address" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">品牌</div>
+                                    <input id="Brand" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">验收人</div>
+                                    <div id="Acceptor"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">使用管理人</div>
+                                    <div id="UsePeople"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">登记人</div>
+                                    <div id="Registrant"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">使用状态</div>
+                                    <div id="Status"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FixedAssets/Index.js")

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

@@ -0,0 +1,163 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-11 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);
+            $('#Acceptor').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
+            $('#UsePeople').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
+            $('#Status').lrDataItemSelect({ code: 'NewAssState' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/FixedAssets/Form',
+                    width: 600,
+                    height: 500,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/FixedAssets/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 500,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FixedAssets/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/FixedAssets/GetPageList',
+                headData: [
+                    { label: "资产名称", name: "AssetsName", width: 200, align: "left" },
+                    { label: "生产厂家", name: "Manufacturer", width: 120, align: "left" },
+                    { label: "品牌", name: "Brand", width: 120, align: "left" },
+                    {
+                        label: "单位", name: "Unit", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'sldw',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "数量", name: "Nuantity", width: 100, align: "left" },
+                    { label: "价值(元)", name: "Cost", width: 100, align: "left" },
+                    { label: "存放地址", name: "Address", width: 300, align: "left" },
+                    {
+                        label: "验收人", name: "Acceptor", width: 120, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                key: value,
+                                keyId: 'empno',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "使用管理人", name: "UsePeople", width: 120, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                key: value,
+                                keyId: 'empno',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    }, 
+                    {
+                        label: "登记人", name: "Registrant", width: 120, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                key: value,
+                                keyId: 'empno',
+                                callback: function (_data) {
+                                    callback(_data['empname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "使用状态", name: "Status", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'NewAssState',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "备注", name: "Remark", 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/EducationalAdministration/Views/OfficeEquipment/Form.cshtml

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "配置描述";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">名称<font face="宋体">*</font></div>
+        <div id="Name" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
+        <div id="Department" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">设备名称<font face="宋体">*</font></div>
+        <input id="DeviceName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">配置描述<font face="宋体">*</font></div>
+        <input id="Description" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/OfficeEquipment/Form.js")

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

@@ -0,0 +1,57 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-18 10:42
+ * 描  述：配置描述
+ */
+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 () {
+            $('#Name').lrDataSourceSelect({ code: 'TeacherInfo',value: 'f_encode',text: 'f_realname' });
+            $('#Department').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
+                param: {},
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Index.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="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">名称</div>
+                                    <div id="Name"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">部门</div>
+                                    <div id="Department"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">设备名称</div>
+                                    <input id="DeviceName" 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>*@
+                        <a id="lr_qrCode" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;二维码</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/OfficeEquipment/Index.js")

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

@@ -0,0 +1,132 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-18 10:42
+ * 描  述：配置描述
+ */
+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);
+            $('#Name').lrDataSourceSelect({ code: 'TeacherInfo',value: 'f_encode',text: 'f_realname' });
+            $('#Department').lrDataSourceSelect({ code: 'classdata',value: 'id',text: 'name' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/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 + '/EducationalAdministration/OfficeEquipment/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 + '/EducationalAdministration/OfficeEquipment/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 查看二维码
+            $('#lr_qrCode').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formqrCode',
+                        title: '二维码',
+                        url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/qrCode?keyValue=' + keyValue,
+                        width: 700,
+                        height: 900,
+                        btn: null, 
+                        end: function () { refreshGirdData(); }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/GetPageList',
+                headData: [
+                    { label: "名称", name: "Name", 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_encode',
+                                 callback: function (_data) {
+                                     callback(_data['f_realname']);
+                                 }
+                             });
+                        }},
+                    { label: "部门", name: "Department", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }},
+                    { label: "设备名称", name: "DeviceName", width: 100, align: "left"},
+                    { label: "配置描述", name: "Description", width: 100, align: "left"},
+                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/qrCode.cshtml

@@ -0,0 +1,36 @@
+@{
+    ViewBag.Title = "会议管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script src="~/Content/jquery/qrcode.min.js"></script>
+@*<div id="subprint" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
+        打印
+    </div>*@
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+            <div class="lr-form-item-title">名称<font face="宋体">*</font></div>
+            <div id="Name" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+            <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
+            <div id="Department" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+            <div class="lr-form-item-title">设备名称<font face="宋体">*</font></div>
+            <input id="DeviceName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="OfficeEquipment">
+            <div class="lr-form-item-title">配置描述<font face="宋体">*</font></div>
+            <input id="Description" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="OfficeEquipment">
+            <div class="lr-form-item-title">备注</div>
+            <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+        </div>
+    <div class="col lr-form-item" data-table="OfficeEquipment">
+        <div id="qrCode" style="text-align:center"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/OfficeEquipment/qrCode.js")
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteer/server.js")
+@Html.AppendJsFile("/Content/jquery/jquery-1.10.2.min.js", "/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js", "/Content/js/qrcode.min.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/qrCode.js

@@ -0,0 +1,114 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+//// 设置表单数据
+//var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#Name').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_encode', text: 'f_realname' });
+            $('#Department').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
+                param: {},
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/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]);
+                        }
+                        //扫码签到
+                        makeCode(data[id].Id);
+                    }
+                });
+            }
+        }
+    };
+    //// 设置表单数据
+    //setFormData = function (processId, param, callback) {
+    //    if (!!processId) {
+    //        $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetFormDataByProcessId?processId=' + processId, function (data) {
+    //            for (var id in data) {
+    //                if (!!data[id] && data[id].length > 0) {
+    //                    $('#' + id).jfGridSet('refreshdata', data[id]);
+    //                }
+    //                else {
+    //                    if (id == 'MeetingManagement' && data[id]) {
+    //                        keyValue = data[id].Id;
+    //                    }
+    //                    $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+    //                }
+    //            }
+    //        });
+    //    }
+    //    callback && callback();
+    //}
+    // 验证数据是否填写完整
+    //validForm = function () {
+    //    if (!$('body').lrValidform()) {
+    //        return false;
+    //    }
+    //    return true;
+    //};
+    // 保存数据
+    save = function (processId, callBack, i) {
+        if (!!callBack) {
+            var res = {
+                code: 200, data: {}
+            };
+            callBack(res, i);
+        }
+    };
+    page.init();
+}
+//扫码签到
+var qrcode = new QRCode(document.getElementById("qrCode"), {
+    width: 550,
+    height: 550
+});
+function makeCode(urls) {
+    qrcode.makeCode(urls);
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/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="SafetyCheck" >
+        <div class="lr-form-item-title">网络格员</div>
+        <input id="Name" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SafetyCheck" >
+        <div class="lr-form-item-title">处室部门</div>
+        <input id="Department" type="text" readonly class="form-control currentInfo lr-currentInfo-department" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SafetyCheck" >
+        <div class="lr-form-item-title">责任区域<font face="宋体">*</font></div>
+        <input id="Area" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SafetyCheck" >
+        <div class="lr-form-item-title">排查时间<font face="宋体">*</font></div>
+        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CheckTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SafetyCheck" >
+        <div class="lr-form-item-title">发现的隐患<font face="宋体">*</font></div>
+        <textarea id="Question" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SafetyCheck" >
+        <div class="lr-form-item-title">整改措施及建议</div>
+        <textarea id="idea" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SafetyCheck" >
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="Path"  ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="SafetyCheck" >
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SafetyCheck/Form.js")

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

@@ -0,0 +1,62 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-12 09:46
+ * 描  述：安全排查流程
+ */
+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 () {
+            $('#Name')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#Name').val(learun.clientdata.get(['userinfo']).realName);
+            $('#Department')[0].lrvalue = learun.clientdata.get(['userinfo']).departmentId;
+            $('#Department').lrselectSet(learun.clientdata.get(['userinfo']).departmentId);
+            //$('#Department').val(learun.clientdata.get(['userinfo']).departmentId);
+            learun.clientdata.getAsync('department', {
+                key: learun.clientdata.get(['userinfo']).departmentId,
+                callback: function (_data) {
+                    $('#Department').val(_data.name);
+                }
+            });
+            $('#Path').lrUploader();
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/SafetyCheck/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/SafetyCheck/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormCheck.cshtml

@@ -0,0 +1,47 @@
+@{
+    ViewBag.Title = "安全排查流程";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">网络格员</div>
+        <input id="Name" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">处室部门</div>
+        <input id="Department" type="text" readonly class="form-control currentInfo lr-currentInfo-department" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">责任区域<font face="宋体">*</font></div>
+        <input id="Area" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">排查时间<font face="宋体">*</font></div>
+        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CheckTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">发现的隐患<font face="宋体">*</font></div>
+        <textarea id="Question" class="form-control" style="height:100px;" isvalid="yes" readonly="readonly" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">整改措施及建议</div>
+        <textarea id="idea" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="Path"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">继续上报</div>
+        <div id="Status"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">部门建议</div>
+        <textarea id="DepartmentRemark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SafetyCheck/FormCheck.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormCheck.js

@@ -0,0 +1,65 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-12 09:46
+ * 描  述：安全排查流程
+ */
+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 () {
+            $('#Name')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#Name').val(learun.clientdata.get(['userinfo']).realName);
+            $('#Department')[0].lrvalue = learun.clientdata.get(['userinfo']).departmentId;
+            learun.clientdata.getAsync('department', {
+                key: learun.clientdata.get(['userinfo']).departmentId,
+                callback: function (_data) {
+                    $('#名称').val(_data.name);
+                }
+            });
+            $('#Path').lrUploader({ isUpload: false });
+            $("#Status").lrselect({
+                data: [{ text: "继续上报", value: "1" }, { text: "退回", value: "0" }],
+                text: "text",
+                value: "value"
+            })
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/SafetyCheck/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/SafetyCheck/DepartmentForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormView.cshtml

@@ -0,0 +1,43 @@
+@{
+    ViewBag.Title = "安全排查流程";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">网络格员</div>
+        <input id="Name" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">处室部门</div>
+        <input id="Department" type="text" readonly class="form-control currentInfo lr-currentInfo-department" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">责任区域<font face="宋体">*</font></div>
+        <input id="Area" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"/>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">排查时间<font face="宋体">*</font></div>
+        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CheckTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">发现的隐患<font face="宋体">*</font></div>
+        <textarea id="Question" class="form-control" style="height:100px;" isvalid="yes" readonly="readonly" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">整改措施及建议</div>
+        <textarea id="idea" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="Path"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="SafetyCheck">
+        <div class="lr-form-item-title">部门建议</div>
+        <textarea id="DepartmentRemark" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SafetyCheck/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SafetyCheck/FormView.js

@@ -0,0 +1,60 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-12 09:46
+ * 描  述：安全排查流程
+ */
+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 () {
+            $('#Name')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#Name').val(learun.clientdata.get(['userinfo']).realName);
+            $('#Department')[0].lrvalue = learun.clientdata.get(['userinfo']).departmentId;
+            learun.clientdata.getAsync('department', {
+                key: learun.clientdata.get(['userinfo']).departmentId,
+                callback: function (_data) {
+                    $('#名称').val(_data.name);
+                }
+            });
+            $('#Path').lrUploader({ isUpload: false });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/SafetyCheck/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/SafetyCheck/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,47 @@
+@{
+    ViewBag.Title = "安全排查流程";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">网络格员</div>
+                                    <div id="Name"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">处室部门</div>
+                                    <div id="Department"></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>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-search"></i>&nbsp;查看</a>
+                        <a id="lr_department" class="btn btn-default"><i class="fa fa-search"></i>&nbsp;部门审查</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SafetyCheck/Index.js")

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

@@ -0,0 +1,245 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2024-09-12 09:46
+ * 描  述：安全排查流程
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 时间搜索框 
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月 
+                mShow: false,
+                premShow: false,
+                // 季度 
+                jShow: false,
+                prejShow: false,
+                // 年 
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认 
+                dfvalue: '0',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#Name').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/SafetyCheck/Form',
+                    width: 600,
+                    height: 600,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var CreateUser = $('#gridtable').jfGridValue('CreateUser');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (CreateUser != user) {
+                    learun.alert.warning("当前项暂不可编辑！");
+                    return;
+                }
+                var Status = $('#gridtable').jfGridValue('Status');
+                if (Status != 0) {
+                    learun.alert.warning("当前项目已提交不能不能编辑！");
+                    return;
+                }
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/SafetyCheck/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 600,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var CreateUser = $('#gridtable').jfGridValue('CreateUser');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (CreateUser != user) {
+                    learun.alert.warning("当前项暂不可删除！");
+                    return;
+                }
+                var Status = $('#gridtable').jfGridValue('Status');
+                if (Status != 0) {
+                    learun.alert.warning("当前项目已提交不能不能删除！");
+                    return;
+                }
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/SafetyCheck/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+            //  提交
+            $('#lr_submit').on('click', function () {
+                var CreateUser = $('#gridtable').jfGridValue('CreateUser');
+                var user = learun.clientdata.get(['userinfo']).userId;
+                if (CreateUser != user) {
+                    learun.alert.warning("当前项暂不可提交！");
+                    return;
+                }
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status !== 0) {
+                        learun.alert.warning("当前项目已提交，请耐心等待审批！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/SafetyCheck/SubmitForm', { keyValue: keyValue }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formSafetyCheck',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/SafetyCheck/FormView?keyValue=' + keyValue,
+                        width: 600,
+                        height: 610,
+                        btn: null
+                    });
+                }
+            });
+            // 部门审查
+            $('#lr_department').on('click', function () {
+                var Status = $('#gridtable').jfGridValue('Status');
+                if (Status != 1) {
+                    learun.alert.warning("当前项目不可进行审查！");
+                    return;
+                }
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formFormCheck',
+                        title: '部门审查',
+                        url: top.$.rootUrl + '/EducationalAdministration/SafetyCheck/FormCheck?keyValue=' + keyValue,
+                        width: 600,
+                        height: 680,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/SafetyCheck/GetPageList',
+                headData: [
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue === 1) {
+                                return '<span class=\"label label-warning\">审批中</span>';
+                            } else if (cellvalue === 2) {
+                                return '<span class=\"label label-success\">完成</span>';
+                            } else if (cellvalue === 0) {
+                                return '<span class=\"label label-default\" >草稿</span>';
+                            }
+                        }
+                    },
+                    {
+                        label: "网络格员", name: "Name", width: 120, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "处室部门", name: "Department", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('department', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "责任区域", name: "Area", width: 120, align: "left" },
+                    { label: "排查时间", name: "CheckTime", width: 150, align: "left" },
+                    { label: "发现的隐患", name: "Question", width: 230, align: "left" },
+                    { label: "整改措施及建议", name: "idea", width: 230, align: "left" },
+                    { label: "备注", name: "Remark", width: 300, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'CheckTime desc ',
+            });
+            page.search();
+        },
+        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/LR_NewWorkFlow/Views/NWFProcess/AppointForm.js

@@ -18,7 +18,7 @@ var bootstrap = function ($, learun) {
             var userList = [];
             learun.clientdata.getAllAsync('department', {
                 callback: function (departmentMap) {
-                    learun.clientdata.getAllAsync('user', {
+                    learun.clientdata.getAllAsync('usernostu', {
                         callback: function (data) {
                             userMap = data;
                             $.each(userMap, function (_id, _item) {
@@ -30,7 +30,7 @@ var bootstrap = function ($, learun) {
                                     name = _item.name;
 
                                 }
-                               
+
                                 var point = {
                                     id: _id,
                                     name: name
@@ -48,10 +48,10 @@ var bootstrap = function ($, learun) {
                     $.each(data, function (_index, _item) {
                         taskMap[_item.F_Id] = _item;
                         var nameList = [];
-                        $.each(_item.nWFUserInfoList, function (_jindex,_jitem) {
+                        $.each(_item.nWFUserInfoList, function (_jindex, _jitem) {
                             if (userMap[_jitem.Id]) {
                                 nameList.push(userMap[_jitem.Id].name);
-                            } 
+                            }
                         });
 
                         var _html = '<div class="col-xs-12 lr-form-item">\

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/UserController.cs

@@ -252,6 +252,25 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
                 return JsonResult(jsondata);
             }
         }
+        public ActionResult GetUserNoStu(string ver,string Description)
+        {
+            var data = userIBLL_static.GetModelMap(Description);
+            string md5 = Md5Helper.Encrypt(data.ToJson(), 32);
+            if (md5 == ver)
+            {
+                return Success("no update");
+            }
+            else
+            {
+                var jsondata = new
+                {
+                    data = data,
+                    ver = md5
+                };
+                return JsonResult(jsondata);
+            }
+        }
+
         /// <summary>
         /// 获取头像
         /// </summary>

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

@@ -96,16 +96,16 @@ namespace Learun.Application.Web.Controllers
                     if (perm_application != null)
                     {
                         //写入当前请求所登录的用户
-                        var code = Util.CommonHelper.RndNum(9);
-                        redisCache.Write(code, userinfo.account, TimeSpan.FromMinutes(10));
+                        //var code = Util.CommonHelper.RndNum(9);
+                        //redisCache.Write(code, userinfo.account, TimeSpan.FromMinutes(10));
                         var url = perm_application.FUrl;
                         if (url.Contains("?"))
                         {
-                            url += "&appkey=" + Md5Helper.Encrypt(perm_application.FSecret, 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, perm_application.FSecret, false) + "&no=" + DESEncrypt.Encrypt(userinfo.enCode, perm_application.FSecret, false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(userinfo.loginMark) + "&t=" + DESEncrypt.Encrypt(userinfo.token);
+                            url += "&appkey=" + Md5Helper.Encrypt(Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&no=" + DESEncrypt.Encrypt(userinfo.IdentityCardNo, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&acc=" + DESEncrypt.Encrypt(userinfo.enCode, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(userinfo.loginMark) + "&t=" + DESEncrypt.Encrypt(userinfo.token);
                         }
                         else
                         {
-                            url += "?appkey=" + Md5Helper.Encrypt(perm_application.FSecret, 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, perm_application.FSecret, false) + "&no=" + DESEncrypt.Encrypt(userinfo.enCode, perm_application.FSecret, false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(userinfo.loginMark) + "&t=" + DESEncrypt.Encrypt(userinfo.token);
+                            url += "?appkey=" + Md5Helper.Encrypt(Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&no=" + DESEncrypt.Encrypt(userinfo.IdentityCardNo, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&acc=" + DESEncrypt.Encrypt(userinfo.enCode, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(userinfo.loginMark) + "&t=" + DESEncrypt.Encrypt(userinfo.token);
                         }
                         return Redirect(url);
                     }

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

@@ -671,21 +671,21 @@ namespace Learun.Application.Web.Controllers
                     var perm_application = perm_FunctionIBLL.GetPerm_FunctionEntity(appid);
                     if (perm_application != null)
                     {
-                        var userinfo = LoginUserInfo.Get();
+                        //var userinfo = LoginUserInfo.Get();
                         //写入当前请求所登录的用户
                         var type = 0;//1学生 0教师
                         if (userEntity.F_Description == "学生")
                         {
                             type = 1;
                         }
-                        var url = perm_application.FUrl;
+                        var url = HttpUtility.UrlDecode(Returnurl);
                         if (url.Contains("?"))
                         {
-                            url += "&appkey=" + Md5Helper.Encrypt(perm_application.FSecret, 32) + "&name=" + DESEncrypt.Encrypt(userEntity.F_RealName, perm_application.FSecret, false) + "&no=" + DESEncrypt.Encrypt(userEntity.F_EnCode, perm_application.FSecret, false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(userinfo.loginMark) + "&t=" + DESEncrypt.Encrypt(token);
+                            url += "&appkey=" + Md5Helper.Encrypt(Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), 32) + "&name=" + DESEncrypt.Encrypt(userEntity.F_RealName, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&no=" + DESEncrypt.Encrypt(userEntity.F_IdentityCardNo, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&acc=" + DESEncrypt.Encrypt(userEntity.F_EnCode, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(loginMark) + "&t=" + DESEncrypt.Encrypt(token);
                         }
                         else
                         {
-                            url += "?appkey=" + Md5Helper.Encrypt(perm_application.FSecret, 32) + "&name=" + DESEncrypt.Encrypt(userEntity.F_RealName, perm_application.FSecret, false) + "&no=" + DESEncrypt.Encrypt(userEntity.F_EnCode, perm_application.FSecret, false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(userinfo.loginMark) + "&t=" + DESEncrypt.Encrypt(token);
+                            url += "?appkey=" + Md5Helper.Encrypt(Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), 32) + "&name=" + DESEncrypt.Encrypt(userEntity.F_RealName, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&no=" + DESEncrypt.Encrypt(userEntity.F_IdentityCardNo, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&acc=" + DESEncrypt.Encrypt(userEntity.F_EnCode, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(loginMark) + "&t=" + DESEncrypt.Encrypt(token);
                         }
                         Returnurl = url;
                     }

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

@@ -913,6 +913,9 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\VocationalProgramController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\WelfareRecordController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\UnionActivitiesController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\FixedAssetsController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\SafetyCheckController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\OfficeEquipmentController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -1083,6 +1086,9 @@
     <Content Include="Areas\EducationalAdministration\Views\ClassPlan\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\ClassPlan\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\ClassPlan\IndexSchool.js" />
+    <Content Include="Areas\EducationalAdministration\Views\OfficeEquipment\qrCode.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\FormCheck.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuArriveSchool\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuArriveSchool\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\EADateArrange\InitByConditionForm.js" />
@@ -1370,6 +1376,9 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\DirectionPrint.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\TeachingQualityPrint.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\FinishSchoolDateForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\FormView.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\FormCheck.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\OfficeEquipment\qrCode.cshtml" />
     <None Include="Areas\EducationalAdministration\Views\StuInfoBasic\Printxjk.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticClassIndex.js" />
@@ -7181,6 +7190,18 @@
     <Content Include="Areas\EducationalAdministration\Views\UnionActivities\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\UnionActivities\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\UnionActivities\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\FixedAssets\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\FixedAssets\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\FixedAssets\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\FixedAssets\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SafetyCheck\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\OfficeEquipment\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\OfficeEquipment\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\OfficeEquipment\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\OfficeEquipment\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js

@@ -341,6 +341,71 @@
             }
         }
     };
+    // 人员信息
+    clientAsyncData.usernostu = {
+        states: loadSate.no,
+        init: function () {
+            if (clientAsyncData.usernostu.states == loadSate.no) {
+                clientAsyncData.usernostu.states = loadSate.ing;
+                //var ver = storage.get("userData").ver || "";
+                var ver = "";
+                if (userData) {
+                    ver = userData.ver || "";
+                }
+                learun.httpAsync('GET', top.$.rootUrl + '/LR_OrganizationModule/User/GetUserNoStu', { ver: ver, Description: "Description" }, function (data) {
+                    if (!data) {
+                        clientAsyncData.usernostu.states = loadSate.fail;
+                    } else {
+                        if (data.ver) {
+                            userData = data;
+                            //storage.set("userData", data);
+                        }
+                        clientAsyncData.usernostu.states = loadSate.yes;
+                        clientAsyncData.dataItem.init();
+                    }
+                });
+            }
+        },
+        get: function (op) {
+            clientAsyncData.usernostu.init();
+            if (clientAsyncData.usernostu.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.usernostu.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                //var data = storage.get("userData").data || {};
+                var data = userData.data || {};
+                var keys = (op.key || '').split(',');
+                var array = new Array();
+                if (keys.length > 1) {
+                    $.each(keys,
+                        function (i, item) {
+
+                            array.push(data[item]);
+                        })
+                    op.callback(array || {}, op);
+
+                } else {
+
+                    op.callback(data[op.key] || {}, op);
+                }
+            }
+        },
+        getAll: function (op) {
+            clientAsyncData.usernostu.init();
+            if (clientAsyncData.usernostu.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.usernostu.getAll(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                //var data = storage.get("userData").data || {};
+                var data = userData.data || {};
+                op.callback(data, op);
+            }
+        }
+    };
     // 数据字典
     clientAsyncData.dataItem = {
         states: loadSate.no,

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js

@@ -183,24 +183,28 @@
                             //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
                             window.location.href = "/SSOSystem/DragModelOne";
                         } else {
-                            if (res.data.pwd == true) {
-                                if (res.data.pwdtip == true) {
-                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
-                                    window.location.href = "/Home/Index?pwdpwdtip=true";
-                                } else {
-                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
-                                    window.location.href = "/Home/Index?pwd=true";
+                            if (res.data.FInterfaceUrl != '' && res.data.FInterfaceUrl != null && res.data.FInterfaceUrl != undefined) {
+                                window.location.href = res.data.FInterfaceUrl;
+                            } else {
+                                if (res.data.pwd == true) {
+                                    if (res.data.pwdtip == true) {
+                                        //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+                                        window.location.href = "/Home/Index?pwdpwdtip=true";
+                                    } else {
+                                        //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+                                        window.location.href = "/Home/Index?pwd=true";
+                                    }
                                 }
-                            }
-                            else {
-                                if (res.data.pwdtip == true) {
-                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
-                                    window.location.href = "/Home/Index?pwdtip=true";
-                                } else {
-                                    //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
-                                    window.location.href = "/Home/Index";
+                                else {
+                                    if (res.data.pwdtip == true) {
+                                        //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+                                        window.location.href = "/Home/Index?pwdtip=true";
+                                    } else {
+                                        //window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                                        window.location.href = "/Home/Index";
+                                    }
+                                    //window.location.href = "/Home/Index";
                                 }
-                                //window.location.href = "/Home/Index";
                             }
                         }
                     }

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

@@ -22,7 +22,7 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress />
+    <Use64BitIISExpress>false</Use64BitIISExpress>
     <SccProjectName>
     </SccProjectName>
     <SccLocalPath>
@@ -323,18 +323,10 @@
       <Project>{db34dfc9-7227-41fa-88aa-832dbf247811}</Project>
       <Name>Learun.Application.IM</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping\Learun.Application.Mapping.csproj">
-      <Project>{79f8e2f1-08e7-4336-93e0-512b39f9dd54}</Project>
-      <Name>Learun.Application.Mapping</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.OA\Learun.Application.OA.csproj">
       <Project>{5f3fdf79-a47e-4782-a090-dd0dc2d5cdc1}</Project>
       <Name>Learun.Application.OA</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
-      <Project>{56f9a112-fd96-4809-98f4-0d7c5de0711b}</Project>
-      <Name>Learun.Application.TwoDevelopment</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.WorkFlow\Learun.Application.WorkFlow.csproj">
       <Project>{88d8e99d-df26-4506-83c5-51e354818bef}</Project>
       <Name>Learun.Application.WorkFlow</Name>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SSOApi.cs

@@ -258,15 +258,14 @@ namespace Learun.Application.WebApi.Modules
                     //写入当前请求所登录的用户
                     var code = Util.CommonHelper.RndNum(9);
                     cache.Write(code, userinfo.account, TimeSpan.FromMinutes(10));
-
                     var url = perm_application.FUrl;
                     if (url.Contains("?"))
                     {
-                        url += "&appkey=" + Md5Helper.Encrypt(perm_application.FSecret, 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, perm_application.FSecret, false) + "&no=" + DESEncrypt.Encrypt(userinfo.enCode, perm_application.FSecret, false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(userinfo.loginMark) + "&t=" + DESEncrypt.Encrypt(userinfo.token);
+                        url += "&appkey=" + Md5Helper.Encrypt(Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&no=" + DESEncrypt.Encrypt(userinfo.IdentityCardNo, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&acc=" + DESEncrypt.Encrypt(userinfo.enCode, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(userinfo.loginMark) + "&t=" + DESEncrypt.Encrypt(userinfo.token);
                     }
                     else
                     {
-                        url += "?appkey=" + Md5Helper.Encrypt(perm_application.FSecret, 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, perm_application.FSecret, false) + "&no=" + DESEncrypt.Encrypt(userinfo.enCode, perm_application.FSecret, false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(userinfo.loginMark) + "&t=" + DESEncrypt.Encrypt(userinfo.token);
+                        url += "?appkey=" + Md5Helper.Encrypt(Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&no=" + DESEncrypt.Encrypt(userinfo.IdentityCardNo, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&acc=" + DESEncrypt.Encrypt(userinfo.enCode, Util.DESEncrypt.Decrypt(perm_application.FSecret, ConfigurationManager.AppSettings["SSOPublicSecret"]), false) + "&type=" + type + "&m=" + DESEncrypt.Encrypt(userinfo.loginMark) + "&t=" + DESEncrypt.Encrypt(userinfo.token);
                     }
                     return Success(new { FInterfaceUrl = url });
                 }

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

@@ -302,10 +302,6 @@
       <Project>{4d033392-bbb8-4b5f-9144-a42e7695847e}</Project>
       <Name>Learun.Application.Extention</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping\Learun.Application.Mapping.csproj">
-      <Project>{79f8e2f1-08e7-4336-93e0-512b39f9dd54}</Project>
-      <Name>Learun.Application.Mapping</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Learun.Framework.Module\Learun.Db\Learun.DataBase.EF.Oracle\Learun.DataBase.Oracle.csproj">
       <Project>{82069f3a-ab45-4f8b-b2bf-a36b14208f41}</Project>
       <Name>Learun.DataBase.Oracle</Name>

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

@@ -108,10 +108,6 @@
       <Project>{0cdd0dc8-74cf-4c71-923c-66204a8923d3}</Project>
       <Name>Learun.Application.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
-      <Project>{56F9A112-FD96-4809-98F4-0D7C5DE0711B}</Project>
-      <Name>Learun.Application.TwoDevelopment</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

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

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

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

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

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

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-12 09:46
+    /// 描 述：安全排查流程
+    /// </summary>
+    public class SafetyCheckMap : EntityTypeConfiguration<SafetyCheckEntity>
+    {
+        public SafetyCheckMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("SAFETYCHECK");
+            //主键
+            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

@@ -675,6 +675,9 @@
     <Compile Include="EducationalAdministration\VocationalProgramMap.cs" />
     <Compile Include="EducationalAdministration\WelfareRecordMap.cs" />
     <Compile Include="EducationalAdministration\UnionActivitiesMap.cs" />
+    <Compile Include="EducationalAdministration\FixedAssetsMap.cs" />
+    <Compile Include="EducationalAdministration\SafetyCheckMap.cs" />
+    <Compile Include="EducationalAdministration\OfficeEquipmentMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">
@@ -725,10 +728,6 @@
       <Project>{886b15b8-7b60-4872-85d1-7f47ac0951ef}</Project>
       <Name>Learun.Application.Report</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
-      <Project>{56f9a112-fd96-4809-98f4-0d7c5de0711b}</Project>
-      <Name>Learun.Application.TwoDevelopment</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Learun.Application.WorkFlow\Learun.Application.WorkFlow.csproj">
       <Project>{88d8e99d-df26-4506-83c5-51e354818bef}</Project>
       <Name>Learun.Application.WorkFlow</Name>

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

@@ -107,10 +107,6 @@
       <Project>{db34dfc9-7227-41fa-88aa-832dbf247811}</Project>
       <Name>Learun.Application.IM</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
-      <Project>{56F9A112-FD96-4809-98F4-0D7C5DE0711B}</Project>
-      <Name>Learun.Application.TwoDevelopment</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Learun.Application.WeChat\Learun.Application.WeChat.csproj">
       <Project>{36fa9414-767e-4806-9e45-2075216b1070}</Project>
       <Name>Learun.Application.WeChat</Name>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FixedAssets/FixedAssetsBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FixedAssets/FixedAssetsEntity.cs

@@ -0,0 +1,134 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-11 10:51
+    /// 描 述：固定资产登记管理
+    /// </summary>
+    public class FixedAssetsEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 资产名称
+        /// </summary>
+        [Column("ASSETSNAME")]
+        public string AssetsName { get; set; }
+        /// <summary>
+        /// 生产厂家
+        /// </summary>
+        [Column("MANUFACTURER")]
+        public string Manufacturer { get; set; }
+        /// <summary>
+        /// 品牌
+        /// </summary>
+        [Column("BRAND")]
+        public string Brand { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+        [Column("UNIT")]
+        public string Unit { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [Column("NUANTITY")]
+        public decimal? Nuantity { get; set; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [Column("PRICE")]
+        public decimal? Price { get; set; }
+        /// <summary>
+        /// 价值(元)
+        /// </summary>
+        [Column("COST")]
+        public decimal? Cost { get; set; }
+        /// <summary>
+        /// 存放地址
+        /// </summary>
+        [Column("ADDRESS")]
+        public string Address { get; set; }
+        /// <summary>
+        /// 验收人
+        /// </summary>
+        [Column("ACCEPTOR")]
+        public string Acceptor { get; set; }
+        /// <summary>
+        /// 使用管理人
+        /// </summary>
+        [Column("USEPEOPLE")]
+        public string UsePeople { get; set; }
+        /// <summary>
+        /// 登记人
+        /// </summary>
+        [Column("REGISTRANT")]
+        public string Registrant { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Column("STATUS")]
+        public int? Status { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [Column("CREATEUSER")]
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 编辑时间
+        /// </summary>
+        [Column("MODIFYDATE")]
+        public DateTime? ModifyDate { get; set; }
+        /// <summary>
+        /// 编辑用户
+        /// </summary>
+        [Column("MODIFYUSER")]
+        public string ModifyUser { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            this.CreateUser = LoginUserInfo.Get().userId;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+            this.ModifyDate = DateTime.Now;
+            this.ModifyUser = LoginUserInfo.Get().userId;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FixedAssets/FixedAssetsIBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FixedAssets/FixedAssetsService.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.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-11 10:51
+    /// 描 述：固定资产登记管理
+    /// </summary>
+    public class FixedAssetsService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<FixedAssetsEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*");
+                strSql.Append("  FROM FixedAssets t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["AssetsName"].IsEmpty())
+                {
+                    dp.Add("AssetsName", "%" + queryParam["AssetsName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.AssetsName Like @AssetsName ");
+                }
+                if (!queryParam["Manufacturer"].IsEmpty())
+                {
+                    dp.Add("Manufacturer", "%" + queryParam["Manufacturer"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Manufacturer Like @Manufacturer ");
+                }
+                if (!queryParam["Address"].IsEmpty())
+                {
+                    dp.Add("Address", "%" + queryParam["Address"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Address Like @Address ");
+                }
+                if (!queryParam["Brand"].IsEmpty())
+                {
+                    dp.Add("Brand", "%" + queryParam["Brand"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Brand Like @Brand ");
+                }
+                if (!queryParam["Acceptor"].IsEmpty())
+                {
+                    dp.Add("Acceptor",queryParam["Acceptor"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Acceptor = @Acceptor ");
+                }
+                if (!queryParam["UsePeople"].IsEmpty())
+                {
+                    dp.Add("UsePeople",queryParam["UsePeople"].ToString(), DbType.String);
+                    strSql.Append(" AND t.UsePeople = @UsePeople ");
+                }
+                if (!queryParam["Registrant"].IsEmpty())
+                {
+                    dp.Add("Registrant", queryParam["Registrant"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Registrant = @Registrant ");
+                }
+                
+                if (!queryParam["Status"].IsEmpty())
+                {
+                    dp.Add("Status",queryParam["Status"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Status = @Status ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<FixedAssetsEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取FixedAssets表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public FixedAssetsEntity GetFixedAssetsEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<FixedAssetsEntity>(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<FixedAssetsEntity>(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, FixedAssetsEntity 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/OfficeEquipment/OfficeEquipmentBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs

@@ -0,0 +1,90 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-18 10:42
+    /// 描 述：配置描述
+    /// </summary>
+    public class OfficeEquipmentEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        [Column("DEVICENAME")]
+        public string DeviceName { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        [Column("NAME")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 所属部门
+        /// </summary>
+        [Column("DEPARTMENT")]
+        public string Department { get; set; }
+        /// <summary>
+        /// 配置描述
+        /// </summary>
+        [Column("DESCRIPTION")]
+        public string Description { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [Column("CREATEUSER")]
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 编辑用户
+        /// </summary>
+        [Column("MODIFYUSER")]
+        public string ModifyUser { get; set; }
+        /// <summary>
+        /// 编辑时间
+        /// </summary>
+        [Column("MODIFYTIME")]
+        public DateTime? Modifytime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentIBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentService.cs

@@ -0,0 +1,156 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-18 10:42
+    /// 描 述：配置描述
+    /// </summary>
+    public class OfficeEquipmentService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<OfficeEquipmentEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT * ");
+                strSql.Append("  FROM OfficeEquipment t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Name"].IsEmpty())
+                {
+                    dp.Add("Name", queryParam["Name"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Name = @Name ");
+                }
+                if (!queryParam["DeviceName"].IsEmpty())
+                {
+                    dp.Add("DeviceName", "%" + queryParam["DeviceName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.DeviceName like @DeviceName ");
+                }
+                if (!queryParam["Department"].IsEmpty())
+                {
+                    dp.Add("Department", queryParam["Department"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Department = @Department ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<OfficeEquipmentEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取OfficeEquipment表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public OfficeEquipmentEntity GetOfficeEquipmentEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<OfficeEquipmentEntity>(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<OfficeEquipmentEntity>(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, OfficeEquipmentEntity 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/SafetyCheck/SafetyCheckBLL.cs

@@ -0,0 +1,144 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-12 09:46
+    /// 描 述：安全排查流程
+    /// </summary>
+    public class SafetyCheckBLL : SafetyCheckIBLL
+    {
+        private SafetyCheckService safetyCheckService = new SafetyCheckService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SafetyCheckEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return safetyCheckService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SafetyCheck表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SafetyCheckEntity GetSafetyCheckEntity(string keyValue)
+        {
+            try
+            {
+                return safetyCheckService.GetSafetyCheckEntity(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
+            {
+                safetyCheckService.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, SafetyCheckEntity entity)
+        {
+            try
+            {
+                safetyCheckService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public void SubmitEnity(string keyValue)
+        {
+            try
+            {
+                safetyCheckService.SubmitEnity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SafetyCheck/SafetyCheckEntity.cs

@@ -0,0 +1,120 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-12 09:46
+    /// 描 述：安全排查流程
+    /// </summary>
+    public class SafetyCheckEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        [Column("NAME")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 处室部门
+        /// </summary>
+        [Column("DEPARTMENT")]
+        public string Department { get; set; }
+        /// <summary>
+        /// 责任区域
+        /// </summary>
+        [Column("AREA")]
+        public string Area { get; set; }
+        /// <summary>
+        /// 排查时间
+        /// </summary>
+        [Column("CHECKTIME")]
+        public DateTime? CheckTime { get; set; }
+        /// <summary>
+        /// 发现的隐患问题
+        /// </summary>
+        [Column("QUESTION")]
+        public string Question { get; set; }
+        /// <summary>
+        /// 整改措施及建议等
+        /// </summary>
+        [Column("IDEA")]
+        public string idea { get; set; }
+        /// <summary>
+        /// 附件
+        /// </summary>
+        [Column("PATH")]
+        public string Path { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [Column("CREATEUSER")]
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 编辑用户
+        /// </summary>
+        [Column("MODIFYUSER")]
+        public string ModifyUser { get; set; }
+        /// <summary>
+        /// 编辑时间
+        /// </summary>
+        [Column("MODIFYTIME")]
+        public DateTime? Modifytime { get; set; }
+        /// <summary>
+        /// 0草稿 1提交/部门 2教务
+        /// </summary>
+        [Column("STATUS")]
+        public int? Status { get; set; }
+        /// <summary>
+        /// 部门建议
+        /// </summary>
+        [Column("DEPARTMENTREMARK")]
+        public string DepartmentRemark { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+            this.Status = 0;
+            this.CreateTime = DateTime.Now;
+            this.CreateUser = LoginUserInfo.Get().userId;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+            this.Modifytime = DateTime.Now;
+            this.ModifyUser = LoginUserInfo.Get().userId;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SafetyCheck/SafetyCheckIBLL.cs

@@ -0,0 +1,53 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-12 09:46
+    /// 描 述：安全排查流程
+    /// </summary>
+    public interface SafetyCheckIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SafetyCheckEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取SafetyCheck表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        SafetyCheckEntity GetSafetyCheckEntity(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, SafetyCheckEntity entity);
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue"></param>
+        void SubmitEnity(string keyValue);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SafetyCheck/SafetyCheckService.cs

@@ -0,0 +1,186 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2024-09-12 09:46
+    /// 描 述：安全排查流程
+    /// </summary>
+    public class SafetyCheckService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SafetyCheckEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT *");
+                strSql.Append("  FROM SafetyCheck t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Name"].IsEmpty())
+                {
+                    dp.Add("Name", queryParam["Name"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Name = @Name ");
+                }
+                if (!queryParam["Department"].IsEmpty())
+                {
+                    dp.Add("Department", queryParam["Department"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Department = @Department ");
+                }
+                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.CheckTime >= @startTime AND t.CheckTime <= @endTime ) ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<SafetyCheckEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取SafetyCheck表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SafetyCheckEntity GetSafetyCheckEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<SafetyCheckEntity>(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<SafetyCheckEntity>(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, SafetyCheckEntity 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>
+        /// <param name="status"></param>
+        public void SubmitEnity(string keyValue)
+        {
+            try
+            {
+                var entity = BaseRepository("CollegeMIS").FindEntity<SafetyCheckEntity>(keyValue);
+                if (entity.Status != null)
+                {
+                    entity.Status = 1;
+                    entity.ModifyUser = LoginUserInfo.Get().userId;
+                    entity.Modifytime = DateTime.Now;
+                }
+                BaseRepository("CollegeMIS").Update(entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+
+    }
+}

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

@@ -2120,6 +2120,18 @@
     <Compile Include="EducationalAdministration\UnionActivities\UnionActivitiesService.cs" />
     <Compile Include="EducationalAdministration\UnionActivities\UnionActivitiesBLL.cs" />
     <Compile Include="EducationalAdministration\UnionActivities\UnionActivitiesIBLL.cs" />
+    <Compile Include="EducationalAdministration\FixedAssets\FixedAssetsEntity.cs" />
+    <Compile Include="EducationalAdministration\FixedAssets\FixedAssetsService.cs" />
+    <Compile Include="EducationalAdministration\FixedAssets\FixedAssetsBLL.cs" />
+    <Compile Include="EducationalAdministration\FixedAssets\FixedAssetsIBLL.cs" />
+    <Compile Include="EducationalAdministration\SafetyCheck\SafetyCheckEntity.cs" />
+    <Compile Include="EducationalAdministration\SafetyCheck\SafetyCheckService.cs" />
+    <Compile Include="EducationalAdministration\SafetyCheck\SafetyCheckBLL.cs" />
+    <Compile Include="EducationalAdministration\SafetyCheck\SafetyCheckIBLL.cs" />
+    <Compile Include="EducationalAdministration\OfficeEquipment\OfficeEquipmentEntity.cs" />
+    <Compile Include="EducationalAdministration\OfficeEquipment\OfficeEquipmentService.cs" />
+    <Compile Include="EducationalAdministration\OfficeEquipment\OfficeEquipmentBLL.cs" />
+    <Compile Include="EducationalAdministration\OfficeEquipment\OfficeEquipmentIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

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

@@ -250,10 +250,6 @@
       <Project>{5F3FDF79-A47E-4782-A090-DD0DC2D5CDC1}</Project>
       <Name>Learun.Application.OA</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
-      <Project>{56f9a112-fd96-4809-98f4-0d7c5de0711b}</Project>
-      <Name>Learun.Application.TwoDevelopment</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Analyzer Include="..\..\..\packages\Microsoft.DependencyValidation.Analyzers.0.10.0\analyzers\dotnet\cs\Microsoft.DependencyValidation.Analyzers.resources.dll" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Cache/Learun.Cache.Base/CacheId.cs

@@ -138,6 +138,7 @@
         #endregion
 
         #region  8号库
+        public static int usernostu { get { return 8; } }
         #endregion
 
         #region  9号库

Learun.Framework.Ultimate V7/Quanjiang.DigitalScholl.DataSync/Quanjiang.DigitalScholl.DataSync.csproj

@@ -163,14 +163,6 @@
       <Project>{10BAA80B-16F5-4514-902D-F9F7FA608BDD}</Project>
       <Name>Learun.Application.Excel</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping\Learun.Application.Mapping.csproj">
-      <Project>{79f8e2f1-08e7-4336-93e0-512b39f9dd54}</Project>
-      <Name>Learun.Application.Mapping</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment\Learun.Application.TwoDevelopment.csproj">
-      <Project>{56F9A112-FD96-4809-98F4-0D7C5DE0711B}</Project>
-      <Name>Learun.Application.TwoDevelopment</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Learun.Framework.Module\Learun.Application.Module\Learun.Application.WorkFlow\Learun.Application.WorkFlow.csproj">
       <Project>{88D8E99D-DF26-4506-83C5-51E354818BEF}</Project>
       <Name>Learun.Application.WorkFlow</Name>