diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostBLL.cs
index aaa9ee915..a7150a410 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostBLL.cs	
@@ -3,6 +3,8 @@ using Learun.Cache.Factory;
 using Learun.Util;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+
 namespace Learun.Application.Organization
 {
     /// <summary>
@@ -515,6 +517,24 @@ namespace Learun.Application.Organization
             return res;
         }
 
+        public List<PostEntity> GetAllList()
+        {
+            try
+            {
+                return postService.GetAllList().ToList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
     }
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostIBLL.cs
index 84f4ffa02..306e04593 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostIBLL.cs	
@@ -94,5 +94,8 @@ namespace Learun.Application.Organization
         /// <param name="level">级数</param>
         /// <returns></returns>
         List<string> GetDownIdList(string strPostIds, int level);
+
+        List<PostEntity> GetAllList();
+
     }
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostService.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostService.cs
index 2b35797b9..4ae6a033d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Post/PostService.cs	
@@ -235,5 +235,33 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+
+        /// <summary>
+        /// 获取部门列表信息(根据公司Id)
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<PostEntity> GetAllList()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM LR_BASE_POST t WHERE t.F_DeleteMark = 0 ");
+                return this.BaseRepository().FindList<PostEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
     }
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs
index e2293df0e..69cc88833 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs	
@@ -1111,15 +1111,15 @@ namespace Learun.Application.Organization
                     else
                     {
                         string dbPassword = Md5Helper.Encrypt(DESEncrypt.Encrypt(password.ToLower(), userEntity.F_Secretkey).ToLower(), 32).ToLower();
-                        string phone = Md5Helper.Encrypt(userEntity.F_Mobile, 32).ToLower();
+                        //string phone = Md5Helper.Encrypt(userEntity.F_Mobile, 32).ToLower();
                         if (dbPassword == userEntity.F_Password)
                         {
                             userEntity.LoginOk = true;
                         }
-                        else if (phone == password)
-                        {
-                            userEntity.LoginOk = true;
-                        }
+                        //else if (phone == password)
+                        //{
+                        //    userEntity.LoginOk = true;
+                        //}
                         else
                         {
                             userEntity.LoginMsg = "密码和账户名不匹配!";
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuGraduateStatisticController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuGraduateStatisticController.cs
new file mode 100644
index 000000000..4f16a604e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuGraduateStatisticController.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-29 16:33
+    /// 描 述：毕业信息统计
+    /// </summary>
+    public class StuGraduateStatisticController : MvcControllerBase
+    {
+        private StuGraduateStatisticIBLL stuGraduateStatisticIBLL = new StuGraduateStatisticBLL();
+
+        #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 = stuGraduateStatisticIBLL.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 StuGraduateStatisticData = stuGraduateStatisticIBLL.GetStuGraduateStatisticEntity( keyValue );
+            var jsonData = new {
+                StuGraduateStatistic = StuGraduateStatisticData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuGraduateStatisticIBLL.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)
+        {
+            StuGraduateStatisticEntity entity = strEntity.ToObject<StuGraduateStatisticEntity>();
+            stuGraduateStatisticIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs
index 952067fec..70567beae 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs	
@@ -116,7 +116,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
             var loginUserInfo = LoginUserInfo.Get();
             entity.CreateTime = DateTime.Now;
-            entity.CreateUserId = loginUserInfo.account;
+            entity.CreateUserId = loginUserInfo.userId;
             entity.CheckStatus = 0;
 
             stuInfoBasicChangeIBLL.SaveEntity(keyValue, entity);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TrainEquipmentManageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TrainEquipmentManageController.cs
new file mode 100644
index 000000000..abf406b47
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TrainEquipmentManageController.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 10:49
+    /// 描 述：实训设备管理
+    /// </summary>
+    public class TrainEquipmentManageController : MvcControllerBase
+    {
+        private TrainEquipmentManageIBLL trainEquipmentManageIBLL = new TrainEquipmentManageBLL();
+
+        #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 = trainEquipmentManageIBLL.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 TrainEquipmentManageData = trainEquipmentManageIBLL.GetTrainEquipmentManageEntity( keyValue );
+            var jsonData = new {
+                TrainEquipmentManage = TrainEquipmentManageData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            trainEquipmentManageIBLL.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)
+        {
+            TrainEquipmentManageEntity entity = strEntity.ToObject<TrainEquipmentManageEntity>();
+            trainEquipmentManageIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Statistics/TeacherWorkload.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Statistics/TeacherWorkload.js
index 2f3b32d10..e7f78bba3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Statistics/TeacherWorkload.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Statistics/TeacherWorkload.js	
@@ -48,7 +48,11 @@ var bootstrap = function ($, learun) {
                     { label: '教师编号', name: 'EmpNo', width: 100, align: "left" },
                     { label: '总课时', name: 'lessoncount', width: 90, align: "left" },
                     { label: '系数', name: 'coefficient', width: 100, align: "left" },
-                    { label: "工作量", name: "lessoncount", width: 100, align: "left" },
+                    {
+                        label: "工作量", name: "lessoncount2", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            return callback(row.lessoncount);
+                        }
+                    },
                 ],
                 mainId: 'EmpNo',
             });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml
index 48982f154..44eaca017 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.cshtml	
@@ -7,24 +7,23 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
+                                    <input id="StuNo" type="text" class="form-control"/>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">姓名</div>
-                                    <input id="StuName" type="text" class="form-control" />
+                                    <input id="StuName" type="text" class="form-control"/>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">奖励名称</div>
-                                    <input id="EncourgeName" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">奖励日期</div>
-                                    <input id="EncourgeDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd' })" />
+                                    <input id="EncourgeName" type="text" class="form-control"/>
                                 </div>
                             </div>
                         </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js
index 8b5acb4bb..895fc8c16 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/Index.js	
@@ -7,15 +7,44 @@
 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: '3',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 300, 400);
+            }, 200, 400);
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -68,12 +97,12 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left"},
-                    { label: "姓名", name: "StuName", width: 100, align: "left"},
-                    { label: "奖励名称", name: "EncourgeName", width: 100, align: "left"},
-                    { label: "奖励原因", name: "Reason", width: 100, align: "left"},
-                    { label: "奖励金额", name: "Fee", width: 100, align: "left"},
-                    { label: "奖励日期", name: "EncourgeDate", width: 100, align: "left"},
+                    { label: "学号", name: "StuNo", width: 200, align: "left"},
+                    { label: "姓名", name: "StuName", width: 200, align: "left"},
+                    { label: "奖励名称", name: "EncourgeName", width: 200, align: "left"},
+                    { label: "奖励原因", name: "Reason", width: 200, align: "left"},
+                    { label: "奖励金额", name: "Fee", width: 200, align: "left"},
+                    { label: "奖励日期", name: "EncourgeDate", width: 200, align: "left"},
                 ],
                 mainId:'ID',
                 isPage: true
@@ -82,6 +111,8 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Form.cshtml
new file mode 100644
index 000000000..1872b36fc
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Form.cshtml	
@@ -0,0 +1,79 @@
+@{
+    ViewBag.Title = "毕业信息统计";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">学生编码<font face="宋体">*</font></div>
+        <input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">性别<font face="宋体">*</font></div>
+        <div id="GenderNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">身份证号</div>
+        <input id="IdentityCardNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">学籍号</div>
+        <input id="StuCode" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <input id="ProvinceCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">学制<font face="宋体">*</font></div>
+        <div id="EduSystem" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
+        <input id="mobile" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">毕业去向<font face="宋体">*</font></div>
+        <div id="GraduateGo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">升入高校名称</div>
+        <input id="EnterUniversityName" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">大学层次</div>
+        <div id="UniversityLevel"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">就业单位名称</div>
+        <input id="EmployerName" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">就业单位所属省</div>
+        <div id="EmployerProvince"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">就业单位所属市</div>
+        <div id="EmployerCity"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">就业单位所属县</div>
+        <div id="EmployerCountry"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuGraduateStatistic">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuGraduateStatistic/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Form.js
new file mode 100644
index 000000000..43837343e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Form.js	
@@ -0,0 +1,153 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2022-08-29 16:34 
+ * 描  述：毕业信息统计 
+ */
+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 () {
+            $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#GraduateGo').lrDataItemSelect({ code: 'GraduateGo' });
+            $('#UniversityLevel').lrDataItemSelect({ code: 'GraduateLevel' });
+            $('#EmployerProvince').lrDataSourceSelect({
+                code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
+                select: function (item) {
+                    if (item) {
+                        $('#EmployerCity').lrselectRefresh({
+                            url: top.$.rootUrl + "/DIC_CITY/GetListByProvinceCode",
+                            param: { ProvinceCode: item.pcode },
+                            value: 'CCODE',
+                            text: 'CNAME'
+                        });
+                    } else {
+                        $('#EmployerCity').lrselectRefresh({
+                            url: "",
+                            data: []
+                        });
+                    }
+                    $('#EmployerCountry').lrselectRefresh({
+                        url: "",
+                        data: []
+                    });
+                }
+            });
+            $('#EmployerCity').lrselect({
+                value: 'ccode', text: 'cname',
+                select: function (item) {
+                    if (item) {
+                        $('#EmployerCountry').lrselectRefresh({
+                            url: top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode",
+                            param: { cityCode: item.CCODE },
+                            value: 'ACODE',
+                            text: 'ANAME'
+                        });
+                    }
+                }
+            });
+            $('#EmployerCountry').lrselect({
+                value: 'ACODE', text: 'ANAME'
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuGraduateStatistic/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/StuGraduateStatistic/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调 
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+} 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Index.cshtml
new file mode 100644
index 000000000..047cd991f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Index.cshtml	
@@ -0,0 +1,56 @@
+@{
+    ViewBag.Title = "毕业信息统计";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学生编码</div>
+                                    <input id="StuNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">毕业去向</div>
+                                    <div id="GraduateGo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">大学层次</div>
+                                    <div id="UniversityLevel"></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>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuGraduateStatistic/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Index.js
new file mode 100644
index 000000000..0360c5e2e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuGraduateStatistic/Index.js	
@@ -0,0 +1,309 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2022-08-29 16:34 
+ * 描  述：毕业信息统计 
+ */
+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);
+            }, 300, 400);
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#GraduateGo').lrDataItemSelect({ code: 'GraduateGo' });
+            $('#UniversityLevel').lrDataItemSelect({ code: 'GraduateLevel' });
+            // 刷新 
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增 
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuGraduateStatistic/Form',
+                    width: 800,
+                    height: 600,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑 
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuGraduateStatistic/Form?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除 
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuGraduateStatistic/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表 
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuGraduateStatistic/GetPageList',
+                headData: [
+                    { label: "学生编码", name: "StuNo", width: 100, align: "left" },
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "性别", name: "GenderNo", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
+                    { label: "学籍号", name: "StuCode", width: 100, align: "left" },
+                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    {
+                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学制", name: "EduSystem", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EduSystem',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "联系电话", name: "mobile", width: 100, align: "left" },
+                    {
+                        label: "毕业去向", name: "GraduateGo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'GraduateGo',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "升入高校名称", name: "EnterUniversityName", width: 100, align: "left" },
+                    {
+                        label: "大学层次", name: "UniversityLevel", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'UniversityLevel',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "就业单位名称", name: "EmployerName", width: 100, align: "left" },
+                    {
+                        label: "就业单位所属省", name: "EmployerProvince", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
+                                key: value,
+                                keyId: 'pcode',
+                                callback: function (_data) {
+                                    callback(_data['pname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "就业单位所属市", name: "EmployerCity", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                key: value,
+                                keyId: 'ccode',
+                                callback: function (_data) {
+                                    callback(_data['cname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "就业单位所属县（区）", name: "EmployerCountry", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
+                                key: value,
+                                keyId: 'acode',
+                                callback: function (_data) {
+                                    callback(_data['aname']);
+                                }
+                            });
+                        }
+                    },
+                    { 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();
+} 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml
index a0018022b..ee33a818c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml	
@@ -38,10 +38,43 @@
                                     <div class="lr-form-item-title">民族</div>
                                     <div id="NationalityNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">身份证号</div>
                                     <input id="IdentityCardNo" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="CheckMark"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学生编号</div>
+                                    <input id="StuNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学籍号</div>
+                                    <input id="StuCode" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">政治面貌</div>
+                                    <div id="PartyFaceNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学制</div>
+                                    <div id="EduSystem"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">身体状态</div>
+                                    <div id="HealthStatus"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学习形式</div>
+                                    <div id="StudyModality"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否有照片</div>
+                                    <div id="Photo"></div>
+                                </div>
+
                             </div>
                         </div>
                     </div>
@@ -62,7 +95,7 @@
                         <a id="checkall" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;审核全部</a>
                         <a id="lr_generate" class="btn btn-default"><i class="fa fa-linode"></i>&nbsp;生成帐号</a>
                         <a id="lr_update" class="btn btn-default"><i class="fa fa-braille"></i>&nbsp;更新帐号</a>
-                        @*<a id="lr_synPhoto" class="btn btn-default"><i class="fa fa-braille"></i>&nbsp;同步照片</a>*@
+                        <a id="lr_synPhoto" class="btn btn-default"><i class="fa fa-braille"></i>&nbsp;同步照片</a>
                         <a id="lr_searchChange" class="btn btn-default"><i class="fa fa-search"></i>&nbsp;查看异动</a>
                         <a id="lr_photo" class="btn btn-default"><i class="fa fa-search"></i>&nbsp;拍照</a>
                         <a id="lr_printInfo" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;学生简历表</a>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index 2575064cb..957ab2b27 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
@@ -10,7 +10,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 300, 400);
+            }, 450, 400);
             $('#DeptNo').lrselect({
                 allowSearch: true,
                 value: "deptno",
@@ -70,6 +70,13 @@ var bootstrap = function ($, learun) {
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });
+            $('#CheckMark').lrselect({ data: [{ id: '1', text: '已审核' }, { id: '0', text: '未审核' }] });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' });
+            $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' });
+            $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
+            $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' });
+            $('#Photo').lrselect({ data: [{ id: '1', text: '是' }, { id: '0', text: '否' }] });
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml
index d0b4c7d6e..79f5acba6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml	
@@ -29,11 +29,11 @@
     <div class="col-xs-12 text-center">学籍异动前信息</div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo"  readonly="readonly"></div>
+        <div id="DeptNo" readonly="readonly"></div>
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo"  readonly="readonly"></div>
+        <div id="MajorNo" readonly="readonly"></div>
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
@@ -47,20 +47,20 @@
         </div>
         <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="新专业">新专业</div>
-            <div id="NewMajorNo" class="contentDiv "></div>
+            <div id="NewMajorNo" class="contentDiv zhuanzhuanye"></div>
         </div>
         <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="新班级">新班级</div>
             <div id="NewClassNo" class="contentDiv zhuanban"></div>
         </div>
     </div>
-    <div class="col-xs-12 text-center">异动说明</div>
     <div class="NewSchool" style="display:none;">
         <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="转出学校">转出学校</div>
             <input id="OutSchool" type="text" class="form-control" />
         </div>
     </div>
+    <div class="col-xs-12 text-center">异动说明</div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">备注</div>
         <textarea id="StuChangeRemark" class="form-control" style="height:50px;"></textarea>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js
index ac6ce31c1..6dfe0411e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js	
@@ -32,37 +32,54 @@ var bootstrap = function ($, learun) {
                         $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $(".NewContainer").show();
+                        $('#OutSchool').removeAttr("isvalid");
+                        $('#OutSchool').removeAttr("checkexpession");
+                        $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title'));
+                        $('#OutSchool').val('');
                         $(".NewSchool").hide();
-                        if (item.id === "01" ) { //留级
-                            $(".NewSchool").hide();
+                        if (item.id === "01" || item.id === "07") { //留级、转班
                             $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
                             $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
-                            $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
-                            $('#OutSchool').val('');
+                            var timer1 = setInterval(function () {
+                                if ($("#NewDeptNo").lrselectGet()) {
+                                    $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
+                                    console.log("系部赋值后，在赋值专业：" + $("#NewMajorNo").lrselectGet());
+                                    clearInterval(timer1);
+                                }
+                            }, 1000);
                         } else if (item.id === "02") {//转校
-                            $(".NewSchool").show();
                             $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                             $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                             $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $(".NewSchool").find('.OutSchool').attr("isvalid", 'yes');
-                            $(".NewSchool").find('.OutSchool').attr("checkexpession");
-                            $(".NewSchool").find('.OutSchool').attr('readonly');
                             $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                             $(".NewContainer").hide();
+                            $('#OutSchool').attr("isvalid", 'yes');
+                            $('#OutSchool').attr("checkexpession", "NotNull");
+                            $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
+                            $(".NewSchool").show();
                         } else if (item.id === "03") { //复学
-                            $(".NewSchool").hide();
-                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $(".NewSchool").find('.OutSchool').attr("isvalid", "Null");
-                            $('#OutSchool').val('');
-                        } else if (item.id === "04") { //转入
-                            $(".NewSchool").hide();
-                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $(".NewSchool").find('.OutSchool').attr("isvalid", "Null");
-                            $('#OutSchool').val('');
+                            $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
+                            var timer2 = setInterval(function () {
+                                if ($("#NewDeptNo").lrselectGet()) {
+                                    $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
+                                    console.log("系部赋值后，在赋值专业：" + $("#NewMajorNo").lrselectGet());
+                                    clearInterval(timer2);
+                                }
+                            }, 1000);
+                            var timer3 = setInterval(function () {
+                                if ($("#NewMajorNo").lrselectGet()) {
+                                    $("#NewClassNo").lrselectSet($("#ClassNo").lrselectGet());
+                                    clearInterval(timer3);
+                                }
+                            }, 1000);
+                        } else if (item.id === "04") { //转入/进
+                            learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！");
+                            $("#StuNo").val("");
+                            $("#StuName").val("");
                         }
-                        else { //退学、休学、
+                        else if (item.id === "05" || item.id === "06") { //退学、休学、
                             $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                             $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                             $(".NewContainer").find('.contentDiv').removeAttr('readonly');
@@ -70,8 +87,11 @@ var bootstrap = function ($, learun) {
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                             $(".NewContainer").hide();
-                            $(".NewSchool").hide();
-                            $('#OutSchool').val('');
+                        }
+                        else if (item.id === "08") { //转专业、
+                            $(".NewContainer").find('.contentDiv.zhuanzhuanye').removeAttr('readonly');
+                            $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
+                            $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
                         }
 
                     }
@@ -83,6 +103,7 @@ var bootstrap = function ($, learun) {
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#NewDeptNo').lrDataSourceSelect({
                 code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    //console.log("选择的系部为：" + JSON.stringify(item));
                     if (item != null && item != undefined) {
                         $('#NewMajorNo').lrselectRefresh({
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -98,6 +119,7 @@ var bootstrap = function ($, learun) {
             });
             $('#NewMajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (item) {
+                    //console.log("选择的专业为：" + JSON.stringify(item));
                     if (item != null && item != undefined) {
                         $('#NewClassNo').lrselectRefresh({
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
@@ -171,29 +193,33 @@ var bootstrap = function ($, learun) {
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $(".NewContainer").show();
-                            if (data[id].StuChangeType == "01") { //降级、转班
+                            $('#OutSchool').removeAttr("isvalid");
+                            $('#OutSchool').removeAttr("checkexpession");
+                            $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title'));
+                            $('#OutSchool').val('');
+                            $(".NewSchool").hide();
+                            if (data[id].StuChangeType == "01" || data[id].StuChangeType == "07") { //留级、转班
                                 $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
-                                $(".NewSchool").hide();
-                                $('#OutSchool').val('');
                             }
                             else if (data[id].StuChangeType == "02") {//转校
-                                $(".NewSchool").show();
                                 $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                                 $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                                 $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $(".NewSchool").find('.OutSchool').attr("isvalid");
-                                $(".NewSchool").find('.OutSchool').attr("checkexpession");
-                                $(".NewSchool").find('.OutSchool').attr('readonly');
                                 $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
                                 $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                                 $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                                 $(".NewContainer").hide();
-                            } else if (data[id].StuChangeType == "03") { //转专业
+                                $('#OutSchool').attr("isvalid", 'yes');
+                                $('#OutSchool').attr("checkexpession", "NotNull");
+                                $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
+                                $(".NewSchool").show();
+                            } else if (data[id].StuChangeType == "03") { //复学
                                 $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $(".NewSchool").hide();
-                                $('#OutSchool').val('');
-                            }
-                            else {    //退学、休学、转校
+                            } else if (data[id].StuChangeType == "04") { //转入/进
+                                learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！");
+                                $("#StuNo").val("");
+                                $("#StuName").val("");
+                            } else if (data[id].StuChangeType == "05" || data[id].StuChangeType == "06") { //退学、休学、
                                 $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                                 $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                                 $(".NewContainer").find('.contentDiv').removeAttr('readonly');
@@ -201,8 +227,10 @@ var bootstrap = function ($, learun) {
                                 $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                                 $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                                 $(".NewContainer").hide();
-                                $(".NewSchool").hide();
-                                $('#OutSchool').val('');
+                            }
+                            else if (data[id].StuChangeType == "08") {    //转专业、
+                                $(".NewContainer").find('.contentDiv.zhuanzhuanye').removeAttr('readonly');
+                                $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
                             }
                         }
                     }
@@ -212,6 +240,7 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     acceptClick = function (callBack) {
+        //console.log($('body').lrGetFormData());
         if (!$('body').lrValidform()) {
             return false;
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js
index bca4b9019..76ceab8f3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js	
@@ -218,11 +218,11 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "转出学校", name: "OutSchool", width: 200, align: "left" },
                     { label: "创建时间", name: "CreateTime", width: 130, align: "left" },
                     { label: "创建用户", name: "CreateUserId", width: 100, align: "left" },
                     { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
                     { label: "审核用户", name: "CheckUserId", width: 100, align: "left" },
-                    { label: "转出学校", name: "OutSchool", width: 200, align: "left" },
                     { label: "备注", name: "StuChangeRemark", width: 200, align: "left" },
                     {
                         label: "审核状态", name: "CheckStatus", width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml
index 53741d3a1..84f632f14 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml	
@@ -2,6 +2,9 @@
     ViewBag.Title = "学籍信息异动";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<script>    
+ var stuId = "@ViewBag.keyValue";
+</script>
 <div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
@@ -14,16 +17,20 @@
                         <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 class="lr-form-item-title">异动类型</div>
+                                    <div id="StuChangeType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">修改属性</div>
                                     <input id="FieldName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学生主键</div>
-                                    <input id="StuID" value="@ViewBag.keyValue" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">学生姓名</div>
+                                    <div id="StuID"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">修改人</div>
-                                    <input id="UpdateBy" type="text" class="form-control" />
+                                    <div id="UpdateBy"></div>
                                 </div>
                             </div>
                         </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js
index 7ff4fcd7a..68171d647 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js	
@@ -45,6 +45,10 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
+            $('#StuChangeType').lrDataItemSelect({ code: 'StuChangeType' });
+            $('#StuID').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' });
+            $('#UpdateBy').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' });
+            
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -98,9 +102,35 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_ChangeLog/GetPageList',
                 headData: [
+                    {
+                        label: "异动类型", name: "StuChangeType", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuChangeType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "异动备注", name: "StuChangeRemark", width: 250, align: "left" },
+                    {
+                        label: "学生姓名", name: "StuID", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
+                                key: value,
+                                keyId: 'stuid',
+                                callback: function (_data) {
+                                    callback(_data['stuname']);
+                                }
+                            });
+                        }
+                    },
                     { label: "修改属性", name: "FieldName", width: 200, align: "left" },
                     { label: "修改前", name: "BeforeChange", width: 200, align: "left" },
                     { label: "修改后", name: "AfterChange", width: 200, align: "left" },
@@ -110,7 +140,7 @@ var bootstrap = function ($, learun) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
-                                keyId: 'f_account',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
                                     callback(_data['f_realname']);
                                 }
@@ -119,7 +149,6 @@ var bootstrap = function ($, learun) {
 
                     },
                     { label: "修改时间", name: "UpdateTime", width: 200, align: "left" },
-                    { label: "数据主键", name: "StuID", width: 250, align: "left" },
                 ],
                 mainId: 'ID',
                 isPage: true,
@@ -130,9 +159,18 @@ var bootstrap = function ($, learun) {
         search: function (param) {
 
             param = param || {};
-            if ($("#StuID").val() != "" && $("#StuID").length > 0) {
-                param.StuID = $("#StuID").val();
+
+            //赋值
+            if (stuId != "" && stuId != undefined && stuId != null) {
+                $('#StuID').lrselectSet(stuId);
+                $('#StuID').attr('readonly', 'readonly');
+                $('#StuID').parent().attr('display','none');
+                param.StuID = stuId;
+            } else {
+                $('#StuID').removeAttr('readonly');
+                $('#StuID').parent().attr('display', 'block');
             }
+
             param.StartTime = startTime;
             param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml
index 67c53874f..bc90ff2f4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml	
@@ -7,6 +7,9 @@
         <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">
@@ -22,10 +25,6 @@
                                     <div class="lr-form-item-title">处分名称</div>
                                     <div id="PunishNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">处分日期</div>
-                                    <input id="PunishDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd' })" />
-                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js
index 9562bac1f..7b6fd23d4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js	
@@ -7,15 +7,44 @@
 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: '3',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 300, 400);
+            }, 200, 400);
             $('#PunishNo').lrDataItemSelect({ code: 'Punishment' });
             
             // 刷新
@@ -137,6 +166,8 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml
new file mode 100644
index 000000000..7e8bdcf76
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.cshtml	
@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "实训设备管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
+        <div class="lr-form-item-title">专业部<font face="宋体">*</font></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
+        <div class="lr-form-item-title">实训室名称<font face="宋体">*</font></div>
+        <input id="TrainName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
+        <div class="lr-form-item-title">设备名称<font face="宋体">*</font></div>
+        <input id="EquipmentName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
+        <div class="lr-form-item-title">设备型号</div>
+        <input id="EquipmentModel" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
+        <div class="lr-form-item-title">新增</div>
+        <input id="AddNum" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
+        <div class="lr-form-item-title">损耗</div>
+        <input id="LossNum" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
+        <div class="lr-form-item-title">现存</div>
+        <input id="ExistNum" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TrainEquipmentManage" >
+        <div class="lr-form-item-title">设备金额</div>
+        <input id="EquipmentMoney" type="text" class="form-control"  />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js
new file mode 100644
index 000000000..a856da8c8
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Form.js	
@@ -0,0 +1,51 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-30 10:49
+ * 描  述：实训设备管理
+ */
+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 () {
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TrainEquipmentManage/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/TrainEquipmentManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.cshtml
new file mode 100644
index 000000000..6381a04bd
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.cshtml	
@@ -0,0 +1,44 @@
+@{
+    ViewBag.Title = "实训设备管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">实训室名称</div>
+                                    <input id="TrainName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">设备名称</div>
+                                    <input id="EquipmentName" 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>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.js
new file mode 100644
index 000000000..c79edca40
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TrainEquipmentManage/Index.js	
@@ -0,0 +1,105 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-30 10:49
+ * 描  述：实训设备管理
+ */
+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);
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/TrainEquipmentManage/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/TrainEquipmentManage/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/TrainEquipmentManage/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/TrainEquipmentManage/GetPageList',
+                headData: [
+                    { label: "专业部", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                 key: value,
+                                 keyId: 'majorno',
+                                 callback: function (_data) {
+                                     callback(_data['majorname']);
+                                 }
+                             });
+                        }},
+                    { label: "实训室名称", name: "TrainName", width: 100, align: "left"},
+                    { label: "设备名称", name: "EquipmentName", width: 100, align: "left"},
+                    { label: "设备型号", name: "EquipmentModel", width: 100, align: "left"},
+                    { label: "新增", name: "AddNum", width: 100, align: "left"},
+                    { label: "损耗", name: "LossNum", width: 100, align: "left"},
+                    { label: "现存", name: "ExistNum", width: 100, align: "left"},
+                    { label: "设备金额", name: "EquipmentMoney", 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();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml
index 6a9bc7f27..e4844f218 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml	
@@ -3,25 +3,25 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="APStuHealthRecords" >
-        <div class="lr-form-item-title">系</div>
-        <div id="DeptNo"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="APStuHealthRecords">
+        <div class="lr-form-item-title">系<font face="宋体">*</font></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="APStuHealthRecords" >
-        <div class="lr-form-item-title">专业</div>
-        <div id="MajorNo"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="APStuHealthRecords">
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="APStuHealthRecords" >
-        <div class="lr-form-item-title">班级</div>
-        <div id="ClassNo"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="APStuHealthRecords">
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="APStuHealthRecords" >
-        <div class="lr-form-item-title">学生</div>
-        <div id="Stuno"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="APStuHealthRecords">
+        <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
+        <div id="Stuno" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="APStuHealthRecords" >
+    <div class="col-xs-12 lr-form-item" data-table="APStuHealthRecords">
         <div class="lr-form-item-title">描述</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.cshtml
index 529532099..3affe03d1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.cshtml	
@@ -4,12 +4,12 @@
 }
 <div class="lr-form-wrap">
     <div class="col-xs-12 lr-form-item" data-table="MSRIntentionManagement">
-        <div class="lr-form-item-title">联系方式</div>
-        <input id="Mobile" type="text" class="form-control" />
+        <div class="lr-form-item-title">联系方式<font face="宋体">*</font></div>
+        <input id="Mobile" type="text" class="form-control" isvalid="yes" checkexpession="Mobile"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="MSRIntentionManagement">
-        <div class="lr-form-item-title">年龄</div>
-        <input id="Age" type="text" class="form-control" />
+        <div class="lr-form-item-title">年龄<font face="宋体">*</font></div>
+        <input id="Age" type="number" class="form-control" isvalid="yes" checkexpession="NotNull"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="MSRIntentionManagement">
         <div class="lr-form-item-title">身高</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.cshtml
index ab4f3d723..4b454669e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.cshtml	
@@ -4,8 +4,8 @@
 }
 <div class="lr-form-wrap">
     <div class="col-xs-12 lr-form-item" data-table="MSRMilitaryRecord">
-        <div class="lr-form-item-title">参军记录</div>
-        <input id="Record" type="text" class="form-control" />
+        <div class="lr-form-item-title">参军记录<font face="宋体">*</font></div>
+        <input id="Record" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="MSRMilitaryRecord">
         <div class="lr-form-item-title">备注</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassPatrolController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassPatrolController.cs
new file mode 100644
index 000000000..c36aa4d20
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassPatrolController.cs	
@@ -0,0 +1,127 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public class ClassPatrolController : MvcControllerBase
+    {
+        private ClassPatrolIBLL classPatrolIBLL = new ClassPatrolBLL();
+
+        #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 = classPatrolIBLL.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 ClassPatrolData = classPatrolIBLL.GetClassPatrolEntity( keyValue );
+            var jsonData = new {
+                ClassPatrol = ClassPatrolData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            classPatrolIBLL.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)
+        {
+            ClassPatrolEntity entity = strEntity.ToObject<ClassPatrolEntity>();
+            var loginUserInfo = LoginUserInfo.Get();
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.CreateUserId = loginUserInfo.userId;
+                entity.CreateTime = DateTime.Now;
+            }
+            else
+            {
+                entity.ModifyUserId = loginUserInfo.userId;
+                entity.ModifyTime = DateTime.Now;
+            }
+            classPatrolIBLL.SaveEntity(keyValue,entity);
+           
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EvaluateTeachLearnController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EvaluateTeachLearnController.cs
new file mode 100644
index 000000000..b5e05a0a1
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EvaluateTeachLearnController.cs	
@@ -0,0 +1,129 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-24 14:38
+    /// 描 述：评教评学
+    /// </summary>
+    public class EvaluateTeachLearnController : MvcControllerBase
+    {
+        private EvaluateTeachLearnIBLL evaluateTeachLearnIBLL = new EvaluateTeachLearnBLL();
+
+        #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 = evaluateTeachLearnIBLL.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 EvaluateTeachLearnData = evaluateTeachLearnIBLL.GetEvaluateTeachLearnEntity( keyValue );
+            var jsonData = new {
+                EvaluateTeachLearn = EvaluateTeachLearnData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            evaluateTeachLearnIBLL.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)
+        {
+            EvaluateTeachLearnEntity entity = strEntity.ToObject<EvaluateTeachLearnEntity>();
+
+            var loginUserInfo = LoginUserInfo.Get();
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.CreateUserId = loginUserInfo.userId;
+                entity.CreateTime = DateTime.Now;
+            }
+            else
+            {
+                entity.ModifyUserId = loginUserInfo.userId;
+                entity.ModifyTime = DateTime.Now;
+            }
+
+            evaluateTeachLearnIBLL.SaveEntity(keyValue,entity);
+            
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.cshtml
new file mode 100644
index 000000000..7f9494209
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.cshtml	
@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "课堂巡查";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">时间<font face="宋体">*</font></div>
+        <input id="Time" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Time').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">课节<font face="宋体">*</font></div>
+        <input id="Section" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">教师<font face="宋体">*</font></div>
+        <div id="EmpNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">科目<font face="宋体">*</font></div>
+        <div id="LessonNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">情况记载</div>
+        <textarea id="Records" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/ClassPatrol/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.js
new file mode 100644
index 000000000..cb3587702
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Form.js	
@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-25 11:16
+ * 描  述：课堂巡查
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo',value: 'lessonno',text: 'lessonname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/ClassPatrol/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/ClassPatrol/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.cshtml
new file mode 100644
index 000000000..cdcbc5736
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.cshtml	
@@ -0,0 +1,44 @@
+@{
+    ViewBag.Title = "课堂巡查";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">课节</div>
+                                    <input id="Section" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教师</div>
+                                    <div id="EmpNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">科目</div>
+                                    <div id="LessonNo"></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>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/ClassPatrol/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js
new file mode 100644
index 000000000..c14bfe9c6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js	
@@ -0,0 +1,114 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-25 11:16
+ * 描  述：课堂巡查
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo',value: 'lessonno',text: 'lessonname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/ClassPatrol/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 + '/PersonnelManagement/ClassPatrol/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 + '/PersonnelManagement/ClassPatrol/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/ClassPatrol/GetPageList',
+                headData: [
+                    { label: "时间", name: "Time", width: 100, align: "left"},
+                    { label: "课节", name: "Section", width: 100, align: "left"},
+                    { label: "教师", name: "EmpNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                 key: value,
+                                 keyId: 'empno',
+                                 callback: function (_data) {
+                                     callback(_data['empname']);
+                                 }
+                             });
+                        }},
+                    { label: "科目", name: "LessonNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                                 key: value,
+                                 keyId: 'lessonno',
+                                 callback: function (_data) {
+                                     callback(_data['lessonname']);
+                                 }
+                             });
+                        }},
+                    { label: "情况记载", name: "Records", 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();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.cshtml
index 23b616085..9409e00a9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.cshtml	
@@ -7,6 +7,15 @@
         <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">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js
index 39b3f0932..876fd47e1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js	
@@ -7,12 +7,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: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -82,11 +116,15 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'ID',
                 isPage: true,
+                sidx: 'createtime',
+                sord: 'desc' 
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Form.cshtml
new file mode 100644
index 000000000..1acd9e81a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/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="EvaluateTeachLearn" >
+        <div class="lr-form-item-title">教师<font face="宋体">*</font></div>
+        <div id="EmpNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="EvaluateTeachLearn" >
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="EvaluateTeachLearn" >
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="EvaluateTeachLearn" >
+        <div class="lr-form-item-title">满意率<font face="宋体">*</font></div>
+        <input id="SatisfacteRate" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="EvaluateTeachLearn" >
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Form.js
new file mode 100644
index 000000000..c4f192e60
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Form.js	
@@ -0,0 +1,67 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-24 14:38
+ * 描  述：评教评学
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/EvaluateTeachLearn/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/EvaluateTeachLearn/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Index.cshtml
new file mode 100644
index 000000000..0dc25ea5b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Index.cshtml	
@@ -0,0 +1,48 @@
+@{
+    ViewBag.Title = "评教评学";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教师</div>
+                                    <div id="EmpNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">满意率</div>
+                                    <input id="SatisfacteRate" 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>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Index.js
new file mode 100644
index 000000000..c68191380
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EvaluateTeachLearn/Index.js	
@@ -0,0 +1,118 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-24 14:38
+ * 描  述：评教评学
+ */
+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);
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/EvaluateTeachLearn/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 + '/PersonnelManagement/EvaluateTeachLearn/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 + '/PersonnelManagement/EvaluateTeachLearn/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/EvaluateTeachLearn/GetPageList',
+                headData: [
+                    { label: "教师", name: "EmpNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                 key: value,
+                                 keyId: 'empno',
+                                 callback: function (_data) {
+                                     callback(_data['empname']);
+                                 }
+                             });
+                        }},
+                    { label: "学年", name: "AcademicYearNo", width: 100, align: "left"},
+                    { label: "学期", name: "Semester", width: 100, align: "left"},
+                    { label: "满意率", name: "SatisfacteRate", 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();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml
index 9fcdda0a6..cc6d59681 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml	
@@ -44,9 +44,9 @@
         <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
         <input id="LinkPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </div>
-    @*<div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
         <div class="lr-form-item-title">扫码签到</div>
         <div id="qrCode"></div>
-    </div>*@
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js
index aed129eb2..e4cbd9c77 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js	
@@ -63,7 +63,7 @@ var bootstrap = function ($, learun) {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
                         }
                         //扫码签到
-                        //makeCode(data[id].Id);           
+                        makeCode(data[id].Id);           
                     }
                 });
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 579cdb292..b10b0dbf2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -862,6 +862,10 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuGraduateConditionController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\TeachManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StudentCertificateController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\EvaluateTeachLearnController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ClassPatrolController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuGraduateStatisticController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\TrainEquipmentManageController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -1149,6 +1153,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\StuTuition.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\Peichart.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\StatisticIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuGraduateStatistic\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuGraduateStatistic\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuGrant\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuGrant\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Form.js" />
@@ -1223,6 +1229,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Exam_InvigilateTeacher\FormYearSemester.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_InvigilateTeacher\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ClassPlan\IndexSchool.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuGraduateStatistic\Form.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" />
@@ -6850,6 +6857,19 @@
     <Content Include="Areas\EducationalAdministration\Views\StudentCertificate\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StudentCertificate\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StudentCertificate\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\EvaluateTeachLearn\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\EvaluateTeachLearn\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\EvaluateTeachLearn\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\EvaluateTeachLearn\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ClassPatrol\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ClassPatrol\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ClassPatrol\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ClassPatrol\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuGraduateStatistic\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TrainEquipmentManage\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TrainEquipmentManage\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TrainEquipmentManage\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TrainEquipmentManage\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml
index 6afa2d93b..754ba1912 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml	
@@ -89,7 +89,7 @@
                         <img class="inp_icon" src="~/Content/images/Login/default_account0.png" alt=""> <input id="lr_username" type="text" placeholder="身份证号">
                     </div>
                     <div class="lr-login-input">
-                        <img class="inp_icon" src="~/Content/images/Login/default_psw0.png" alt=""><input id="lr_password" type="password" placeholder="手机号">
+                        <img class="inp_icon" src="~/Content/images/Login/default_psw0.png" alt=""><input id="lr_password" type="password" placeholder="密码">
                         <span id="psw_change"></span>
                     </div>
                     <div class="lr-login-input lr-login-reg">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesApiWx.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesApiWx.cs
index 4054c0a35..8d754269b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesApiWx.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesApiWx.cs	
@@ -40,8 +40,7 @@ namespace Learun.Application.WebApi.Modules
         public Response WxUpload(dynamic _)
         {
             var files = (List<HttpFile>)this.Context.Request.Files;
-            //var folderId = this.GetReqData();
-            string folderId = Guid.NewGuid().ToString();
+            string folderId = Request.Form["folderId"];
             string filePath = Config.GetValue("AnnexesFile");
             string uploadDate = DateTime.Now.ToString("yyyyMMdd");
             string fileEextension = Path.GetExtension(files[0].Name);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/FormApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/FormApi.cs
index a574ac806..0a2ac508e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/FormApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/FormApi.cs	
@@ -21,12 +21,28 @@ namespace Learun.Application.WebApi.Modules
         {
             Get["/scheme"] = GetScheme;
             Get["/data"] = GetData;
+            Get["/folderkey"] = GetFolderkey;
 
             Post["/save"] = Save;
             Post["/delete"] = DeleteForm;
         }
         private FormSchemeIBLL formSchemeIBLL = new FormSchemeBLL();
 
+
+        private Response GetFolderkey(dynamic _)
+        {
+            List<FolderKeyReq> req = this.GetReqData<List<FolderKeyReq>>();// 获取模板请求数据
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            foreach (var item in req)
+            {
+                if (!string.IsNullOrEmpty(item.processIdName))
+                {
+                    var data = formSchemeIBLL.GetFolderKey(item.schemeInfoId, item.processIdName, item.keyValue);//
+                    dic = data;
+                }
+            }
+            return Success(dic);
+        }
         /// <summary>
         /// 获取表单模板数据
         /// </summary>
@@ -104,6 +120,35 @@ namespace Learun.Application.WebApi.Modules
         }
 
         #region 请求参数
+
+        private class FolderKeyReq
+        {
+            /// <summary>
+            /// 表单请求Id
+            /// </summary>
+            public string id { get; set; }
+            /// <summary>
+            /// 当前自定义表单版本号
+            /// </summary>
+            public string ver { get; set; }
+            /// <summary>
+            /// 流程模板id
+            /// </summary>
+            public string schemeInfoId { get; set; }
+            /// <summary>
+            /// 关联字段名称
+            /// </summary>
+            public string processIdName { get; set; }
+            /// <summary>
+            /// 数据主键值
+            /// </summary>
+            public string keyValue { get; set; }
+            /// <summary>
+            /// 表单数据
+            /// </summary>
+            public string formData { get; set; }
+        }
+
         private class SchemeReq {
             /// <summary>
             /// 表单请求Id
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs
index cfb5eaa8a..cf057c78d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/MealCardRunTabApi.cs	
@@ -48,6 +48,7 @@ namespace Learun.Application.WebApi
         {
             ReqPageParam parameter = this.GetReqData<ReqPageParam>();
             var data = mealCardRunTabIBLL.GetPageList(parameter.pagination, parameter.queryJson);
+            data = data.OrderByDescending(x => x.centralTm);
             var jsonData = new
             {
                 rows = data,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs
index 9fa30d0a7..d06470df0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs	
@@ -8,6 +8,8 @@ using Learun.Application.TwoDevelopment.LR_Desktop;
 using System.Text;
 using System.Data;
 using Learun.Application.OA;
+using Learun.Application.Organization;
+using System;
 
 namespace Learun.Application.WebApi.Modules
 {
@@ -15,11 +17,17 @@ namespace Learun.Application.WebApi.Modules
     public class NewsApi : BaseApi
     {
         private NoticeIBLL noticeIBLL = new NoticeBLL();
+        private DepartmentIBLL departmentIBLL = new DepartmentBLL();
+        private PostIBLL postIBLL = new PostBLL();
+        private LR_OA_NewsReadIBLL lR_OA_NewsReadIBLL = new LR_OA_NewsReadBLL();
 
         public NewsApi()
         : base("/learun/news")
         {
             Get["/list"] = GetList;
+            Get["/shList"] = GetshList;
+
+            Post["/newsRead"] = NewsRead;
         }
 
 
@@ -32,7 +40,7 @@ namespace Learun.Application.WebApi.Modules
         {
             var userinfo = LoginUserInfo.Get();
             Pagination paginationobj = new Pagination();
-             var newsList = noticeIBLL.GetList("", userinfo.userId,(Request.Query["F_CategoryId"]!=null?Request.Query["F_CategoryId"].ToString():""));
+            var newsList = noticeIBLL.GetList("", userinfo.userId, (Request.Query["F_CategoryId"] != null ? Request.Query["F_CategoryId"].ToString() : ""));
             var newsListOfSelf = new List<NewsEntity>();
 
             foreach (var newsitemEntity in newsList)
@@ -85,6 +93,94 @@ namespace Learun.Application.WebApi.Modules
             };
             return Success(jsonData);
         }
+        /// <summary> 
+        /// 获取页面显示列表数据 
+        /// <summary> 
+        /// <param name="_"></param> 
+        /// <returns></returns> 
+        public Response GetshList(dynamic _)
+        {
+            NoticeEntity parameter = this.GetReqData<NoticeEntity>();
+            var shlist = noticeIBLL.GetEntityByProcessId(parameter.ProgressId);
+            if (!shlist.F_SendDeptId.IsEmpty())
+            {
+                var Array = shlist.F_SendDeptId.Split(',');
+                var deept = departmentIBLL.GetAllList();
+                var SendDeptId = "";
+                foreach (var item in Array)
+                {
+
+                    for (int i = 0; i < deept.Count; i++)
+                    {
+                        if (item == deept[i].F_DepartmentId)
+                        {
+                            SendDeptId += deept[i].F_FullName + ",";
+                        }
+                    }
+                }
+                SendDeptId.Trim(',');
+                shlist.F_SendDeptId = SendDeptId;
+            }
+            if (!shlist.F_SendPostId.IsEmpty())
+            {
+                var Array1 = shlist.F_SendPostId.Split(',');
+                var post = postIBLL.GetAllList();
+                var F_SendPostId = "";
+                foreach (var item in Array1)
+                {
+                    for (int i = 0; i < post.Count; i++)
+                    {
+                        if (item == post[i].F_PostId)
+                        {
+                            F_SendPostId += post[i].F_Name + ",";
+                        }
+                    }
+                }
+                F_SendPostId.Trim(',');
+                shlist.F_SendPostId = F_SendPostId;
+            }
+            if (!shlist.F_NewsContent.IsEmpty())
+            {
+                shlist.F_NewsContent = WebHelper.HtmlDecode(shlist.F_NewsContent);
+            }
+            return Success(shlist);
+        }
+
+        /// <summary>
+        /// 阅读通知公告
+        /// <summary>
+        /// <returns></returns>
+        public Response NewsRead(dynamic _)
+        {
+            var loginUserInfo = LoginUserInfo.Get();
+            NoticeEntity parameter = this.GetReqData<NoticeEntity>();
+
+            //判断当前用户是否阅读当前通知公告
+            var entity = lR_OA_NewsReadIBLL.GetLR_OA_NewsReadEntityByNewsIdAndUserId(parameter.newsId, loginUserInfo.userId);
+            if (entity == null)
+            {
+                var lR_OA_NewsRead = new LR_OA_NewsReadEntity()
+                {
+                    NewsId = parameter.newsId,
+                    RUserId = loginUserInfo.userId,
+                    RUserName = loginUserInfo.realName,
+                    RTime = DateTime.Now
+                };
+                lR_OA_NewsReadIBLL.SaveEntity("", lR_OA_NewsRead);
+
+                //修改当前通知公告的浏览量
+                lR_OA_NewsReadIBLL.UpdateNewsPV(parameter.newsId);
+            }
+
+            return Success("阅读成功！");
+        }
+        #region 私有类
+        private class NoticeEntity
+        {
+            public string ProgressId { get; set; }
+            public string newsId { get; set; }
+        }
+        #endregion
 
     }
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/DutyScheduleApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/DutyScheduleApi.cs
index 54b0d5975..a18aaaf04 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/DutyScheduleApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/DutyScheduleApi.cs	
@@ -1,4 +1,5 @@
-using Nancy;
+using System;
+using Nancy;
 using Learun.Util;
 using System.Collections.Generic;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
@@ -21,9 +22,13 @@ namespace Learun.Application.WebApi.Modules
         /// 注册接口 
         /// <summary> 
         public DutyScheduleApi()
-            : base("/Learun/adms/PersonnelManagement/DutySchedule")
+            : base("/learun/adms/PersonnelManagement/DutySchedule")
         {
             Get["/pagelist"] = GetPageList;
+            Get["/list"] = GetList;
+            Get["/form"] = GetForm;
+            Post["/save"] = SaveForm;
+            Post["/delete"] = DeleteForm;
         }
         #region  获取数据 
 
@@ -45,6 +50,74 @@ namespace Learun.Application.WebApi.Modules
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetList(dynamic _)
+        {
+            string queryJson = this.GetReqData();
+            var data = dutyScheduleIBLL.GetList();
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetForm(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+            var ScheduleData = dutyScheduleIBLL.GetDutyScheduleEntity(keyValue);
+            //ScheduleData.StartTime = Convert.ToDateTime((ScheduleData.StartTime.ToDate().ToString("yyyy-MM-dd") + " " + ScheduleData.StartTime.Substring(0, 2) + ":" + ScheduleData.StartTime.Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm"));
+            //ScheduleData.EndTime = Convert.ToDateTime((ScheduleData.EndTime.ToDate().ToString("yyyy-MM-dd") + " " + ScheduleData.EndTime.Substring(0, 2) + ":" + ScheduleData.F_EndTime.Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm"));
+            var jsonData = new
+            {
+                Schedule = ScheduleData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="_"></param>
+        /// <summary>
+        /// <returns></returns>
+        public Response SaveForm(dynamic _)
+        {
+            ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
+            DutyScheduleEntity entity = parameter.strEntity.ToObject<DutyScheduleEntity>();
+            dutyScheduleIBLL.SaveEntity(parameter.keyValue, entity);
+            return Success("保存成功！");
+        }
+
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="_"></param>
+        /// <summary>
+        /// <returns></returns>
+        public Response DeleteForm(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+            dutyScheduleIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        #endregion
+
+        #region 私有类
+        /// <summary>
+        /// 表单实体类
+        /// <summary>
+        private class ReqFormEntity
+        {
+            public string keyValue { get; set; }
+            public string strEntity { get; set; }
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SYS_ReceiveMessageApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SYS_ReceiveMessageApi.cs
index 56f712ebb..4234ff76e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SYS_ReceiveMessageApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SYS_ReceiveMessageApi.cs	
@@ -26,6 +26,7 @@ namespace Learun.Application.WebApi
             Get["/form"] = GetForm;
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
+            Post["/read"] = NewsRead;
         }
 
         #region  获取数据
@@ -70,13 +71,26 @@ namespace Learun.Application.WebApi
         {
             string keyValue = this.GetReqData();
             var SYS_ReceiveMessageData = sYS_ReceiveMessageIBLL.GetUrlSYS_ReceiveMessageEntity(keyValue);
+            if (SYS_ReceiveMessageData != null)
+            {
+                SYS_ReceiveMessageData.CONTENTS = WebHelper.HtmlDecode(SYS_ReceiveMessageData.CONTENTS);
+            }
             var jsonData = new
             {
                 SYS_ReceiveMessage = SYS_ReceiveMessageData,
             };
             return Success(jsonData);
         }
-
+        /// <summary>
+        /// 查阅收件箱
+        /// <summary>
+        /// <returns></returns>
+        public Response NewsRead(dynamic _)
+        {
+            ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
+            sYS_ReceiveMessageIBLL.Read(parameter.keyValue);
+            return Success("查阅成功！");
+        }
         #endregion
 
         #region  提交数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs
index 81017ca77..1d0edacc8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs	
@@ -28,6 +28,8 @@ namespace Learun.Application.WebApi
             Get["/form"] = GetForm;
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
+            Post["/read"] = NewsRead;
+
         }
         #region  获取数据 
 
@@ -69,6 +71,7 @@ namespace Learun.Application.WebApi
         {
             string keyValue = this.GetReqData();
             var Sys_ReceiveFileData = sys_ReceiveFileIBLL.GetSys_ReceiveFileEntity(keyValue);
+            Sys_ReceiveFileData.FilePath = Sys_ReceiveFileData.Url;
             if (Sys_ReceiveFileData != null)
             {
                 var result = annexesFileIBLL.GetEntityByFolderId(Sys_ReceiveFileData.Url)?.F_FilePath;
@@ -77,7 +80,7 @@ namespace Learun.Application.WebApi
                     result = "/" + result.Substring(result.IndexOf("Resource"));
                 }
                 Sys_ReceiveFileData.Url = result;
-
+                Sys_ReceiveFileData.Contents = WebHelper.HtmlDecode(Sys_ReceiveFileData.Contents);
             }
             var jsonData = new
             {
@@ -112,6 +115,17 @@ namespace Learun.Application.WebApi
             sys_ReceiveFileIBLL.SaveEntity(this.userInfo, parameter.keyValue, entity);
             return Success("保存成功！");
         }
+
+        /// <summary>
+        /// 查阅公文
+        /// <summary>
+        /// <returns></returns>
+        public Response NewsRead(dynamic _)
+        {
+            ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
+            sys_ReceiveFileIBLL.ReadEntity(parameter.keyValue);
+            return Success("查阅成功！");
+        }
         #endregion
 
         #region  私有类 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs
index fe3934459..8157c1b0d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs	
@@ -89,7 +89,7 @@ namespace Learun.Application.WebApi.Modules
         public Response GetStuLessonInfo(dynamic _)
         {
             var param = this.GetReqData<TimeParameter>();
-            var lessonInfos = stuAttendanceIBLL.GetStuLessonInfo(userInfo.account,param.StartDate,param.EndDate);
+            var lessonInfos = stuAttendanceIBLL.GetStuLessonInfo(userInfo.account, param.StartDate, param.EndDate);
             var empNos = lessonInfos.Select(a => a.EmpNo).ToList();
             var lessonTerms = arrangeLessonTermIBLL.GetListByEmpNo(empNos);
 
@@ -223,10 +223,10 @@ namespace Learun.Application.WebApi.Modules
             else if (param.Description == "教师")
             {
                 //教师
-                var empInfo = empInfoIbll.GetAllList().Where(x => x.EmpNo == userInfo.account).FirstOrDefault().EmpNo;
+                var empInfo = empInfoIbll.GetAllList().Where(x => x.EmpNo == param.Account).FirstOrDefault().EmpNo;
                 if (empInfo != null)
                 {
-                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, "", param.EmpNo, "");
+                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, "", param.Account, "");
                 }
             }
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs
index 1e3296b7e..778209e76 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs	
@@ -551,7 +551,91 @@ namespace Learun.Application.Form
                 }
             }
         }
-        
+
+        public Dictionary<string, string> GetFolderKey(string schemeInfoId, string processIdName, string keyValue)
+        {
+            Dictionary<string, DataTable> res = new Dictionary<string, DataTable>();
+
+            try
+            {
+                FormSchemeInfoEntity formSchemeInfoEntity = GetSchemeInfoEntity(schemeInfoId);
+                FormSchemeEntity formSchemeEntity = GetSchemeEntity(formSchemeInfoEntity.F_SchemeId);
+                FormSchemeModel formSchemeModel = formSchemeEntity.F_Scheme.ToObject<FormSchemeModel>();
+
+                // 确定主从表之间的关系
+                List<TreeModelEx<FormTableModel>> TableTree = new List<TreeModelEx<FormTableModel>>();// 从表
+                foreach (var table in formSchemeModel.dbTable)
+                {
+                    TreeModelEx<FormTableModel> treeone = new TreeModelEx<FormTableModel>();
+                    treeone.data = table;
+                    treeone.id = table.name;
+                    treeone.parentId = table.relationName;
+                    if (string.IsNullOrEmpty(table.relationName))
+                    {
+                        treeone.parentId = "0";
+                    }
+                    TableTree.Add(treeone);
+                }
+                TableTree = TableTree.ToTree();
+
+                // 确定表与组件之间的关系
+                Dictionary<string, List<FormCompontModel>> tableComponts = new Dictionary<string, List<FormCompontModel>>();
+                foreach (var tab in formSchemeModel.data)
+                {
+                    foreach (var compont in tab.componts)
+                    {
+                        if (!string.IsNullOrEmpty(compont.table))
+                        {
+                            if (!tableComponts.ContainsKey(compont.table))
+                            {
+                                tableComponts[compont.table] = new List<FormCompontModel>();
+                            }
+                            if (compont.type == "upload")
+                            {
+                                tableComponts[compont.table].Add(compont);
+                            }
+                            if (compont.type == "guid")
+                            {
+                                tableComponts[compont.table].Add(compont);
+                            }
+
+                        }
+                    }
+                }
+                GetInstanceTableData(TableTree, tableComponts, formSchemeModel.dbId, keyValue, processIdName, null, res);
+                Dictionary < string,string> uploadfieldkeyvalue=new Dictionary<string, string>();
+                foreach (var itemCompont in tableComponts)
+                {
+                    foreach (FormCompontModel formitem in itemCompont.Value)
+                    {
+                        if (formitem.type=="upload")
+                        {
+                            foreach (var resitem in res)
+                            {
+                                if (resitem.Value.Rows.Count>0)
+                                {
+                                    if (resitem.Value.Rows[0][formitem.field] != null)
+                                        uploadfieldkeyvalue.Add(formitem.id, resitem.Value.Rows[0][formitem.field].ToString());
+                                }
+                            }
+                        }
+                    }
+                }
+                return uploadfieldkeyvalue;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 保存自定义表单数据
         /// </summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeIBLL.cs
index 571d48c9d..72444597a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeIBLL.cs	
@@ -137,5 +137,7 @@ namespace Learun.Application.Form
         /// <param name="keyValue">数据主键值</param>
         void DeleteInstanceForm(string schemeInfoId, string keyValue);
         #endregion
+
+        Dictionary<string, string> GetFolderKey(string itemSchemeInfoId, string itemProcessIdName, string itemKeyValue);
     }
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuGraduateStatisticMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuGraduateStatisticMap.cs
new file mode 100644
index 000000000..c641787aa
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuGraduateStatisticMap.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-29 16:33
+    /// 描 述：毕业信息统计
+    /// </summary>
+    public class StuGraduateStatisticMap : EntityTypeConfiguration<StuGraduateStatisticEntity>
+    {
+        public StuGraduateStatisticMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("STUGRADUATESTATISTIC");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TrainEquipmentManageMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TrainEquipmentManageMap.cs
new file mode 100644
index 000000000..ece0b800f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TrainEquipmentManageMap.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 10:49
+    /// 描 述：实训设备管理
+    /// </summary>
+    public class TrainEquipmentManageMap : EntityTypeConfiguration<TrainEquipmentManageEntity>
+    {
+        public TrainEquipmentManageMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("TRAINEQUIPMENTMANAGE");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
index f3a6f9bc7..847e1ec15 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
@@ -619,6 +619,10 @@
     <Compile Include="EducationalAdministration\StuGraduateConditionMap.cs" />
     <Compile Include="PersonnelManagement\TeachManagementMap.cs" />
     <Compile Include="EducationalAdministration\StudentCertificateMap.cs" />
+    <Compile Include="PersonnelManagement\EvaluateTeachLearnMap.cs" />
+    <Compile Include="PersonnelManagement\ClassPatrolMap.cs" />
+    <Compile Include="EducationalAdministration\StuGraduateStatisticMap.cs" />
+    <Compile Include="EducationalAdministration\TrainEquipmentManageMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ClassPatrolMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ClassPatrolMap.cs
new file mode 100644
index 000000000..619a5860d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ClassPatrolMap.cs	
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public class ClassPatrolMap : EntityTypeConfiguration<ClassPatrolEntity>
+    {
+        public ClassPatrolMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("CLASSPATROL");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EvaluateTeachLearnMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EvaluateTeachLearnMap.cs
new file mode 100644
index 000000000..9f09b53da
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EvaluateTeachLearnMap.cs	
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-24 14:38
+    /// 描 述：评教评学
+    /// </summary>
+    public class EvaluateTeachLearnMap : EntityTypeConfiguration<EvaluateTeachLearnEntity>
+    {
+        public EvaluateTeachLearnMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("EVALUATETEACHLEARN");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs
index e9c8d7aa8..f4447cc5e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs	
@@ -164,11 +164,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["accountName"].IsEmpty())
                 {
-                    var IsPhone = queryParam["IsPhone"].ToString();
-                    if (IsPhone == "0")
+                    var IsPhone = "";
+                    if (!queryParam["IsPhone"].IsEmpty())
                     {
-                        dp.Add("accountName", queryParam["accountName"].ToString(), DbType.String);
-                        strSql.Append(" AND t.accountName = @accountName ");
+                        IsPhone = queryParam["IsPhone"].ToString();
+                        if (IsPhone == "0")
+                        {
+                            var accountName = queryParam["accountName"].ToString();
+                            if (accountName != "超级管理员")
+                            {
+                                dp.Add("accountName", queryParam["accountName"].ToString(), DbType.String);
+                                strSql.Append(" AND t.accountName = @accountName ");
+                            }
+                        }
                     }
                     else
                     {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageEntity.cs
index 9f16d80b6..bb35bea25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageEntity.cs	
@@ -110,6 +110,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region  扩展字段
+        /// <summary>
+        /// 
+        /// </summary>
+        [NotMapped]
+        public string FilePath { get; set; }
         #endregion
     }
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageService.cs
index 345539302..900af573d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageService.cs	
@@ -166,6 +166,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var result = this.BaseRepository().FindEntity<SYS_ReceiveMessageEntity>(keyValue);
+                result.FilePath = result.URL;
                 result.URL = this.BaseRepository().FindEntity<AnnexesFileEntity>(a => a.F_FolderId == result.URL)?.F_FilePath;
                 if (!string.IsNullOrEmpty(result.URL))
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs
index 3f3de8b01..b45777feb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs	
@@ -82,12 +82,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("EncourgeName", "%" + queryParam["EncourgeName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.EncourgeName Like @EncourgeName ");
                 }
-                if (!queryParam["EncourgeDate"].IsEmpty())
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
                 {
-                    dp.Add("EncourgeDate", queryParam["EncourgeDate"].ToString(), DbType.String);
-                    strSql.Append(" AND t.EncourgeDate = @EncourgeDate ");
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.EncourgeDate >= @startTime AND t.EncourgeDate <= @endTime ) ");
                 }
-
                 return this.BaseRepository("CollegeMIS").FindList<StuEncourgementEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticBLL.cs
new file mode 100644
index 000000000..ab359b8fe
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticBLL.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-29 16:33
+    /// 描 述：毕业信息统计
+    /// </summary>
+    public class StuGraduateStatisticBLL : StuGraduateStatisticIBLL
+    {
+        private StuGraduateStatisticService stuGraduateStatisticService = new StuGraduateStatisticService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuGraduateStatisticEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return stuGraduateStatisticService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StuGraduateStatistic表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuGraduateStatisticEntity GetStuGraduateStatisticEntity(string keyValue)
+        {
+            try
+            {
+                return stuGraduateStatisticService.GetStuGraduateStatisticEntity(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
+            {
+                stuGraduateStatisticService.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, StuGraduateStatisticEntity entity)
+        {
+            try
+            {
+                stuGraduateStatisticService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticEntity.cs
new file mode 100644
index 000000000..9662857b3
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticEntity.cs	
@@ -0,0 +1,135 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-29 16:33
+    /// 描 述：毕业信息统计
+    /// </summary>
+    public class StuGraduateStatisticEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 学号
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        [Column("STUNAME")]
+        public string StuName { get; set; }
+        /// <summary>
+        /// 性别
+        /// </summary>
+        [Column("GENDERNO")]
+        public bool? GenderNo { get; set; }
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        [Column("IDENTITYCARDNO")]
+        public string IdentityCardNo { get; set; }
+        /// <summary>
+        /// 学籍号
+        /// </summary>
+        [Column("STUCODE")]
+        public string StuCode { get; set; }
+        /// <summary>
+        /// 省编学号
+        /// </summary>
+        [Column("PROVINCECODE")]
+        public string ProvinceCode { get; set; }
+        /// <summary>
+        /// 专业
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// 学制
+        /// </summary>
+        [Column("EDUSYSTEM")]
+        public string EduSystem { get; set; }
+        /// <summary>
+        /// 班级
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        [Column("MOBILE")]
+        public string mobile { get; set; }
+        /// <summary>
+        /// 毕业去向
+        /// </summary>
+        [Column("GRADUATEGO")]
+        public string GraduateGo { get; set; }
+        /// <summary>
+        /// 升入高校名称
+        /// </summary>
+        [Column("ENTERUNIVERSITYNAME")]
+        public string EnterUniversityName { get; set; }
+        /// <summary>
+        /// 大学层次（本科/专科）
+        /// </summary>
+        [Column("UNIVERSITYLEVEL")]
+        public string UniversityLevel { get; set; }
+        /// <summary>
+        /// 就业单位名称
+        /// </summary>
+        [Column("EMPLOYERNAME")]
+        public string EmployerName { get; set; }
+        /// <summary>
+        /// 就业单位所属省
+        /// </summary>
+        [Column("EMPLOYERPROVINCE")]
+        public string EmployerProvince { get; set; }
+        /// <summary>
+        /// 就业单位所属市
+        /// </summary>
+        [Column("EMPLOYERCITY")]
+        public string EmployerCity { get; set; }
+        /// <summary>
+        /// 就业单位所属县（区）
+        /// </summary>
+        [Column("EMPLOYERCOUNTRY")]
+        public string EmployerCountry { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { 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
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticIBLL.cs
new file mode 100644
index 000000000..9a5734fb5
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticIBLL.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-29 16:33
+    /// 描 述：毕业信息统计
+    /// </summary>
+    public interface StuGraduateStatisticIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StuGraduateStatisticEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取StuGraduateStatistic表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        StuGraduateStatisticEntity GetStuGraduateStatisticEntity(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, StuGraduateStatisticEntity entity);
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticService.cs
new file mode 100644
index 000000000..b4b468f85
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuGraduateStatistic/StuGraduateStatisticService.cs	
@@ -0,0 +1,191 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-29 16:33
+    /// 描 述：毕业信息统计
+    /// </summary>
+    public class StuGraduateStatisticService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuGraduateStatisticEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.StuNo,
+                t.StuName,
+                t.GenderNo,
+                t.IdentityCardNo,
+                t.StuCode,
+                t.ProvinceCode,
+                t.MajorNo,
+                t.EduSystem,
+                t.ClassNo,
+                t.mobile,
+                t.GraduateGo,
+                t.EnterUniversityName,
+                t.UniversityLevel,
+                t.EmployerName,
+                t.EmployerProvince,
+                t.EmployerCity,
+                t.EmployerCountry
+                ");
+                strSql.Append("  FROM StuGraduateStatistic t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuNo Like @StuNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo",queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["GraduateGo"].IsEmpty())
+                {
+                    dp.Add("GraduateGo",queryParam["GraduateGo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.GraduateGo = @GraduateGo ");
+                }
+                if (!queryParam["UniversityLevel"].IsEmpty())
+                {
+                    dp.Add("UniversityLevel",queryParam["UniversityLevel"].ToString(), DbType.String);
+                    strSql.Append(" AND t.UniversityLevel = @UniversityLevel ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuGraduateStatisticEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StuGraduateStatistic表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuGraduateStatisticEntity GetStuGraduateStatisticEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuGraduateStatisticEntity>(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<StuGraduateStatisticEntity>(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, StuGraduateStatisticEntity 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
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs
index fa19beea7..a91cc5a86 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs	
@@ -464,7 +464,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUDYMODALITY")]
         public string StudyModality { get; set; }
         /// <summary>
-        /// 学籍异动状态
+        /// 学籍异动状态（1表示不显示成绩）
         /// </summary>
         /// <returns></returns>
         [Column("CHANGESTATUS")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs
index ff176e345..dd29b2fe6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs	
@@ -103,6 +103,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Remark", "%" + queryParam["Remark"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Remark Like @Remark ");
                 }
+
+                if (!queryParam["CheckMark"].IsEmpty())
+                {
+                    dp.Add("CheckMark", "" + queryParam["CheckMark"].ToString() + "", DbType.String);
+                    if (queryParam["CheckMark"].ToString() == "1")
+                    {
+                        strSql.Append(" AND t.CheckMark=@CheckMark ");
+                    }
+                    else
+                    {
+                        strSql.Append(" AND (t.CheckMark is null or t.CheckMark='0') ");
+                    }
+                }
+                if (!queryParam["StuCode"].IsEmpty())
+                {
+                    dp.Add("StuCode", "%" + queryParam["StuCode"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuCode Like @StuCode ");
+                }
+                if (!queryParam["PartyFaceNo"].IsEmpty())
+                {
+                    dp.Add("PartyFaceNo", "" + queryParam["PartyFaceNo"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.PartyFaceNo = @PartyFaceNo ");
+                }
+                if (!queryParam["EduSystem"].IsEmpty())
+                {
+                    dp.Add("EduSystem", "" + queryParam["EduSystem"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.EduSystem = @EduSystem ");
+                }
+                if (!queryParam["HealthStatus"].IsEmpty())
+                {
+                    dp.Add("HealthStatus", "" + queryParam["HealthStatus"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.HealthStatus = @HealthStatus ");
+                }
+                if (!queryParam["StudyModality"].IsEmpty())
+                {
+                    dp.Add("StudyModality", "" + queryParam["StudyModality"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.StudyModality = @StudyModality ");
+                }
+
+                if (!queryParam["Photo"].IsEmpty())
+                {
+                    dp.Add("Photo", "" + queryParam["Photo"].ToString() + "", DbType.String);
+                    if (queryParam["Photo"].ToString() == "1")
+                    {
+                        strSql.Append(" AND t.Photo is not null ");
+                    }
+                    else
+                    {
+                        strSql.Append(" AND t.Photo is null  ");
+                    }
+                }
                 return this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -474,13 +525,38 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var url = AppDomain.CurrentDomain.BaseDirectory;
                 foreach (var stuInfo in stuList)
                 {
-                    //照片不为空
-                    if (!string.IsNullOrEmpty(stuInfo.Photo))
+                    //判断要上传的照片在本地服务器中是否存在
+                    var photoPath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg";
+                    if (System.IO.File.Exists(photoPath))
                     {
-                        var annex = this.BaseRepository()
-                            .FindEntity<AnnexesFileEntity>(a => a.F_FolderId == stuInfo.Photo);
-                        if (annex == null)
+                        //学籍表中照片字段不为空
+                        if (!string.IsNullOrEmpty(stuInfo.Photo))
                         {
+                            var annex = this.BaseRepository()
+                                .FindEntity<AnnexesFileEntity>(a => a.F_FolderId == stuInfo.Photo);
+                            if (annex == null)
+                            {
+                                var annexEntity = new AnnexesFileEntity()
+                                {
+                                    F_Id = Guid.NewGuid().ToString(),
+                                    F_FileName = stuInfo.IdentityCardNo + ".jpg",
+                                    F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg",
+                                    F_FolderId = stuInfo.Photo
+                                };
+                                this.BaseRepository().Insert(annexEntity);
+
+                            }
+                            else
+                            {
+                                annex.F_FileName = stuInfo.IdentityCardNo + ".jpg";
+                                annex.F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg";
+                                this.BaseRepository().Update(annex);
+                            }
+                        }
+                        else
+                        {
+                            stuInfo.Photo = Guid.NewGuid().ToString();
+
                             var annexEntity = new AnnexesFileEntity()
                             {
                                 F_Id = Guid.NewGuid().ToString(),
@@ -488,32 +564,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg",
                                 F_FolderId = stuInfo.Photo
                             };
+                            annexEntity.Create();
+                            this.BaseRepository("CollegeMIS").Update(stuInfo);
                             this.BaseRepository().Insert(annexEntity);
-
-                        }
-                        else
-                        {
-                            annex.F_FileName = stuInfo.IdentityCardNo + ".jpg";
-                            annex.F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg";
-                            this.BaseRepository().Update(annex);
                         }
                     }
-                    else
-                    {
-                        stuInfo.Photo = Guid.NewGuid().ToString();
-
-                        var annexEntity = new AnnexesFileEntity()
-                        {
-                            F_Id = Guid.NewGuid().ToString(),
-                            F_FileName = stuInfo.IdentityCardNo + ".jpg",
-                            F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg",
-                            F_FolderId = stuInfo.Photo
-                        };
-                        annexEntity.Create();
-                        this.BaseRepository("CollegeMIS").Update(stuInfo);
-                        this.BaseRepository().Insert(annexEntity);
-                    }
-
+                    
                 }
             }
             catch (Exception ex)
@@ -1035,16 +1091,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         public void SaveEntity(string keyValue, StuInfoBasicEntity entity)
         {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
                 UserIBLL userIBLL = new UserBLL();
+                var loginUser = LoginUserInfo.Get();
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
 
                     var oldEntity = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(keyValue);
                     List<StuInfoBasic_ChangeLogEntity> list = new List<StuInfoBasic_ChangeLogEntity>();
-                    var loginUser = LoginUserInfo.Get();
                     var tableInfos = this.BaseRepository("CollegeMIS").FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] 
   as varchar(100)) AS [字段说明]
   FROM sys.tables AS t
@@ -1082,7 +1139,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 AfterChange = newValue.ToString(),
                                 FieldName = columnName,
                                 UpdateBy = loginUser.userId,
-                                UpdateTime = DateTime.Now
+                                UpdateTime = DateTime.Now,
+                                StuChangeType="09",
+                                StuChangeRemark="点击学籍信息管理-修改按钮进行操作"
                             };
                             changeEntity.Create();
                             list.Add(changeEntity);
@@ -1092,7 +1151,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                     if (list.Count > 0)
                     {
-                        this.BaseRepository("CollegeMIS").Insert(list);
+                        db.Insert(list);
                     }
 
 
@@ -1113,37 +1172,55 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         userIBLL.SaveEntity(baseUser.F_UserId, baseUser);
                     }
 
-                    this.BaseRepository("CollegeMIS").Update(entity);
+                    db.Update(entity);
                 }
                 else
                 {
                     entity.Create();
-                    if (entity.IsTran == "0")
+                    if (entity.IsTran == "0")//转入/进
                     {
-                        StuInfoBasicChangeEntity stuinfoChange = new StuInfoBasicChangeEntity
+                        //学籍异动表
+                        //StuInfoBasicChangeEntity stuinfoChange = new StuInfoBasicChangeEntity
+                        //{
+                        //    Id = Guid.NewGuid().ToString(),
+                        //    StuNo = entity.StuNo,
+                        //    StuName = entity.StuName,
+                        //    DeptNo = entity.DeptNo,
+                        //    MajorNo = entity.MajorNo,
+                        //    ClassNo = entity.ClassNo,
+                        //    StuChangeRemark = entity.Remark,
+                        //    NewDeptNo = entity.DeptNo,
+                        //    NewMajorNo = entity.MajorNo,
+                        //    NewClassNo = entity.ClassNo,
+                        //    CreateUserId = entity.StuNo,
+                        //    StuChangeType = "04",
+                        //    StuChangeReason = "10",
+                        //    CreateTime = DateTime.Now,
+                        //};
+                        //db.Insert(stuinfoChange);
+                        //学籍异动日志表
+                        var changeEntity = new StuInfoBasic_ChangeLogEntity
                         {
-                            Id = Guid.NewGuid().ToString(),
-                            StuNo = entity.StuNo,
-                            StuName = entity.StuName,
-                            DeptNo = entity.DeptNo,
-                            MajorNo = entity.MajorNo,
-                            ClassNo = entity.ClassNo,
-                            StuChangeRemark = entity.Remark,
-                            NewDeptNo = entity.DeptNo,
-                            NewMajorNo = entity.MajorNo,
-                            NewClassNo = entity.ClassNo,
-                            CreateUserId = entity.StuNo,
+                            StuID = entity.StuId,
+                            BeforeChange = "",
+                            AfterChange = "",
+                            FieldName = "",
+                            UpdateBy = loginUser.userId,
+                            UpdateTime = DateTime.Now,
                             StuChangeType = "04",
-                            StuChangeReason = "10",
-                            CreateTime = DateTime.Now,
+                            StuChangeRemark = "点击学籍信息管理-异动转入按钮进行操作"
                         };
-                        this.BaseRepository("CollegeMIS").Insert(stuinfoChange);
+                        changeEntity.Create();
+                        db.Insert(changeEntity);
                     }
-                    this.BaseRepository("CollegeMIS").Insert(entity);
+                    db.Insert(entity);
                 }
+
+                db.Commit();
             }
             catch (Exception ex)
             {
+                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs
index b58c8c2b2..298b37876 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs	
@@ -45,17 +45,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("CLASSNO")]
         public string ClassNo { get; set; }
         /// <summary>
-        /// StuChangeType
+        /// 异动类型（留级01，转出/校02，复学03，转入/进04，退学05，休学06，转班07，转专业08，学籍关键信息更改09）
         /// </summary>
         [Column("STUCHANGETYPE")]
         public string StuChangeType { get; set; }
         /// <summary>
-        /// StuChangeReason
+        /// 异动原因
         /// </summary>
         [Column("STUCHANGEREASON")]
         public string StuChangeReason { get; set; }
         /// <summary>
-        /// StuChangeRemark
+        /// 异动备注
         /// </summary>
         [Column("STUCHANGEREMARK")]
         public string StuChangeRemark { get; set; }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs
index 17f8e9173..b0b62d8ac 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs	
@@ -149,30 +149,215 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
+                var loginUserInfo = LoginUserInfo.Get();
+                var now = DateTime.Now;
+                var logList = new List<StuInfoBasic_ChangeLogEntity>();
                 var entity = db.FindEntity<StuInfoBasicChangeEntity>(x => x.Id == keyValue);
                 if (entity != null)
                 {
-                    //处理数据
-                    if (entity.StuChangeType == "01" || entity.StuChangeType == "03")   //降级、转班、转专业
+                    var stuInfoBasicEntity = db.FindEntity<StuInfoBasicEntity>(x => x.StuNo == entity.StuNo);
+                    if (stuInfoBasicEntity != null)
                     {
-                        //改信息；
-                        var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.NewClassNo);
-                        if (classInfoEntity != null)
+                        //处理数据
+                        if (entity.StuChangeType == "01" || entity.StuChangeType == "07")   //降级、转班、
                         {
-                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.NewDeptNo}',MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+                            if (stuInfoBasicEntity.ClassNo != entity.NewClassNo)
+                            {
+                                var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.NewClassNo);
+                                if (classInfoEntity != null)
+                                {
+                                    if (stuInfoBasicEntity.Grade != classInfoEntity.Grade)
+                                    {
+                                        //增加异动日志表：年级
+                                        var logentity2 = new StuInfoBasic_ChangeLogEntity()
+                                        {
+                                            FieldName = "年级",
+                                            BeforeChange = stuInfoBasicEntity.Grade,
+                                            AfterChange = classInfoEntity.Grade,
+                                            UpdateBy = loginUserInfo.userId,
+                                            UpdateTime = now,
+                                            StuID = stuInfoBasicEntity.StuId,
+                                            StuChangeType = entity.StuChangeType,
+                                            StuChangeRemark = entity.StuChangeRemark,
+                                            StuChangeId = entity.Id
+                                        };
+                                        logentity2.Create();
+                                        logList.Add(logentity2);
+                                    }
+                                    //改学籍信息表；
+                                    db.ExecuteBySql($"update StuInfoBasic set ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+                                    //增加异动日志表：班级
+                                    var logentity = new StuInfoBasic_ChangeLogEntity()
+                                    {
+                                        FieldName = "班级",
+                                        BeforeChange = entity.ClassNo,
+                                        AfterChange = entity.NewClassNo,
+                                        UpdateBy = loginUserInfo.userId,
+                                        UpdateTime = now,
+                                        StuID = stuInfoBasicEntity.StuId,
+                                        StuChangeType = entity.StuChangeType,
+                                        StuChangeRemark = entity.StuChangeRemark,
+                                        StuChangeId = entity.Id
+                                    };
+                                    logentity.Create();
+                                    logList.Add(logentity);
+                                }
+                            }
+
                         }
-                    }
-                    else if (entity.StuChangeType == "02" || entity.StuChangeType == "04")  //退学、休学
-                    {
-                        //改信息；不显示成绩；
-                        db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' ");
-                    }
+                        else if (entity.StuChangeType == "02" || entity.StuChangeType == "05" || entity.StuChangeType == "06")  //转校、退学、休学、
+                        {
+                            //增加异动日志表：学籍异动状态
+                            var logentity = new StuInfoBasic_ChangeLogEntity()
+                            {
+                                FieldName = "学籍异动状态",
+                                BeforeChange = stuInfoBasicEntity.ChangeStatus?.ToString(),
+                                AfterChange = "1",
+                                UpdateBy = loginUserInfo.userId,
+                                UpdateTime = now,
+                                StuID = stuInfoBasicEntity.StuId,
+                                StuChangeType = entity.StuChangeType,
+                                StuChangeRemark = entity.StuChangeRemark,
+                                StuChangeId = entity.Id
+                            };
+                            logentity.Create();
+                            logList.Add(logentity);
+                            //改学籍信息（异动状态为1表示不显示成绩）；
+                            db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' ");
+                        }
+                        else if (entity.StuChangeType == "03")  //复学
+                        {
+                            //增加异动日志表：学籍异动状态
+                            var logentity = new StuInfoBasic_ChangeLogEntity()
+                            {
+                                FieldName = "学籍异动状态",
+                                BeforeChange = stuInfoBasicEntity.ChangeStatus?.ToString(),
+                                AfterChange = "0",
+                                UpdateBy = loginUserInfo.userId,
+                                UpdateTime = now,
+                                StuID = stuInfoBasicEntity.StuId,
+                                StuChangeType = entity.StuChangeType,
+                                StuChangeRemark = entity.StuChangeRemark,
+                                StuChangeId = entity.Id
+                            };
+                            logentity.Create();
+                            logList.Add(logentity);
+                            //改学籍信息（异动状态为0表示显示成绩）；
+                            db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null where StuNo='{entity.StuNo}' ");
+                        }
+                        else if (entity.StuChangeType == "08")   //转专业、
+                        {
+                            if (stuInfoBasicEntity.MajorNo != entity.NewMajorNo)
+                            {
+                                var classInfoEntity2 = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.NewClassNo);
+                                if (classInfoEntity2 != null)
+                                {
+                                    if (stuInfoBasicEntity.Grade != classInfoEntity2.Grade)
+                                    {
+                                        //增加异动日志表：年级
+                                        var logentity3 = new StuInfoBasic_ChangeLogEntity()
+                                        {
+                                            FieldName = "年级",
+                                            BeforeChange = stuInfoBasicEntity.Grade,
+                                            AfterChange = classInfoEntity2.Grade,
+                                            UpdateBy = loginUserInfo.userId,
+                                            UpdateTime = now,
+                                            StuID = stuInfoBasicEntity.StuId,
+                                            StuChangeType = entity.StuChangeType,
+                                            StuChangeRemark = entity.StuChangeRemark,
+                                            StuChangeId = entity.Id
+                                        };
+                                        logentity3.Create();
+                                        logList.Add(logentity3);
+                                    }
+                                    //改学籍信息；
+                                    db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity2.Grade}' where StuNo='{entity.StuNo}' ");
+                                    //增加异动日志表：专业
+                                    var logentity = new StuInfoBasic_ChangeLogEntity()
+                                    {
+                                        FieldName = "专业",
+                                        BeforeChange = entity.MajorNo,
+                                        AfterChange = entity.NewMajorNo,
+                                        UpdateBy = loginUserInfo.userId,
+                                        UpdateTime = now,
+                                        StuID = stuInfoBasicEntity.StuId,
+                                        StuChangeType = entity.StuChangeType,
+                                        StuChangeRemark = entity.StuChangeRemark,
+                                        StuChangeId = entity.Id
+                                    };
+                                    logentity.Create();
+                                    logList.Add(logentity);
+                                    //增加异动日志表：班级
+                                    var logentity2 = new StuInfoBasic_ChangeLogEntity()
+                                    {
+                                        FieldName = "班级",
+                                        BeforeChange = entity.ClassNo,
+                                        AfterChange = entity.NewClassNo,
+                                        UpdateBy = loginUserInfo.userId,
+                                        UpdateTime = now,
+                                        StuID = stuInfoBasicEntity.StuId,
+                                        StuChangeType = entity.StuChangeType,
+                                        StuChangeRemark = entity.StuChangeRemark,
+                                        StuChangeId = entity.Id
+                                    };
+                                    logentity2.Create();
+                                    logList.Add(logentity2);
+                                }
+                            }
+                            else
+                            {
+                                if (stuInfoBasicEntity.ClassNo != entity.NewClassNo)
+                                {
+                                    var classInfoEntity2 = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.NewClassNo);
+                                    if (classInfoEntity2 != null)
+                                    {
+                                        if (stuInfoBasicEntity.Grade != classInfoEntity2.Grade)
+                                        {
+                                            //增加异动日志表：年级
+                                            var logentity2 = new StuInfoBasic_ChangeLogEntity()
+                                            {
+                                                FieldName = "年级",
+                                                BeforeChange = stuInfoBasicEntity.Grade,
+                                                AfterChange = classInfoEntity2.Grade,
+                                                UpdateBy = loginUserInfo.userId,
+                                                UpdateTime = now,
+                                                StuID = stuInfoBasicEntity.StuId,
+                                                StuChangeType = entity.StuChangeType,
+                                                StuChangeRemark = entity.StuChangeRemark,
+                                                StuChangeId = entity.Id
+                                            };
+                                            logentity2.Create();
+                                            logList.Add(logentity2);
+                                        }
+                                        //改学籍信息表；
+                                        db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity2.Grade}' where StuNo='{entity.StuNo}' ");
+                                        //增加异动日志表：班级
+                                        var logentity = new StuInfoBasic_ChangeLogEntity()
+                                        {
+                                            FieldName = "班级",
+                                            BeforeChange = entity.ClassNo,
+                                            AfterChange = entity.NewClassNo,
+                                            UpdateBy = loginUserInfo.userId,
+                                            UpdateTime = now,
+                                            StuID = stuInfoBasicEntity.StuId,
+                                            StuChangeType = entity.StuChangeType,
+                                            StuChangeRemark = entity.StuChangeRemark,
+                                            StuChangeId = entity.Id
+                                        };
+                                        logentity.Create();
+                                        logList.Add(logentity);
+                                    }
+                                }
+                            }
+                        }
+                        db.Insert(logList);
 
-                    //修改状态
-                    entity.CheckTime = DateTime.Now;
-                    entity.CheckUserId = LoginUserInfo.Get().account;
-                    entity.CheckStatus = 1;
-                    db.Update(entity);
+                        //修改异动表：审批状态、审批人、
+                        entity.CheckTime = now;
+                        entity.CheckUserId = loginUserInfo.userId;
+                        entity.CheckStatus = 1;
+                        db.Update(entity);
+                    }
                 }
                 db.Commit();
             }
@@ -204,23 +389,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 if (entity != null)
                 {
                     //处理数据
-                    if (entity.StuChangeType == "01" || entity.StuChangeType == "02" || entity.StuChangeType == "03")   //降级、转班、转专业
+                    if (entity.StuChangeType == "01" || entity.StuChangeType == "07" || entity.StuChangeType == "08")   //降级、转班、转专业、
                     {
-                        //改信息；
+                        //改学籍信息；
                         var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.ClassNo);
                         if (classInfoEntity != null)
                         {
                             db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
                         }
                     }
-                    else if (entity.StuChangeType == "04" || entity.StuChangeType == "05")  //退学、休学
+                    else if (entity.StuChangeType == "02" || entity.StuChangeType == "05" || entity.StuChangeType == "06")  //转校、退学、休学
                     {
-                        //改信息；显示成绩；
+                        //改学籍信息（异动状态为null表示显示成绩）；
                         db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null where StuNo='{entity.StuNo}' ");
                     }
+                    else if (entity.StuChangeType == "03")  //复学
+                    {
+                        //改学籍信息（异动状态为1表示不显示成绩）；
+                        db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' ");
+                    }
 
-                    //修改状态
+                    //修改异动表：审批状态、审批人、
                     db.ExecuteBySql("update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0 where Id='" + keyValue + "' ");
+                    //删除异动日志表：学籍异动主键id
+                    db.ExecuteBySql("delete from StuInfoBasic_ChangeLog where StuChangeId='" + keyValue + "' ");
+
                 }
                 db.Commit();
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs
index 38d1e0a44..474ad6ed7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs	
@@ -51,6 +51,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("STUID")]
         public string StuID { get; set; }
+        /// <summary>
+        /// 学籍异动类型（留级01，转出/校02，复学03，转入/进04，退学05，休学06，转班07，转专业08，学籍关键信息更改09）
+        /// </summary>
+        [Column("STUCHANGETYPE")]
+        public string StuChangeType { get; set; }
+        /// <summary>
+        /// 学籍异动备注
+        /// </summary>
+        [Column("STUCHANGEREMARK")]
+        public string StuChangeRemark { get; set; }
+        /// <summary>
+        /// StuInfoBasicChange主键
+        /// </summary>
+        [Column("STUCHANGEID")]
+        public string StuChangeId { get; set; }
         #endregion
 
         #region  扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs
index 335ab28f7..e5bfd65be 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs	
@@ -29,16 +29,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.FieldName,
-                t.BeforeChange,
-                t.AfterChange,
-                t.UpdateBy,
-                t.UpdateTime,
-                t.StuID
-                ");
+                strSql.Append("SELECT t.*");
                 strSql.Append("  FROM StuInfoBasic_ChangeLog t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -57,7 +48,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["StuID"].IsEmpty())
                 {
-                    dp.Add("StuID", "" + queryParam["StuID"].ToString() + "", DbType.String);
+                    dp.Add("StuID", queryParam["StuID"].ToString(), DbType.String);
                     strSql.Append(" AND t.StuID = @StuID ");
                 }
                 if (!queryParam["UpdateTime"].IsEmpty())
@@ -67,8 +58,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["UpdateBy"].IsEmpty())
                 {
-                    dp.Add("UpdateBy", "%" + queryParam["UpdateBy"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.UpdateBy Like @UpdateBy ");
+                    dp.Add("UpdateBy", queryParam["UpdateBy"].ToString(), DbType.String);
+                    strSql.Append(" AND t.UpdateBy = @UpdateBy ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<StuInfoBasic_ChangeLogEntity>(strSql.ToString(),dp, pagination);
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs
index 2ec5e0fa2..65e555839 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs	
@@ -77,10 +77,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("PunishNo", queryParam["PunishNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.PunishNo = @PunishNo ");
                 }
-                if (!queryParam["PunishDate"].IsEmpty())
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
                 {
-                    dp.Add("PunishDate", queryParam["PunishDate"].ToString(), DbType.String);
-                    strSql.Append(" AND t.PunishDate = @PunishDate ");
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.PunishDate >= @startTime AND t.PunishDate <= @endTime ) ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<StuPunishmentEntity>(strSql.ToString(), dp, pagination);
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileEntity.cs
index 3b91b4259..1bb0c835e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileEntity.cs	
@@ -149,6 +149,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         [Column("SLASTDATE")]
         public DateTime? SLastDate { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        [NotMapped]
+        public string FilePath { get; set; }
 
         #endregion
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageBLL.cs
new file mode 100644
index 000000000..6f344af86
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageBLL.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 10:49
+    /// 描 述：实训设备管理
+    /// </summary>
+    public class TrainEquipmentManageBLL : TrainEquipmentManageIBLL
+    {
+        private TrainEquipmentManageService trainEquipmentManageService = new TrainEquipmentManageService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TrainEquipmentManageEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return trainEquipmentManageService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TrainEquipmentManage表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TrainEquipmentManageEntity GetTrainEquipmentManageEntity(string keyValue)
+        {
+            try
+            {
+                return trainEquipmentManageService.GetTrainEquipmentManageEntity(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
+            {
+                trainEquipmentManageService.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, TrainEquipmentManageEntity entity)
+        {
+            try
+            {
+                trainEquipmentManageService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageEntity.cs
new file mode 100644
index 000000000..1cf68cff1
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageEntity.cs	
@@ -0,0 +1,85 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 10:49
+    /// 描 述：实训设备管理
+    /// </summary>
+    public class TrainEquipmentManageEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 专业部
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 实训室名称
+        /// </summary>
+        [Column("TRAINNAME")]
+        public string TrainName { get; set; }
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        [Column("EQUIPMENTNAME")]
+        public string EquipmentName { get; set; }
+        /// <summary>
+        /// 设备型号
+        /// </summary>
+        [Column("EQUIPMENTMODEL")]
+        public string EquipmentModel { get; set; }
+        /// <summary>
+        /// 新增
+        /// </summary>
+        [Column("ADDNUM")]
+        public string AddNum { get; set; }
+        /// <summary>
+        /// 损耗
+        /// </summary>
+        [Column("LOSSNUM")]
+        public string LossNum { get; set; }
+        /// <summary>
+        /// 现存
+        /// </summary>
+        [Column("EXISTNUM")]
+        public string ExistNum { get; set; }
+        /// <summary>
+        /// 设备金额
+        /// </summary>
+        [Column("EQUIPMENTMONEY")]
+        public decimal? EquipmentMoney { 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
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageIBLL.cs
new file mode 100644
index 000000000..0a94566f1
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageIBLL.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 10:49
+    /// 描 述：实训设备管理
+    /// </summary>
+    public interface TrainEquipmentManageIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<TrainEquipmentManageEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取TrainEquipmentManage表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        TrainEquipmentManageEntity GetTrainEquipmentManageEntity(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, TrainEquipmentManageEntity entity);
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageService.cs
new file mode 100644
index 000000000..4453a07cd
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TrainEquipmentManage/TrainEquipmentManageService.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 10:49
+    /// 描 述：实训设备管理
+    /// </summary>
+    public class TrainEquipmentManageService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TrainEquipmentManageEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM TrainEquipmentManage t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["TrainName"].IsEmpty())
+                {
+                    dp.Add("TrainName", "%" + queryParam["TrainName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.TrainName Like @TrainName ");
+                }
+                if (!queryParam["EquipmentName"].IsEmpty())
+                {
+                    dp.Add("EquipmentName", "%" + queryParam["EquipmentName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.EquipmentName Like @EquipmentName ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<TrainEquipmentManageEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TrainEquipmentManage表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TrainEquipmentManageEntity GetTrainEquipmentManageEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<TrainEquipmentManageEntity>(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<TrainEquipmentManageEntity>(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, TrainEquipmentManageEntity 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
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
index 61210c76b..753554d6c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
@@ -1898,6 +1898,22 @@
     <Compile Include="PersonnelManagement\TeachManagement\TeachManagementService.cs" />
     <Compile Include="PersonnelManagement\TeachManagement\TeachManagementBLL.cs" />
     <Compile Include="PersonnelManagement\TeachManagement\TeachManagementIBLL.cs" />
+    <Compile Include="PersonnelManagement\EvaluateTeachLearn\EvaluateTeachLearnEntity.cs" />
+    <Compile Include="PersonnelManagement\EvaluateTeachLearn\EvaluateTeachLearnService.cs" />
+    <Compile Include="PersonnelManagement\EvaluateTeachLearn\EvaluateTeachLearnBLL.cs" />
+    <Compile Include="PersonnelManagement\EvaluateTeachLearn\EvaluateTeachLearnIBLL.cs" />
+    <Compile Include="PersonnelManagement\ClassPatrol\ClassPatrolEntity.cs" />
+    <Compile Include="PersonnelManagement\ClassPatrol\ClassPatrolService.cs" />
+    <Compile Include="PersonnelManagement\ClassPatrol\ClassPatrolBLL.cs" />
+    <Compile Include="PersonnelManagement\ClassPatrol\ClassPatrolIBLL.cs" />
+    <Compile Include="EducationalAdministration\StuGraduateStatistic\StuGraduateStatisticEntity.cs" />
+    <Compile Include="EducationalAdministration\StuGraduateStatistic\StuGraduateStatisticService.cs" />
+    <Compile Include="EducationalAdministration\StuGraduateStatistic\StuGraduateStatisticBLL.cs" />
+    <Compile Include="EducationalAdministration\StuGraduateStatistic\StuGraduateStatisticIBLL.cs" />
+    <Compile Include="EducationalAdministration\TrainEquipmentManage\TrainEquipmentManageEntity.cs" />
+    <Compile Include="EducationalAdministration\TrainEquipmentManage\TrainEquipmentManageService.cs" />
+    <Compile Include="EducationalAdministration\TrainEquipmentManage\TrainEquipmentManageBLL.cs" />
+    <Compile Include="EducationalAdministration\TrainEquipmentManage\TrainEquipmentManageIBLL.cs" />
     <Compile Include="EducationalAdministration\StudentCertificate\StudentCertificateEntity.cs" />
     <Compile Include="EducationalAdministration\StudentCertificate\StudentCertificateService.cs" />
     <Compile Include="EducationalAdministration\StudentCertificate\StudentCertificateBLL.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolBLL.cs
new file mode 100644
index 000000000..4e7670a51
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolBLL.cs	
@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public class ClassPatrolBLL : ClassPatrolIBLL
+    {
+        private ClassPatrolService classPatrolService = new ClassPatrolService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ClassPatrolEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return classPatrolService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ClassPatrol表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ClassPatrolEntity GetClassPatrolEntity(string keyValue)
+        {
+            try
+            {
+                return classPatrolService.GetClassPatrolEntity(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
+            {
+                classPatrolService.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, ClassPatrolEntity entity)
+        {
+            try
+            {
+                classPatrolService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolEntity.cs
new file mode 100644
index 000000000..db57cf084
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolEntity.cs	
@@ -0,0 +1,95 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public class ClassPatrolEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
+        [Column("TIME")]
+        public DateTime? Time { get; set; }
+        /// <summary>
+        /// 课节
+        /// </summary>
+        [Column("SECTION")]
+        public string Section { get; set; }
+        /// <summary>
+        /// 教师
+        /// </summary>
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary>
+        /// 科目
+        /// </summary>
+        [Column("LESSONNO")]
+        public string LessonNo { get; set; }
+        /// <summary>
+        /// 情况记载
+        /// </summary>
+        [Column("RECORDS")]
+        public string Records { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// CreateUserId
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// ModifyUserId
+        /// </summary>
+        [Column("MODIFYUSERID")]
+        public string ModifyUserId { get; set; }
+        /// <summary>
+        /// ModifyTime
+        /// </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
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolIBLL.cs
new file mode 100644
index 000000000..71b222941
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolIBLL.cs	
@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public interface ClassPatrolIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ClassPatrolEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取ClassPatrol表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        ClassPatrolEntity GetClassPatrolEntity(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, ClassPatrolEntity entity);
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolService.cs
new file mode 100644
index 000000000..e68f45e00
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolService.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.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public class ClassPatrolService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ClassPatrolEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM ClassPatrol t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Section"].IsEmpty())
+                {
+                    dp.Add("Section", "%" + queryParam["Section"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Section Like @Section ");
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo",queryParam["EmpNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpNo = @EmpNo ");
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    dp.Add("LessonNo",queryParam["LessonNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.LessonNo = @LessonNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<ClassPatrolEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ClassPatrol表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ClassPatrolEntity GetClassPatrolEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<ClassPatrolEntity>(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<ClassPatrolEntity>(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, ClassPatrolEntity 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
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleBLL.cs
index 45ae9380c..736a0b307 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleBLL.cs	
@@ -66,6 +66,28 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns>返回列表</returns>
+        public IEnumerable<DutyScheduleEntity> GetList()
+        {
+            try
+            {
+                return dutyScheduleService.GetList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleIBLL.cs
index a3120c615..4b456ae07 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleIBLL.cs	
@@ -27,6 +27,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         DutyScheduleEntity GetDutyScheduleEntity(string keyValue);
+        /// <summary>
+        /// 获取所有数据
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<DutyScheduleEntity> GetList();
+
         #endregion
 
         #region  提交数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs
index c660b036e..e9db34110 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs	
@@ -28,21 +28,27 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
+                var adms = this.BaseRepository().getDbConnection().Database;
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.StartTime,
-                t.EndTime,
-                t.Person,
-                t.Remark,u.F_Account,F_RealName
-                ");
-                strSql.Append("  FROM DutySchedule t left join adms7ultimate2.dbo.LR_Base_User u on t.Person=u.F_UserId ");
+                strSql.Append(@" t.* ,u.F_Account,u.F_RealName ");
+                strSql.Append($"  FROM DutySchedule t left join {adms}.dbo.LR_Base_User u on t.Person=u.F_UserId ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                return this.BaseRepository("CollegeMIS").FindList<DutyScheduleEntity>(strSql.ToString(),dp, pagination);
+                if (!queryParam["keyword"].IsEmpty())
+                {
+                    dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND  u.F_RealName Like @keyword ");
+                }
+                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.StartTime >= @startTime AND t.EndTime <= @endTime ) ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<DutyScheduleEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -81,6 +87,29 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns>返回列表</returns>
+        public IEnumerable<DutyScheduleEntity> GetList()
+        {
+            try
+            {
+                var adms = this.BaseRepository().getDbConnection().Database;
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" t.*, u.F_Account,F_RealName ");
+                strSql.Append($"  FROM DutySchedule t left join {adms}.dbo.LR_Base_User u on t.Person=u.F_UserId ");
+                return this.BaseRepository("CollegeMIS").FindList<DutyScheduleEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                    throw;
+                else
+                    throw ExceptionEx.ThrowServiceException(ex);
+            }
+        }
         #endregion
 
         #region  提交数据
@@ -94,7 +123,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<DutyScheduleEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<DutyScheduleEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -126,6 +155,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 else
                 {
                     entity.Create();
+                    entity.CreateTime = DateTime.Now;
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnBLL.cs
new file mode 100644
index 000000000..26860100c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnBLL.cs	
@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-24 14:38
+    /// 描 述：评教评学
+    /// </summary>
+    public class EvaluateTeachLearnBLL : EvaluateTeachLearnIBLL
+    {
+        private EvaluateTeachLearnService evaluateTeachLearnService = new EvaluateTeachLearnService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<EvaluateTeachLearnEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return evaluateTeachLearnService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取EvaluateTeachLearn表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public EvaluateTeachLearnEntity GetEvaluateTeachLearnEntity(string keyValue)
+        {
+            try
+            {
+                return evaluateTeachLearnService.GetEvaluateTeachLearnEntity(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
+            {
+                evaluateTeachLearnService.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, EvaluateTeachLearnEntity entity)
+        {
+            try
+            {
+                evaluateTeachLearnService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnEntity.cs
new file mode 100644
index 000000000..2f31c025f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnEntity.cs	
@@ -0,0 +1,90 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-24 14:38
+    /// 描 述：评教评学
+    /// </summary>
+    public class EvaluateTeachLearnEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// EmpNo
+        /// </summary>
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary>
+        /// AcademicYearNo
+        /// </summary>
+        [Column("ACADEMICYEARNO")]
+        public string AcademicYearNo { get; set; }
+        /// <summary>
+        /// Semester
+        /// </summary>
+        [Column("SEMESTER")]
+        public string Semester { get; set; }
+        /// <summary>
+        /// SatisfacteRate
+        /// </summary>
+        [Column("SATISFACTERATE")]
+        public string SatisfacteRate { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// CreateUserId
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// ModifyUserId
+        /// </summary>
+        [Column("MODIFYUSERID")]
+        public string ModifyUserId { get; set; }
+        /// <summary>
+        /// ModifyTime
+        /// </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
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnIBLL.cs
new file mode 100644
index 000000000..51bb08de6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnIBLL.cs	
@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-24 14:38
+    /// 描 述：评教评学
+    /// </summary>
+    public interface EvaluateTeachLearnIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<EvaluateTeachLearnEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取EvaluateTeachLearn表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        EvaluateTeachLearnEntity GetEvaluateTeachLearnEntity(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, EvaluateTeachLearnEntity entity);
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnService.cs
new file mode 100644
index 000000000..16372de3b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EvaluateTeachLearn/EvaluateTeachLearnService.cs	
@@ -0,0 +1,161 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-24 14:38
+    /// 描 述：评教评学
+    /// </summary>
+    public class EvaluateTeachLearnService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<EvaluateTeachLearnEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM EvaluateTeachLearn t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo",queryParam["EmpNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpNo = @EmpNo ");
+                }
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Semester = @Semester ");
+                }
+                if (!queryParam["SatisfacteRate"].IsEmpty())
+                {
+                    dp.Add("SatisfacteRate", "%" + queryParam["SatisfacteRate"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.SatisfacteRate Like @SatisfacteRate ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<EvaluateTeachLearnEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取EvaluateTeachLearn表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public EvaluateTeachLearnEntity GetEvaluateTeachLearnEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<EvaluateTeachLearnEntity>(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<EvaluateTeachLearnEntity>(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, EvaluateTeachLearnEntity 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
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs
index a1efe6134..125bcef3d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs	
@@ -237,6 +237,25 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
+        public void ReceivedList(string processId)
+        {
+            try
+            {
+                meetingManagementService.ReceivedList(processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        
         #endregion
 
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs
index afd1b1318..ef3282473 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs	
@@ -76,6 +76,9 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         void ChangeStatusByProcessId(string processId, string status, string userId);
+
+        void ReceivedList(string processId);
+
         #endregion
 
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs
index c064e357c..aec855ffb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs	
@@ -1,11 +1,19 @@
 using Dapper;
 using Learun.Application.Organization;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.TwoDevelopment.LR_Desktop;
 using Learun.DataBase.Repository;
 using Learun.Util;
+using Microsoft.AspNet.SignalR.Client;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
+using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
+using System.Web;
 
 namespace Learun.Application.TwoDevelopment.PersonnelManagement
 {
@@ -467,7 +475,112 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        public void ReceivedList(string processId)
+        {
+            var Received = GetMeetingManagementEntityByProcessId(processId);
+            List<UserEntity> userInfos = new List<UserEntity>();
+            foreach (var rid in Received.InternalParticipants.Split(','))
+            {
+                var user = this.BaseRepository().FindEntity<UserEntity>(m => m.F_UserId == rid);
+                if (!userInfos.Contains(user))
+                {
+                    userInfos.Add(user);
+                }
+            }
+            if (!string.IsNullOrEmpty(Received.RecordPerson))
+            {
+                foreach (var rid in Received.RecordPerson.Split(','))
+                {
+                    var user = this.BaseRepository().FindEntity<UserEntity>(m => m.F_UserId == rid);
+                    if (!userInfos.Contains(user))
+                    {
+                        userInfos.Add(user);
+                    }
+                }
+            }
+            //foreach (var uitem in userInfos)
+            //{
+            //    SYS_ReceiveMessageEntity receiveMessageEntity = new SYS_ReceiveMessageEntity();
+            //    receiveMessageEntity.Create();
+            //    receiveMessageEntity.SENDERID = Received.SENDERID;
+            //    receiveMessageEntity.SENDER = messageentity.SENDER;
+            //    receiveMessageEntity.RECEIVERID = uitem.F_UserId;
+            //    receiveMessageEntity.RECEIVER = uitem.F_RealName;
+            //    receiveMessageEntity.TITLE = messageentity.TITLE;
+            //    receiveMessageEntity.CONTENTS = messageentity.CONTENTS;
+            //    receiveMessageEntity.URL = messageentity.URL;
+            //    receiveMessageEntity.READFLAG = 0;
+            //    receiveMessageEntity.SENDTIME = DateTime.Now;
+            //    receiveMessageEntity.DelFlag = false;
+            //    this.BaseRepository().Insert(receiveMessageEntity);
+            //}
+
+            //读取信息推送管理-会议申请推送（03）的配置
+            var informationPushEntity = this.BaseRepository().FindEntity<Sys_InformationPushEntity>(x => x.PushItem == "03");
+            if (informationPushEntity != null && informationPushEntity.Status == true)
+            {
+                //微信推送
+                try
+                {
+                    PushWeixin(userInfos, Received.MeetingTitle);
+                }
+                catch (Exception e)
+                {
+                }
+                //飞星推送
+                Task.Run(async () =>
+                {
+                    using (var hubConnection = new HubConnection(ConfigurationManager.AppSettings["CommunicationServeraddress"]))
+                    {
+                        var hubProxy = hubConnection.CreateHubProxy("SignalRHub");
+                        await hubConnection.Start();
+                        await hubProxy.Invoke("PushAnnouncement", Received.InternalParticipants, Received.MeetingTitle, Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Received.Content)).Length < 20 ? Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Received.Content)) : Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(Received.Content)).Substring(0, 20), "mail", string.Join(",", userInfos.Select(m => m.F_UserId)), "");
+                    }
+                });
+            }
+        }
 
+        public void PushWeixin(List<UserEntity> needpostuserlist, string title)
+        {
+            var WeChatConfigentity = BaseRepository().FindEntity<WeChatConfigEntity>(m => m.IsEnable == true);
+            string appid = WeChatConfigentity.APPId;
+            string secret = WeChatConfigentity.secret;
+            var wechatemplete = BaseRepository()
+                .FindEntity<WeChatTemplateEntity>(m => m.WeID == WeChatConfigentity.ID && m.TCode == "task");
+            string weixintaskurl = wechatemplete.TUrl;
+            string weixintasktempid = wechatemplete.TempId;
+            var responsejson = Util.HttpMethods.HttpGet("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret);
+            foreach (UserEntity userinfo in needpostuserlist)
+            {
+                if (userinfo != null && !string.IsNullOrEmpty(userinfo.OpenIdForWeixin))
+                {
+                    //执行推送任务
+                    if (!string.IsNullOrEmpty(appid) && !string.IsNullOrEmpty(secret) && !string.IsNullOrEmpty(weixintaskurl) && !string.IsNullOrEmpty(weixintasktempid))
+                    {
+                        if (!string.IsNullOrEmpty(responsejson))
+                        {
+                            var weixintokenobj = JsonConvert.DeserializeObject<dynamic>(responsejson);
+                            if (string.IsNullOrEmpty(weixintokenobj.errcode))
+                            {
+                                string access_token = weixintokenobj.access_token;
+                                string jsondata = "{\"touser\":\"" + userinfo.OpenIdForWeixin + "\"," +
+                                "\"template_id\":\"" + weixintasktempid + "\"," +
+                                "\"url\":\"" + weixintaskurl + "/#/?page=mail\"," +
+                                "\"data\":{" +
+                                "\"first\": {\"value\":\"您有新的会议消息\",\"color\":\"#173177\"}," +
+                                "\"keyword1\":{\"value\":\"未读邮件\",\"color\":\"#173177\"}," +
+                                "\"keyword2\": {\"value\":\"" + title + "\",\"color\":\"#173177\"}," +
+                                "\"keyword3\": {\"value\":\"待查看\",\"color\":\"#173177\"}," +
+                                "\"keyword4\": {\"value\":\"您有新的未读会议【" + title + "】\",\"color\":\"#173177\"}" +
+                                "}" +
+                            "}";
+                                string pushresult = Util.HttpMethods.HttpPost("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + access_token, jsondata);
+                            }
+                        }
+                    }
+                }
+            }
+        }
         #endregion
 
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs
index f74004cf0..5a7f35d06 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs	
@@ -222,6 +222,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 if (meetEntity != null)
                 {
                     meetEntity.IsSignIn = true;
+                    meetEntity.SignInTime = DateTime.Now;
                     this.BaseRepository("CollegeMIS").Update(meetEntity);
                     result = true;
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/MeetingManagementApplyMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/MeetingManagementApplyMethod.cs
index 55ee0ae70..9885a02bd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/MeetingManagementApplyMethod.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/MeetingManagementApplyMethod.cs	
@@ -1,9 +1,4 @@
 using Learun.Application.TwoDevelopment.PersonnelManagement;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Learun.Application.WorkFlow
 {
@@ -17,6 +12,7 @@ namespace Learun.Application.WorkFlow
             if (parameter.code == "agree")
             {
                 meetingManagementIBLL.ChangeStatusByProcessId(parameter.processId, "1", parameter.userId);
+                meetingManagementIBLL.ReceivedList(parameter.processId);
             }
             else
             {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js
index 791f44fb2..55fe2542c 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js	
@@ -24,274 +24,310 @@ import moment from 'moment'
  */
 
 export default {
-  methods: {
-    /**
-     * 获取一个 scheme 表单项的源数据 （加载表单时使用）
-     * 参数: 单个 schemeItem
-     *
-     * radio、select、checkbox、layer 这四种表单项，需要加载额外的选单数据
-     * 选单数据有两种获取方式：
-     * 1、来自数据字典：
-     *    数据字典在 this.GET_GLOBAL('dataDictionary')
-     *    表单使用的字段在 schemeItem.itemCode
-     *    选单数据中的 text 字段作为显示， value 字段作为值
-     * 
-     * 2、来自数据源：
-     *    将 schemeItem.dataSourceId 按符号「,」逗号分割为数组，分割为： [code, displayField, valueField]
-     *    数据源需要请求 API 来获取，请求需要带上数据源的编号 code
-     *    displayField、valueField 分别为展示字段和值绑定字段
-     *
-     * 选单数据有两种格式：
-     * 1、对于 radio、select、checkbox 来说：
-     *    只需要一个数组，数组形如： [{ text: '选项文字', value: '选项值' }, ...]
-     *    将获取的数据绑定到组件的 range 属性上即可
-     *    全局数据中默认是对象形式，使用 Object.values() 转化即可
-     * 
-     * 2、对于 layer 来说:
-     *    返回一个对象，形如 { source, layerData, selfField }
-     *    source： 为弹层中列出的数据，是一个数组
-     *    layerData： 需要在弹层窗口中展示的字段及标题文字，形如： [{ name:'要展示的字段名', label:'标题文字' }]
-     *    selfField： 该表单值绑定哪个字段，默认为绑定到自身的字段
-     */
-    async getSourceData(schemeItem) {
-      if (['radio', 'select', 'checkbox'].includes(schemeItem.type)) {
-        // radio select checkbox 三种情况
-        if (!schemeItem.dataSource || Number(schemeItem.dataSource) === 0) {
-          // dataSource 为 0,使用 clientData
-          return Object
-            .values(this.GET_GLOBAL('dataDictionary')[schemeItem.itemCode])
-            .map(t => ({ value: t.value, text: t.text }))
-
-        } else {
-          // dataSource 不为 0,使用数据源,需要请求接口,并且提取出显示字段和实际字段
-          const [code, displayField = schemeItem.showField, valueField = schemeItem.saveField] = schemeItem.dataSourceId
-            .split(',')
-          const sourceData = await this.FETCH_DATASOURCE(code)
-          if (!sourceData) { return [] }
-
-          return sourceData.data.map(t => ({ text: t[displayField], value: t[valueField] }))
-        }
-
-      } else if (['layer'].includes(schemeItem.type)) {
-        // layer 需要更多属性
-        if (!schemeItem.dataSource || Number(schemeItem.dataSource) === 0) {
-          // dataSource 为 0,使用 clientData
-          // clientData 对象转数组后,隐含 key:item.text 和 value:item.value 的关系
-          const [keyItem, valueItem] = schemeItem.layerData
-          const source = Object
-            .values(this.GET_GLOBAL('dataDictionary')[schemeItem.itemCode])
-            .map(t => ({ value: t.value, text: t.text }))
-
-          return {
-            source,
-            layerData: [
-              { name: 'text', label: keyItem.label || '', value: keyItem.value || '' },
-              { name: 'value', label: valueItem.label || '', value: valueItem.value || '' }
-            ]
-          }
-        } else {
-          // dataSource 不为 0,使用数据源,需要请求接口,并且提取出显示字段和实际字段
-          const [code] = schemeItem.dataSourceId.split(',')
-          const sourceData = await this.FETCH_DATASOURCE(code)
-          if (!sourceData) { return [] }
-
-          const source = sourceData.data
-
-          return { source, layerData: schemeItem.layerData.filter(t => (!t.hide) && (t.value || t.label)) }
-        }
-      }
-
-      return []
-    },
-
-    /**
-     * 获取一个 scheme 表单项的默认值 （用户新建表单时使用，或是编辑草稿）
-     * 参数: 单个 schemeItem , { processId }
-     *
-     * 每种类别的表单项分别获取的默认值：
-     * 
-     * currentInfo： 根据类别取当前用户/部门/公司/时间日期
-     * datetime： 根据 dfValue 字段表示昨天/今天/明天，格式化为字符串
-     * radio、select： 有 dfValue 则使用，否则取第一条
-     * checkbox： 有 dfValue 则使用，否则为空数组
-     * encode： 根据 rulecode 请求表单编码
-     * upload： 空数组
-     * guid： 赋值第二个参数中的 processId，但是如果在子表格中，赋空字符串
-     * girdtable： 递归所有表格项 scheme 依次为它们生成默认值
-     * datetimerange： 字符串 0
-     */
-    async getDefaultData(item, prop) {
-      const { processId } = prop
-      switch (item.type) {
-        case 'currentInfo':
-          switch (item.dataType) {
-            case 'user':
-              return this.GET_GLOBAL('loginUser').userId
-            case 'department':
-              return this.GET_GLOBAL('loginUser').departmentId
-            case 'company':
-              return this.GET_GLOBAL('loginUser').companyId
-            case 'time':
-              return moment().format('YYYY-MM-DD HH:mm:ss')
-            default:
-              return ''
-          }
-
-        case 'datetime':
-          const datetimeFormat = item.table ?
-            (Number(item.dateformat) === 0 ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss') :
-            (item.datetime === 'datetime' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')
-          const today = moment()
-          const dfDatetime = [
-            today.subtract(1, 'day'),
-            today,
-            today.add(1, 'day')
-          ][Number(item.dfvalue)] || today
-
-          return dfDatetime.format(datetimeFormat) || ''
-
-        case 'radio':
-        case 'select':
-          const radioItem = item.__sourceData__.find(t => t.value === item.dfvalue) || item.__sourceData__[0]
-          return item.type === 'radio' ? radioItem.value : ''
-
-        case 'checkbox':
-          if (!item.dfvalue) {
-            return []
-          }
-          return item.dfvalue.split(',').filter(t => item.__sourceData__.find(s => s.value === t))
-
-        case 'encode':
-          const result = await this.FETCH_ENCODE(item.rulecode)
-          return result
-
-        case 'upload':
-          return []
-
-        case 'guid':
-          return item.table ? processId : ''
-
-        case 'girdtable':
-          const tableItemObj = {}
-          for (const fieldItem of item.fieldsData) {
-            tableItemObj[fieldItem.field] = await this.getDefaultData(fieldItem, prop)
-          }
-          return this.COPY(tableItemObj)
-
-        case 'datetimerange':
-          return '0'
-
-        default:
-          return item.dfvalue || ''
-      }
-    },
-
-    /**
-     * 将单条 formData 值转化为 formValue 值 （拉取表单数据时使用）
-     * 参数: 单个 schemeItem , 数据值
-     *
-     * 具体执行逻辑：
-     * radio、select： 剔除无效值
-     * checkbox： 分割成数组并剔除无效值
-     * upload： 分割成数组，拉取其中所有文件的信息
-     * datetime： 按照时间日期格式进行格式化字符串
-     * 其他类型： 保留原值
-     */
-    async convertToFormValue(item, val) {
-      switch (item.type) {
-        case 'upload':
-          if (!val) { return [] }
-          const uidList = val.split(',')
-          const fileList = []
-
-          for (const uid of uidList || []) {
-            const fileInfo = await this.FETCH_FILEINFO(uid)
-            if (!fileInfo) { continue }
-
-            const fileType = fileInfo.F_FileType
-            const fileSize = fileInfo.F_FileSize
-
-            const path = this.API + '/annexes/wxdown?' + this.URL_QUERY(uid, true)
-
-            fileList.push({ path, type: fileType, uid, size: fileSize })
-          }
-          return fileList
-
-        case 'select':
-        case 'radio':
-          if (!val || !item.__sourceData__.map(t => t.value).includes(val)) {
-            return ''
-          }
-          return val
-
-        case 'checkbox':
-          const validValue = item.__sourceData__.map(t => t.value)
-          const checkboxVal = val.split(',') || []
-          return checkboxVal.filter(t => validValue.includes(t))
-
-        case 'datetime':
-          if (!val) {
-            return ''
-          }
-          return moment(val).format(
-            Number(item.dateformat) === 0 || item.datetime === 'date' ?
-            'YYYY-MM-DD' :
-            'YYYY-MM-DD HH:mm:ss'
-          )
-
-        default:
-          return val || ''
-      }
-    },
-
-    /**
-     * 将一个 formValue 值转化为 post 提交值（提交表单数据时使用）
-     * 参数: 单个 schemeItem , 表单项值 , 所有 formValue , scheme
-     *
-     * 具体执行逻辑：
-     * checkbox： 将数组使用符号「,」逗号拼接成字符串
-     * datetimerange： 获取开始日期、结束日期，计算差值天数并保留整数
-     * datetime： 格式化为完整时间日期字符串
-     * upload： 依次上传文件，将返回的文件 ID 使用符号「,」逗号拼接成字符串
-     * 其他类型： 保留原值
-     */
-    async convertToPostData(item, val, formValue, scheme) {
-      switch (item.type) {
-        case 'checkbox':
-          return val ? val.join(',') : ''
-
-        case 'datetimerange':
-          const startTime = get(formValue, scheme.find(t => t.id === item.startTime).__valuePath__, null)
-          const endTime = get(formValue, scheme.find(t => t.id === item.endTime).__valuePath__, null)
-          if (!startTime || !endTime || moment(endTime).isBefore(startTime)) {
-            return ''
-          } else {
-            return moment.duration(moment(endTime).diff(moment(startTime))).asDays().toFixed(0)
-          }
-
-        case 'datetime':
-          return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : ''
-
-        case 'upload':
-          const uploadUid = []
-		  
-          for (const item of val) {
-            if (item.uid) {
-              uploadUid.push(item.uid)
-              continue
-            }
-			
-            const fileId = await this.HTTP_UPLOAD(item.path||item)
-            if (fileId) {
-              uploadUid.push(fileId)
-            }
-          }
-
-          return uploadUid.join(',')
-
-        default:
-          return val || ''
-      }
-    }
-  }
+	methods: {
+		/**
+		 * 获取一个 scheme 表单项的源数据 （加载表单时使用）
+		 * 参数: 单个 schemeItem
+		 *
+		 * radio、select、checkbox、layer 这四种表单项，需要加载额外的选单数据
+		 * 选单数据有两种获取方式：
+		 * 1、来自数据字典：
+		 *    数据字典在 this.GET_GLOBAL('dataDictionary')
+		 *    表单使用的字段在 schemeItem.itemCode
+		 *    选单数据中的 text 字段作为显示， value 字段作为值
+		 * 
+		 * 2、来自数据源：
+		 *    将 schemeItem.dataSourceId 按符号「,」逗号分割为数组，分割为： [code, displayField, valueField]
+		 *    数据源需要请求 API 来获取，请求需要带上数据源的编号 code
+		 *    displayField、valueField 分别为展示字段和值绑定字段
+		 *
+		 * 选单数据有两种格式：
+		 * 1、对于 radio、select、checkbox 来说：
+		 *    只需要一个数组，数组形如： [{ text: '选项文字', value: '选项值' }, ...]
+		 *    将获取的数据绑定到组件的 range 属性上即可
+		 *    全局数据中默认是对象形式，使用 Object.values() 转化即可
+		 * 
+		 * 2、对于 layer 来说:
+		 *    返回一个对象，形如 { source, layerData, selfField }
+		 *    source： 为弹层中列出的数据，是一个数组
+		 *    layerData： 需要在弹层窗口中展示的字段及标题文字，形如： [{ name:'要展示的字段名', label:'标题文字' }]
+		 *    selfField： 该表单值绑定哪个字段，默认为绑定到自身的字段
+		 */
+		async getSourceData(schemeItem) {
+			if (['radio', 'select', 'checkbox'].includes(schemeItem.type)) {
+				// radio select checkbox 三种情况
+				if (!schemeItem.dataSource || Number(schemeItem.dataSource) === 0) {
+					// dataSource 为 0,使用 clientData
+					return Object
+						.values(this.GET_GLOBAL('dataDictionary')[schemeItem.itemCode])
+						.map(t => ({
+							value: t.value,
+							text: t.text
+						}))
+
+				} else {
+					// dataSource 不为 0,使用数据源,需要请求接口,并且提取出显示字段和实际字段
+					const [code, displayField = schemeItem.showField, valueField = schemeItem.saveField] =
+					schemeItem.dataSourceId
+						.split(',')
+					const sourceData = await this.FETCH_DATASOURCE(code)
+					if (!sourceData) {
+						return []
+					}
+
+					return sourceData.data.map(t => ({
+						text: t[displayField],
+						value: t[valueField]
+					}))
+				}
+
+			} else if (['layer'].includes(schemeItem.type)) {
+				// layer 需要更多属性
+				if (!schemeItem.dataSource || Number(schemeItem.dataSource) === 0) {
+					// dataSource 为 0,使用 clientData
+					// clientData 对象转数组后,隐含 key:item.text 和 value:item.value 的关系
+					const [keyItem, valueItem] = schemeItem.layerData
+					const source = Object
+						.values(this.GET_GLOBAL('dataDictionary')[schemeItem.itemCode])
+						.map(t => ({
+							value: t.value,
+							text: t.text
+						}))
+
+					return {
+						source,
+						layerData: [{
+								name: 'text',
+								label: keyItem.label || '',
+								value: keyItem.value || ''
+							},
+							{
+								name: 'value',
+								label: valueItem.label || '',
+								value: valueItem.value || ''
+							}
+						]
+					}
+				} else {
+					// dataSource 不为 0,使用数据源,需要请求接口,并且提取出显示字段和实际字段
+					const [code] = schemeItem.dataSourceId.split(',')
+					const sourceData = await this.FETCH_DATASOURCE(code)
+					if (!sourceData) {
+						return []
+					}
+
+					const source = sourceData.data
+
+					return {
+						source,
+						layerData: schemeItem.layerData.filter(t => (!t.hide) && (t.value || t.label))
+					}
+				}
+			}
+
+			return []
+		},
+
+		/**
+		 * 获取一个 scheme 表单项的默认值 （用户新建表单时使用，或是编辑草稿）
+		 * 参数: 单个 schemeItem , { processId }
+		 *
+		 * 每种类别的表单项分别获取的默认值：
+		 * 
+		 * currentInfo： 根据类别取当前用户/部门/公司/时间日期
+		 * datetime： 根据 dfValue 字段表示昨天/今天/明天，格式化为字符串
+		 * radio、select： 有 dfValue 则使用，否则取第一条
+		 * checkbox： 有 dfValue 则使用，否则为空数组
+		 * encode： 根据 rulecode 请求表单编码
+		 * upload： 空数组
+		 * guid： 赋值第二个参数中的 processId，但是如果在子表格中，赋空字符串
+		 * girdtable： 递归所有表格项 scheme 依次为它们生成默认值
+		 * datetimerange： 字符串 0
+		 */
+		async getDefaultData(item, prop) {
+			const {
+				processId
+			} = prop
+			switch (item.type) {
+				case 'currentInfo':
+					switch (item.dataType) {
+						case 'user':
+							return this.GET_GLOBAL('loginUser').userId
+						case 'department':
+							return this.GET_GLOBAL('loginUser').departmentId
+						case 'company':
+							return this.GET_GLOBAL('loginUser').companyId
+						case 'time':
+							return moment().format('YYYY-MM-DD HH:mm:ss')
+						default:
+							return ''
+					}
+
+					case 'datetime':
+						const datetimeFormat = item.table ?
+							(Number(item.dateformat) === 0 ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss') :
+							(item.datetime === 'datetime' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')
+						const today = moment()
+						const dfDatetime = [
+							today.subtract(1, 'day'),
+							today,
+							today.add(1, 'day')
+						][Number(item.dfvalue)] || today
+
+						return dfDatetime.format(datetimeFormat) || ''
+
+					case 'radio':
+					case 'select':
+						const radioItem = item.__sourceData__.find(t => t.value === item.dfvalue) || item
+							.__sourceData__[0]
+						return item.type === 'radio' ? radioItem.value : ''
+
+					case 'checkbox':
+						if (!item.dfvalue) {
+							return []
+						}
+						return item.dfvalue.split(',').filter(t => item.__sourceData__.find(s => s.value === t))
+
+					case 'encode':
+						const result = await this.FETCH_ENCODE(item.rulecode)
+						return result
+
+					case 'upload':
+						return []
+
+					case 'guid':
+						return item.table ? processId : ''
+
+					case 'girdtable':
+						const tableItemObj = {}
+						for (const fieldItem of item.fieldsData) {
+							tableItemObj[fieldItem.field] = await this.getDefaultData(fieldItem, prop)
+						}
+						return this.COPY(tableItemObj)
+
+					case 'datetimerange':
+						return '0'
+
+					default:
+						return item.dfvalue || ''
+			}
+		},
+
+		/**
+		 * 将单条 formData 值转化为 formValue 值 （拉取表单数据时使用）
+		 * 参数: 单个 schemeItem , 数据值
+		 *
+		 * 具体执行逻辑：
+		 * radio、select： 剔除无效值
+		 * checkbox： 分割成数组并剔除无效值
+		 * upload： 分割成数组，拉取其中所有文件的信息
+		 * datetime： 按照时间日期格式进行格式化字符串
+		 * 其他类型： 保留原值
+		 */
+		async convertToFormValue(item, val) {
+			switch (item.type) {
+				case 'upload':
+					if (!val) {
+						return []
+					}
+					const uidList = val;
+					const fileList = []
+					const wxlist = await this.FETCH_FILEList(uidList);
+					for (const wxfile of wxlist) {
+						const fileInfo = await this.FETCH_FILEINFO(wxfile.F_Id)
+						if (!fileInfo) {
+							continue
+						}
+
+						const fileType = fileInfo.F_FileType
+						const fileSize = fileInfo.F_FileSize
+
+						const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(wxfile.F_Id, true)
+						fileList.push({
+							path,
+							type: fileType,
+							uid:wxfile.F_Id,
+							folderId:wxfile.F_FolderId,
+							size: fileSize
+						})
+					}
+					return fileList
+
+				case 'select':
+				case 'radio':
+					if (!val || !item.__sourceData__.map(t => t.value).includes(val)) {
+						return ''
+					}
+					return val
+
+				case 'checkbox':
+					const validValue = item.__sourceData__.map(t => t.value)
+					const checkboxVal = val.split(',') || []
+					return checkboxVal.filter(t => validValue.includes(t))
+
+				case 'datetime':
+					if (!val) {
+						return ''
+					}
+					return moment(val).format(
+						Number(item.dateformat) === 0 || item.datetime === 'date' ?
+						'YYYY-MM-DD' :
+						'YYYY-MM-DD HH:mm:ss'
+					)
+
+				default:
+					return val || ''
+			}
+		},
+
+		/**
+		 * 将一个 formValue 值转化为 post 提交值（提交表单数据时使用）
+		 * 参数: 单个 schemeItem , 表单项值 , 所有 formValue , scheme
+		 *
+		 * 具体执行逻辑：
+		 * checkbox： 将数组使用符号「,」逗号拼接成字符串
+		 * datetimerange： 获取开始日期、结束日期，计算差值天数并保留整数
+		 * datetime： 格式化为完整时间日期字符串
+		 * upload： 依次上传文件，将返回的文件 ID 使用符号「,」逗号拼接成字符串
+		 * 其他类型： 保留原值
+		 */
+		async convertToPostData(item, val, formValue, scheme, guid) {
+			switch (item.type) {
+				case 'checkbox':
+					return val ? val.join(',') : ''
+
+				case 'datetimerange':
+					const startTime = get(formValue, scheme.find(t => t.id === item.startTime).__valuePath__, null)
+					const endTime = get(formValue, scheme.find(t => t.id === item.endTime).__valuePath__, null)
+					if (!startTime || !endTime || moment(endTime).isBefore(startTime)) {
+						return ''
+					} else {
+						return moment.duration(moment(endTime).diff(moment(startTime))).asDays().toFixed(0)
+					}
+
+					case 'datetime':
+						return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : ''
+
+					case 'upload':
+						var uploadUid = '';
+
+						for (const item of val) {
+							if (item.uid) {
+								uploadUid = item.uid
+								continue
+							}
+
+							const fileId = await this.HTTP_UPLOAD(item.path || item, undefined, guid || '')
+							if (fileId) {
+								uploadUid = fileId;
+							}
+						}
+
+						return uploadUid;
+
+					default:
+						return val || ''
+			}
+		}
+	}
 }
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js
index b48efc4f9..a1fca19e7 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js	
@@ -257,7 +257,6 @@ export default {
             const fileSize = fileInfo.F_FileSize
 
             const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(uid, true)
-
             fileList.push({ path, type: fileType, uid, size: fileSize })
           }
           return fileList
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js
index 509568d1b..e2a9127f1 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js	
@@ -1,28 +1,38 @@
+import { conforms } from 'lodash';
+import wx from './weixin-js-sdk.js';
 export default {
 	scanCodeFun() {
 		const promise = new Promise((resolve, reject) => {
-			// #ifdef APP-PLUS || MP-WEIXIN
-			uni.scanCode({
-				success: function(res) {
-					// console.log(res)
-					// console.log('条码类型：' + res.scanType);
-					// console.log('条码内容：' + res.result);
-					resolve(res)
-				},
-				fail: function(res) {
+			this.HTTP_GET("weixinapi/getweixinwebaccess_token?url=" + encodeURIComponent(window.location.href)).then((success)=>{
+				if(!success){
 					resolve(false)
+					return
 				}
-			});
-			// #endif
-			
-			// #ifndef APP-PLUS || MP-WEIXIN
-			resolve(false)
-			uni.showToast({
-				title: '请下载app或者到微信浏览器打开网页',
-				icon: 'none',
-				mask: false
+				wx.config({
+				    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+				    appId: success.appid, // 必填，公众号的唯一标识
+				    timestamp: success.timestamp, // 必填，生成签名的时间戳
+				    nonceStr: success.noncestr, // 必填，生成签名的随机串
+				    signature: success.certificate, // 必填，签名
+				    jsApiList: ["scanQRCode"] // 必填，需要使用的JS接口列表
+				});
+				wx.ready(() => {
+					wx.scanQRCode({
+						needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+						scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+						success: function (res) {
+						  var result = res.resultStr; // 当 needResult 为 1 时，扫码返回的结果
+						  var resultArr = result.split(','); // 扫描结果以逗号分割数组
+						  var codeContent = resultArr[resultArr.length - 1]; // 获取数组最后一个元素，也就是最终的内容
+						  resolve(result)
+						},
+						fail: error => {
+						  this.TOAST("调用扫码失败")
+						  resolve(false)
+						}
+					});
+				})
 			})
-			// #endif
 		})
 		return promise
 	}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/weixin-js-sdk.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/weixin-js-sdk.js
new file mode 100644
index 000000000..1b5014bfc
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/weixin-js-sdk.js	
@@ -0,0 +1 @@
+!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){if(!o.jWeixin){var n,c={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},a=function(){var e={};for(var n in c)e[c[n]]=n;return e}(),i=o.document,t=i.title,r=navigator.userAgent.toLowerCase(),s=navigator.platform.toLowerCase(),d=!(!s.match("mac")&&!s.match("win")),u=-1!=r.indexOf("wxdebugger"),l=-1!=r.indexOf("micromessenger"),p=-1!=r.indexOf("android"),f=-1!=r.indexOf("iphone")||-1!=r.indexOf("ipad"),m=(n=r.match(/micromessenger\/(\d+\.\d+\.\d+)/)||r.match(/micromessenger\/(\d+\.\d+)/))?n[1]:"",g={initStartTime:L(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},h={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:f?1:p?2:-1,clientVersion:m,url:encodeURIComponent(location.href)},v={},S={_completes:[]},y={state:0,data:{}};O(function(){g.initEndTime=L()});var I=!1,_=[],w={config:function(e){B("config",v=e);var t=!1!==v.check;O(function(){if(t)M(c.config,{verifyJsApiList:C(v.jsApiList),verifyOpenTagList:C(v.openTagList)},function(){S._complete=function(e){g.preVerifyEndTime=L(),y.state=1,y.data=e},S.success=function(e){h.isPreVerifyOk=0},S.fail=function(e){S._fail?S._fail(e):y.state=-1};var t=S._completes;return t.push(function(){!function(){if(!(d||u||v.debug||m<"6.0.2"||h.systemType<0)){var i=new Image;h.appId=v.appId,h.initTime=g.initEndTime-g.initStartTime,h.preVerifyTime=g.preVerifyEndTime-g.preVerifyStartTime,w.getNetworkType({isInnerInvoke:!0,success:function(e){h.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+h.version+"&o="+h.isPreVerifyOk+"&s="+h.systemType+"&c="+h.clientVersion+"&a="+h.appId+"&n="+h.networkType+"&i="+h.initTime+"&p="+h.preVerifyTime+"&u="+h.url;i.src=n}})}}()}),S.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();S._completes=[]},S}()),g.preVerifyStartTime=L();else{y.state=1;for(var e=S._completes,n=0,i=e.length;n<i;++n)e[n]();S._completes=[]}}),w.invoke||(w.invoke=function(e,n,i){o.WeixinJSBridge&&WeixinJSBridge.invoke(e,x(n),i)},w.on=function(e,n){o.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){0!=y.state?e():(S._completes.push(e),!l&&v.debug&&e())},error:function(e){m<"6.0.2"||(-1==y.state?e(y.data):S._fail=e)},checkJsApi:function(e){M("checkJsApi",{jsApiList:C(e.jsApiList)},(e._complete=function(e){if(p){var n=e.checkResult;n&&(e.checkResult=JSON.parse(n))}e=function(e){var n=e.checkResult;for(var i in n){var t=a[i];t&&(n[t]=n[i],delete n[i])}return e}(e)},e))},onMenuShareTimeline:function(e){P(c.onMenuShareTimeline,{complete:function(){M("shareTimeline",{title:e.title||t,desc:e.title||t,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){P(c.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){P(c.onMenuShareQQ,{complete:function(){M("shareQQ",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){P(c.onMenuShareWeibo,{complete:function(){M("shareWeiboApp",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){P(c.onMenuShareQZone,{complete:function(){M("shareQZone",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){M("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){M("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){M("startRecord",{},e)},stopRecord:function(e){M("stopRecord",{},e)},onVoiceRecordEnd:function(e){P("onVoiceRecordEnd",e)},playVoice:function(e){M("playVoice",{localId:e.localId},e)},pauseVoice:function(e){M("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){M("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){P("onVoicePlayEnd",e)},uploadVoice:function(e){M("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){M("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){M("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){M("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(p){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){M(c.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){M("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){M("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===I?(I=!0,M("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(I=!1,0<_.length){var n=_.shift();wx.getLocalImgData(n)}},e))):_.push(e)},getNetworkType:function(e){M("getNetworkType",{},(e._complete=function(e){e=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e}(e)},e))},openLocation:function(e){M("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){M(c.getLocation,{type:(e=e||{}).type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){M("hideOptionMenu",{},e)},showOptionMenu:function(e){M("showOptionMenu",{},e)},closeWindow:function(e){M("closeWindow",{},e=e||{})},hideMenuItems:function(e){M("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){M("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){M("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){M("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){M("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(f){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){M(c.openAddress,{},(e._complete=function(e){e=function(e){return e.postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo,e}(e)},e))},openProductSpecificView:function(e){M(c.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,card_ext:r.cardExt};i.push(a)}M(c.addCard,{card_list:i},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){M("chooseCard",{app_id:v.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,code:r.code};i.push(a)}M(c.openCard,{card_list:i},e)},consumeAndShareCard:function(e){M(c.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){M(c.chooseWXPay,V(e),e)},openEnterpriseRedPacket:function(e){M(c.openEnterpriseRedPacket,V(e),e)},startSearchBeacons:function(e){M(c.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){M(c.stopSearchBeacons,{},e)},onSearchBeacons:function(e){P(c.onSearchBeacons,e)},openEnterpriseChat:function(e){M("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){M("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){if("string"==typeof e&&0<e.length){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}(e.path),envVersion:e.envVersion},e)},openBusinessView:function(e){M("openBusinessView",{businessType:e.businessType,queryString:e.queryString||"",envVersion:e.envVersion},(e._complete=function(n){if(p){var e=n.extraData;if(e)try{n.extraData=JSON.parse(e)}catch(e){n.extraData={}}}},e))},miniProgram:{navigateBack:function(e){e=e||{},O(function(){M("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){O(function(){M("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){O(function(){M("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){O(function(){M("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){O(function(){e({miniprogram:"miniprogram"===o.__wxjs_environment})})}}},T=1,k={};return i.addEventListener("error",function(e){if(!p){var n=e.target,i=n.tagName,t=n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)if(-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=T++,n["wx-id"]=o),k[o])return;k[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),i.addEventListener("load",function(e){if(!p){var n=e.target,i=n.tagName;n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(k[t]=!1)}}},!0),e&&(o.wx=o.jWeixin=w),w}function M(n,e,i){o.WeixinJSBridge?WeixinJSBridge.invoke(n,x(e),function(e){A(n,e,i)}):B(n,i)}function P(n,i,t){o.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),A(n,e,i)}):B(n,t||i)}function x(e){return(e=e||{}).appId=v.appId,e.verifyAppId=v.appId,e.verifySignType="sha1",e.verifyTimestamp=v.timestamp+"",e.verifyNonceStr=v.nonceStr,e.verifySignature=v.signature,e}function V(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function A(e,n,i){"openEnterpriseChat"!=e&&"openBusinessView"!==e||(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=e,t=a[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",v.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function C(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=c[t];o&&(e[n]=o)}return e}}function B(e,n){if(!(!v.debug||n&&n.isInnerInvoke)){var i=a[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function L(){return(new Date).getTime()}function O(e){l&&(o.WeixinJSBridge?e():i.addEventListener&&i.addEventListener("WeixinJSBridgeReady",e,!1))}});
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js
index 4bbefbeea..71bb4a076 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js	
@@ -229,6 +229,40 @@ export default {
 
 			return await this.HTTP_GET('learun/adms/annexes/wxfileinfo', fileId)
 		},
+		//获取文件夹下文件列表
+		async FETCH_FILEList(folderId) {
+			if (!folderId) {
+				return null
+			}
+		
+			return await this.HTTP_GET('learun/adms/annexes/wxlist', folderId)
+		},
+		// 根据文件夹id获取图片列表
+		async getFileListById(folderId){
+			if(!folderId){
+				return []
+			}
+			let wxlist = await this.FETCH_FILEList(folderId),fileList = []
+			for (const wxfile of wxlist) {
+				const fileInfo = await this.FETCH_FILEINFO(wxfile.F_Id)
+				if (!fileInfo) {
+					continue
+				}
+			
+				const fileType = fileInfo.F_FileType
+				const fileSize = fileInfo.F_FileSize
+			
+				const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(wxfile.F_Id, true)
+				fileList.push({
+					path,
+					type: fileType,
+					uid:wxfile.F_Id,
+					folderId:wxfile.F_FolderId,
+					size: fileSize
+				})
+			}
+			return fileList
+		},
 
 		// 封装的 GET 请求，集成了验证信息
 		// 返回请求结果或 null
@@ -258,8 +292,8 @@ export default {
 		//   url 为请求地址
 		//   filePath 为临时文件的路径
 		//   formData 为请求附带的提交数据
-		async HTTP_UPLOAD(filePath, formData) {
-			const [err, res] = await this.UPLOAD('/learun/adms/annexes/wxupload', filePath, formData)
+		async HTTP_UPLOAD(filePath, formData,guid) {
+			const [err, res] = await this.UPLOAD('/learun/adms/annexes/wxupload', filePath, formData,guid)
 
 			return this.handleResult(err, res)
 		},
@@ -308,11 +342,12 @@ export default {
 		// 返回结果是一个数组： [error, result]
 		//   error 表示错误，一般是网络错误，请求很可能根本没有发出
 		//   result 包含 { statusCode, data } 分别表示状态码、接口返回的数据
-		async UPLOAD(url, filePath, formData) {
+		async UPLOAD(url, filePath, formData,guid) {
 			const uploadUrl = this.handleUrl(url)
 			const query = {
 				loginMark: this.getLoginMark(),
-				token: this.GET_GLOBAL('token')
+				token: this.GET_GLOBAL('token'),
+				folderId:guid
 			}
 
 			if (formData && typeof formData === 'object') {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue
index e2300312a..82b9b3148 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue	
@@ -106,6 +106,10 @@ export default {
     },
 
     async fileClick(index) {
+	  if(typeof this.value[index] == "string"){
+		  uni.previewImage({ urls: this.value.filter(item=>typeof this.value[index] == "string"), current: this.value[index] })
+		  return
+	  }
       const { path, type, uid, size = 0 } = this.value[index]
       if (this.isImgFile(type)) {
         uni.previewImage({ urls: [path], current: path })
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file.vue
index f3947f199..cf6d0db6b 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file.vue	
@@ -2,7 +2,7 @@
 	<view class="cu-form-group">
 		<view class="grid col-4 grid-square flex-sub">
 			<view v-for="(item, index) in imgList" @tap="viewImg(item)" :key="index" class="bg-img">
-				<image v-if="showfile()&&isImage(item.type)" :src="CONFIG('webHost') + item.url" mode="aspectFill">
+				<image v-if="showfile()&&item&&(typeof item == "string"||isImage(item.type))" :src="item.url?CONFIG('webHost') + item.url:item" mode="aspectFill">
 				</image>
 				<l-icon v-if="showfile()&&!isImage(item.type)" type="text" />
 				<text class="file-name">{{item.name}}</text>
@@ -86,8 +86,6 @@
 			},
 
 			async chooseChangeback(tempFilePaths, tempFiles) {
-				// let {tempFilePaths,tempFiles} = res
-				// if(!this.validate(tempFiles))return
 				let uploadImageRes = await this.uploadImage(tempFilePaths[0], tempFiles[0] ? tempFiles[0].name : "")
 				let newList = this.imgList || []
 				if (uploadImageRes) {
@@ -131,72 +129,6 @@
 				})
 
 			},
-
-			ceshi() {
-				function apiFn(params) {
-					return new Promise((resolve, reject) => {
-						this.LOADING('正在上传…');
-						this.HTTP_UPLOAD2('StuInfoFresh/upload', params.url, {
-							folderId: this.folderId
-						}).then((data) => {
-							this.HIDE_LOADING();
-							if (data) {
-								// this.HTTP_GET('StuInfoFresh/upload', {fileId:data})
-								this.imgList[params.index] = [{
-									id: data.F_Id,
-									name: data.F_FileName,
-									url: data.F_FilePath,
-									type: data.F_FileType
-								}]
-								reslove(this.imgList[params.index])
-							} else {
-								reject('上传失败！')
-							}
-						})
-					})
-				}
-				let array = this.imgList.map(item => {
-					if (item.id) {
-						return ""
-					} else {
-						return {
-							url: "learun/adms/annexes/upload"
-						}
-					}
-				})
-				this.promiseAllLimit(2, [1, 2, 3, 4, 5, 6, 7, 8, 9], a).then(res => {
-					console.log(res)
-				})
-			},
-
-			/**
-			 * @description 控制promise.all并发数量
-			 * @param limit 并发数
-			 * @param array 参数列表
-			 * @param apiFn 执行函数
-			 * @returns {Promise<Awaited<unknown>[]>}
-			 */
-			async promiseAllLimit(limit, array, apiFn) {
-				const ret = [] // 用于存放所有的promise实例
-				const executing = [] // 用于存放目前正在执行的promise
-				for (const item of array) {
-					const p = apiFn(item)
-					ret.push(p)
-					if (limit <= array.length) {
-						// then回调中，当这个promise状态变为fulfilled后，将其从正在执行的promise列表executing中删除
-						const e = p.then(() => executing.splice(executing.indexOf(e), 1))
-						executing.push(e)
-						if (executing.length >= limit) {
-							// 一旦正在执行的promise列表数量等于限制数，就使用Promise.race等待某一个promise状态发生变更，
-							// 状态变更后，就会执行上面then的回调，将该promise从executing中删除，
-							// 然后再进入到下一次for循环，生成新的promise进行补充
-							await Promise.race(executing)
-						}
-					}
-				}
-				return Promise.all(ret)
-			},
-
 			validate(array) {
 				// let type = array.every(item=>{
 				// 	return item.type && item.type.substring(0,6) == "image/"
@@ -233,33 +165,6 @@
 					});
 				}
 			},
-
-			// previewFile() {
-			//     var file = document.querySelector('input[type=file]').files[0];
-			//     var reader = new FileReader();
-			// 	// fileReader.readAsDataURL(blob);
-			// 						// fileReader.onerror = () => {
-			// 						// 	reject(new Error('blobToBase64 error'));
-			// 						// };
-			// 	// var encodedData = window.btoa("Hello, world");
-			//     reader.onloadend = function () {
-			//         //$('#PhotoImg').attr('src', reader.result);
-			//         var postData = {
-			//             Base64Url: reader.result
-			//         }
-			//         this.HTTP_POST(config.webapi + "StuInfoFresh/savePhoto", postData, (data) => {
-			//             if (data) {
-			//                 $('#Photo').val(data.AnnexesFileId);
-			//                 $('#PhotoImg').attr('src', config.web + data.Url);
-			//             } else {
-			//                 learun.layer.toast('采集照片信息失败！');
-			//             }
-			//         });
-			//     }
-			//     if (file) {
-			//         reader.readAsDataURL(file);
-			//     }
-			// },
 		},
 		created() {
 			console.log(this.value)
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
index 7670bf973..01eebb620 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
@@ -22,9 +22,9 @@ export default {
   // ],
   "apiHost": [
     // "http://localhost:31173/"
-	"http://192.168.10.68:8002/"
+	"http://cyzjzx.gnway.cc:30626/"
   ],
-  "webHost":"http://localhost:20472/",
+  "webHost":"http://cyzjzx.gnway.cc:29618/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
 	  // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026      420528200507261428
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json
index bff0c2bc1..2a1860b43 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json	
@@ -1,6 +1,6 @@
 {
     "name" : "智慧校园",
-    "appid" : "__UNI__0CE0195",
+    "appid" : "__UNI__3039520",
     "description" : "智慧校园移动端",
     "versionName" : "2.1.0",
     "versionCode" : 20100,
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
index edc93d780..e3c1ac370 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
@@ -1008,7 +1008,16 @@
 
 
 
-	],
+	    ,{
+            "path" : "pages/LR_OAModule/noticeExamine",
+            "style" :
+            {
+                "navigationBarTitleText": "通知公告",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 
 	// 全局样式
 	"globalStyle": {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue
index 096991894..9149ade63 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue	
@@ -33,7 +33,7 @@
   
   
   
-            <l-customlist-action @view="action('view', item.MESSAGEID)" /> 
+            <l-customlist-action @view="action('view', item.MESSAGEID)" :showDelete="false" @delete="action('delete', item.MESSAGEID)" :showEdit="false" @edit="action('edit', item.MESSAGEID)" /> 
           </view> 
         </l-customlist> 
       </l-scroll-list> 
@@ -70,7 +70,7 @@
       </view> 
     </scroll-view> 
   
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   
   </view> 
 </template> 
@@ -107,7 +107,7 @@ export default {
         SENDER: { type: 'text' }, 
         TITLE: { type: 'text' }, 
         READFLAG: { type: 'select', dataSource: '0' }, 
-        SENDTIME: { type: 'datetime', dateformat: '0' }, 
+        SENDTIME: { type: 'datetime', dateformat: '1' }, 
         URL: { type: 'upload' }, 
         CONTENTS: { type: 'textarea' }, 
       }, 
@@ -174,7 +174,7 @@ export default {
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'MESSAGEID', sord: 'DESC' }, 
+          pagination: { rows: 10, page: this.page, sidx: 'SENDTIME', sord: 'DESC' }, 
           queryJson: JSON.stringify(this.searchData) 
         }, 
         '加载数据时出错'
@@ -226,15 +226,16 @@ export default {
   
     // 点击「清空查询条件」按钮 
     reset() { 
-      this.$refs.datefilter.changeDateRange('all') 
       this.queryData = this.COPY(this.defaultQueryData) 
-      this.searchChange() 
+      this.$refs.datefilter.changeDateRange('all') 
+      // this.searchChange() 
     }, 
   
     // 点击「编辑」、「查看」、「添加」、「删除」按钮 
     async action(type, id = '') { 
       switch (type) { 
         case 'view': 
+		this.HTTP_POST(`learun/adms/EducationalAdministration/SYS_ReceiveMessage/read`,{keyValue:id})
           this.NAV_TO(`./single?type=view&id=${id}`) 
           return
   
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue
index 947aaa8eb..a24dcdbe9 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue	
@@ -13,13 +13,13 @@
         :disabled="!edit"
         title="主题"
       /> 
-      <l-select 
+ <!--     <l-select 
         @input="setValue('SYS_ReceiveMessage.READFLAG', $event)"
         :value="getValue('SYS_ReceiveMessage.READFLAG')"
         :disabled="!edit"
         :range="dataSource.SYS_ReceiveMessage.READFLAG"
         title="状态"
-      /> 
+      /> -->
       <l-date-picker 
         @input="setValue('SYS_ReceiveMessage.SENDTIME', $event)"
         :value="getValue('SYS_ReceiveMessage.SENDTIME')"
@@ -27,20 +27,38 @@
         title="收件时间"
       /> 
       <l-upload-file 
-        @input="setValue('SYS_ReceiveMessage.URL', $event)"
-        :value="getValue('SYS_ReceiveMessage.URL')"
+	    v-if="ready" 
+        :value="fileList"
+		@input="(e)=>{fileList = e}" 
         :readonly="!edit"
         :number="9"
         title="附件上传"
       /> 
-      <l-textarea 
+    <!--  <l-textarea 
         @input="setValue('SYS_ReceiveMessage.CONTENTS', $event)"
         :value="getValue('SYS_ReceiveMessage.CONTENTS')"
         :readonly="!edit"
         title="邮件内容"
-      /> 
+      /> -->
+	  <view class="bg-white" style="padding: 15px;color: #333333;font-size: 15px;">邮件内容</view>
+	  <view class="bg-white" style="padding: 15px;padding-top: 0px;">
+	  	<u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="getValue('SYS_ReceiveMessage.CONTENTS')" noData="暂无内容"></u-parse>
+	  </view>
     </view> 
-  
+ <!-- <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
+   <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+      提交保存 
+    </l-button> 
+    <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+      编辑本页 
+    </l-button> 
+    <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+      取消编辑 
+    </l-button>
+    <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+      删除 
+    </l-button>
+  </view> -->
   </view> 
 </template> 
   
@@ -82,13 +100,15 @@ export default {
       // 表单数据 
       current: {}, 
       origin: {}, 
+	  
+	  fileList:[],
   
       // 表单项数据结构 
       scheme: { 
         SYS_ReceiveMessage: { 
           SENDER: { type: 'text', title: '发件人' }, 
           TITLE: { type: 'text', title: '主题' }, 
-          READFLAG: { type: 'select', title: '状态', dataSource: '0' }, 
+          // READFLAG: { type: 'select', title: '状态', dataSource: '0' }, 
           SENDTIME: { type: 'datetime', title: '收件时间', dateformat: '0' }, 
           URL: { type: 'upload', title: '附件上传' }, 
           CONTENTS: { type: 'textarea', title: '邮件内容' }, 
@@ -136,8 +156,17 @@ export default {
       if (this.mode === 'create') { 
         this.origin = await this.getDefaultForm() 
       } else { 
-        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/SYS_ReceiveMessage/form', this.id) 
-        this.origin = await this.formatFormData(result) 
+        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/SYS_ReceiveMessage/form', this.id)
+		if(result){
+			let fileList = await this.getFileListById(result.SYS_ReceiveMessage.FilePath)
+			console.log(fileList)
+			this.fileList = fileList
+			
+			this.origin = await this.formatFormData(result) 
+			console.log(this.origin)
+		}else{
+			return
+		}
       } 
       this.current = this.COPY(this.origin) 
     }, 
@@ -155,11 +184,14 @@ export default {
           break
   
         case 'save': 
+		console.log(this.fileList)
+		
+		// return
           const verifyResult = this.verifyForm() 
           if (verifyResult.length > 0) { 
             this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
             return
-          } 
+          }
   
           if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
             return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue
index 4e34e124d..81704719b 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue	
@@ -42,7 +42,7 @@
             </view> 
   
   
-            <l-customlist-action showEdit @edit="action('edit', item.RFileId)" showDelete @delete="action('delete', item.RFileId)" @view="action('view', item.RFileId)" /> 
+            <l-customlist-action :showEdit="false" @edit="action('edit', item.RFileId)" :showDelete="false" @delete="action('delete', item.RFileId)" @view="action('view', item.RFileId)" /> 
           </view> 
         </l-customlist> 
       </l-scroll-list> 
@@ -65,12 +65,12 @@
           class="margin-bottom"
         /> 
   
-        <l-input 
+        <!-- <l-input 
           v-model="queryData.Sender"
           @change="searchChange"
           title ="发送人"
           placeholder="按发送人查询"
-        /> 
+        /> -->
         <l-input 
           v-model="queryData.Title"
           @change="searchChange"
@@ -85,7 +85,7 @@
       </view> 
     </scroll-view> 
   
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   
   </view> 
 </template> 
@@ -124,7 +124,7 @@ export default {
         SendTime: { type: 'datetime', dateformat: '0' }, 
         SendType: { type: 'select', itemCode: 'FileSendType', dataSource: '0' }, 
         ReadFlag: { type: 'select', dataSource: '0' }, 
-        ReadTime: { type: 'datetime', dateformat: '0' }, 
+        ReadTime: { type: 'datetime', dateformat: '1' }, 
       }, 
   
       // 查询条件 
@@ -242,15 +242,16 @@ this.searchData.ReceiverId=this.GET_GLOBAL('loginUser').userId;
   
     // 点击「清空查询条件」按钮 
     reset() { 
+	  this.queryData = this.COPY(this.defaultQueryData) 
       this.$refs.datefilter.changeDateRange('all') 
-      this.queryData = this.COPY(this.defaultQueryData) 
-      this.searchChange() 
+      // this.searchChange() 
     }, 
   
     // 点击「编辑」、「查看」、「添加」、「删除」按钮 
     async action(type, id = '') { 
       switch (type) { 
         case 'view': 
+		  this.HTTP_POST(`learun/adms/EducationalAdministration/Sys_ReceiveFile/read`,{keyValue:id})
           this.NAV_TO(`./single?type=view&id=${id}`) 
           return
   
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue
index 4689f37be..adb8edb70 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue	
@@ -1,12 +1,19 @@
 <template>
     <view class="page">
         <view v-if="ready">
-            <l-input
+           <l-input
         @input="setValue('Sys_ReceiveFile.Sender', $event)"
         :value="getValue('Sys_ReceiveFile.Sender')"
         :disabled="!edit"
         title="发送人"
       />
+	 <!-- <l-organize-picker
+	    @input="setValue('Sys_ReceiveFile.Sender', $event)"
+	    :value="getValue('Sys_ReceiveFile.Sender')"
+	    :readonly="!edit"
+	    type="user"
+	    title="发送人"
+	  /> -->
             <l-input
         @input="setValue('Sys_ReceiveFile.Title', $event)"
         :value="getValue('Sys_ReceiveFile.Title')"
@@ -26,16 +33,47 @@
         :range="dataSource.Sys_ReceiveFile.SendType"
         title="接收对象"
       />
-            <l-textarea
+	  <!-- <l-upload-file
+	    @input="setValue('Sys_ReceiveFile.RUrl', $event)"
+	    :value="getValue('Sys_ReceiveFile.RUrl')"
+	    :readonly="!edit"
+	    :number="9"
+	    title="附件上传"
+	  /> -->
+	  <l-upload-file
+	    v-if="ready"
+	    :value="fileList"
+	    :readonly="!edit"
+	    :number="9"
+	    title="附件上传"
+	  /> 
+         <!--   <l-textarea
         @input="setValue('Sys_ReceiveFile.Contents', $event)"
         :value="getValue('Sys_ReceiveFile.Contents')"
         :disabled="!edit"
         readonly="readonly"
         :range="dataSource.Sys_ReceiveFile.Contents"
         title="内容"
-      />
-          </view
-    >
+      /> -->
+		<view class="bg-white" style="padding: 15px;color: #333333;font-size: 15px;">内容</view>
+		<view class="bg-white" style="padding: 15px;padding-top: 0px;">
+			<u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="getValue('Sys_ReceiveFile.Contents')" noData="暂无内容"></u-parse>
+		</view>
+    </view>
+	<!-- <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
+	<l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+	    提交保存 
+	  </l-button> 
+	  <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+	    编辑本页 
+	  </l-button> 
+	  <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+	    取消编辑 
+	  </l-button>
+	  <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+	    删除 
+	  </l-button>
+	</view> -->
       </view
   >
 </template> 
@@ -71,6 +109,7 @@ export default {
       edit: null,
       ready: false, // 表单数据
       current: {},
+	  fileList:[],
       origin: {}, // 表单项数据结构
       scheme: {
         Sys_ReceiveFile: {
@@ -121,6 +160,7 @@ export default {
           "learun/adms/EducationalAdministration/Sys_ReceiveFile/form",
           this.id
         );
+		this.fileList = await this.getFileListById(result.Sys_ReceiveFile.FilePath)
         this.origin = await this.formatFormData(result);
       }
       this.current = this.COPY(this.origin);
@@ -151,7 +191,7 @@ export default {
           }
           this.LOADING("正在提交...");
           const postData = await this.getPostData(this.id);
-          adms(
+          this.HTTP_POST(
             "learun/adms/EducationalAdministration/Sys_ReceiveFile/save",
             postData,
             "表单提交保存失败"
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue
new file mode 100644
index 000000000..cdfc9ef60
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue	
@@ -0,0 +1,216 @@
+<template>
+  <view id="notice" class="page">
+    <!-- 顶部页签 -->
+    <l-nav v-model="tab" :items="['表单信息', '流程信息']" type="flex" class="solid-bottom" />
+	<view v-if="ready && tab == 0">
+	  <l-input v-model="formData.F_FullHead" title="公告标题" disabled></l-input>
+	  <l-select v-model="formData.IsSend" :range="[{value:'1',text:'是'},{value:'0',text:'否'}]" title="下发官网" disabled></l-select>
+	  <l-input v-model="formData.F_Category" title="公告类别" disabled></l-input>
+	  <l-input v-model="formData.F_ReleaseTime" title="发布时间" disabled></l-input>
+	  <l-input v-model="formData.F_SourceName" title="信息来源" disabled></l-input>
+	  <l-input v-model="formData.F_SourceAddress" title="来源地址" disabled></l-input> 
+	  <l-input v-model="formData.F_SendDeptId" title="接收部门" disabled></l-input>
+	  <l-input v-model="formData.F_SendPostId" title="接受岗位" disabled></l-input>
+	  <l-select v-model="formData.F_IsSendFX" :range="[{value:true,text:'是'},{value:false,text:'否'}]" title="下发飞星" disabled></l-select>
+	  <l-upload-file
+	    :value="[API + '/learun/adms/annexes/wxdown?' + URL_QUERY(formData.F_NewsImage, true)]"
+	    :readonly="true"
+	    title="标题图片"
+	  />
+	    <!-- :number="9" -->
+	    <!-- @input="setValue('MeetingManagement.Files', $event)" -->
+	  <l-input title="公告内容" disabled style="border-bottom: none;"></l-input>
+	  <view class="padding text-lg" style="background-color: #fff;">
+		  <u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="content"></u-parse>
+		  <view v-if="ready" v-html="''">
+		  	
+		  </view>
+	  </view>
+	  <l-workflow-action
+	    @audit="audit"
+	    @action="action"
+	    :type="type"
+	    :currentNode="currentNode"
+	    :currentTask="currentTask"
+	  />
+	</view>
+	<view v-if="ready && tab == 1" class="progress"><l-workflow-timeline :processList="processList" /></view>
+    <!-- <view class="padding-sm text-grey notice-info">
+      <view class="text-right">本页内容发布于 {{ time }}</view>
+      <view class="text-right">{{ date }}</view>
+    </view> -->
+  </view>
+</template>
+
+<script>
+import moment from 'moment'
+import workflowFormMixins from '@/pages/nworkflow/workflow.js'
+
+export default {
+  mixins: [workflowFormMixins],
+  data() {
+    return {
+	  tab:0,
+	  type:'view',
+	  currentNode:null,
+	  currentTask:null,
+	  taskId:'',
+	  processId:'',
+	  processInfo:null,
+	  processList:[],
+	  formData:{},
+      ready: false,
+      content: '',
+	  
+      time: '',
+      date: ''
+    }
+  },
+
+  async onLoad({type}) {
+    await this.init(type)
+  },
+
+  methods: {
+    async init(type) {
+	  if(type){this.type = type}
+      this.LOADING('加载中…')
+      const noticeItem = this.GET_PARAM()
+	  this.processList = noticeItem.logList
+	  this.currentNode = noticeItem.currentNode
+	  this.currentTask = noticeItem.currentTask
+	  this.processInfo = noticeItem.processInfo
+	  this.taskId = this.currentTask.F_TaskId
+	  this.processId = this.currentTask.F_Id
+	  this.formValue = noticeItem.formValue
+	  this.scheme = noticeItem.scheme
+	  await this.getFormData(this.processList[0].F_ProcessId)
+	  this.HIDE_LOADING();
+	  
+      // this.content = this.CONVERT_HTML(noticeItem.f_content)
+
+      // this.time = moment(noticeItem.f_time).format('HH : mm')
+      // this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日')
+      // this.SET_TITLE(noticeItem.f_title)
+      // this.HIDE_LOADING()
+    },
+	// 获取表单数据
+	getFormData(ProgressId){
+		return this.HTTP_GET("learun/news/shList",{ProgressId},"加载数据时出错").then(res=>{
+			if(res){
+				this.formData = res
+				this.content = res.F_NewsContent
+				this.ready = true
+			}
+		})
+	},
+	
+	// 点击审批相关按钮
+	async audit(action) {
+	  this.LOADING('加载中…')
+	  const currentTask = this.processInfo.task.find(t => t.F_NodeId === this.currentNode.id)
+	  const postData = await this.getPostData(this.formValue, this.scheme)
+	  const pageParam = {
+	    type: 'sign',
+	    processId: currentTask.F_ProcessId,
+	    taskId: currentTask.F_Id,
+	    formreq: postData.formreq,
+	    taskName: this.currentTask.F_Title
+	  }
+	  // 不是加签
+	  if (action.code !== '__sign__') {
+	    Object.assign(pageParam, action)
+	    pageParam.type = 'verify'
+	    pageParam.auditors = JSON.stringify({})
+	    pageParam.isFromSignAudit = Number(this.currentTask.F_TaskType) === 3
+	  }
+	  this.HIDE_LOADING()
+	  this.NAV_TO('/pages/nworkflow/myflow/sign', pageParam, true)
+	},
+	// 点击操作按钮（非审批类按钮）
+	async action(taskType) {
+	  switch (taskType) {
+	    // 点击「催办」/「撤销流程」/「标记已阅」按钮
+	    case 'urge':
+	    case 'revoke':
+	    case 'refer':
+	      const actionText = { urge: '催办', revoke: '撤销', refer: '已阅' }[taskType]
+	      const actionUrl = { urge: '/urge', revoke: '/revoke', refer: '/refer' }[taskType]
+	      
+	      let actionData = this.processId
+	      if (taskType === 'refer') {
+	        actionData = { processId: this.processId, taskId: this.taskId }
+	      }
+	
+	      if (!(await this.CONFIRM(`${actionText}确认`, `确定要提交${actionText}吗？`, true))) {
+	        return
+	      }
+	      this.LOADING(`提交${actionText}中…`)
+	      this.HTTP_POST(`/newwf${actionUrl}`, actionData, `提交${actionText}失败`).then(success => {
+	        this.HIDE_LOADING()
+	        if (success) {
+	          this.EMIT('task-list-change')
+	          this.TOAST(`成功提交${actionText}`, 'success')
+	          if (taskType === 'revoke') {
+	            this.NAV_BACK()
+	          }
+	        }
+	      })
+	      break
+	    // 点击「提交草稿」按钮
+	    case 'draft':
+		  this.CONFIRM('不支持此操作')
+		  return
+	      if (!(await this.CONFIRM('提交确认', '确定要提交草稿吗？', true))) {
+	        return
+	      }
+	      this.LOADING('正在提交…')
+	      const draftFormValue = this.$refs.form.getFormValue()
+	      const draftPostData = await this.getPostData(draftFormValue, this.scheme)
+	      this.HTTP_POST('/newwf​/draft', draftPostData, '提交草稿失败').then(success => {
+	        this.HIDE_LOADING()
+	        if (success) {
+	          this.EMIT('task-list-change')
+	          this.NAV_BACK()
+	          this.TOAST('草稿已保存', 'success')
+	        }
+	      })
+	      break
+	    // 点击「发起流程」按钮
+	    case 'submit':
+		  this.CONFIRM('不支持此操作')
+		  return
+	      const verifyResult = this.$refs.form.verifyValue()
+	      if (verifyResult.length > 0) {
+	        this.CONFIRM('表单验证失败', verifyResult.join('\n'))
+	        return
+	      }
+	      if (!(await this.CONFIRM('提交确认', '确定要发起流程吗？', true))) {
+	        return
+	      }
+	      this.LOADING('正在提交…')
+	      const formValue = this.$refs.form.getFormValue()
+	      const postData = await this.getPostData(formValue, this.scheme)
+	      postData.auditors = JSON.stringify({})
+	
+	      if (this.type === 'child') {
+	        postData.parentProcessId = this.processId
+	        postData.parentTaskId = this.taskId
+	      }
+	      const errorTips = '流程发起失败'
+	      this.HTTP_POST('/newwf/createchildflow', postData, errorTips).then(success => {
+	        this.HIDE_LOADING()
+	        if (success) {
+	          this.EMIT('task-list-change')
+	          this.NAV_BACK()
+	          this.TOAST('流程发起成功', 'success')
+	        }
+	      })
+	      break
+	    default:
+	      break
+	  }
+	},
+  }
+}
+</script>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/MealCardRunTab/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/MealCardRunTab/list.vue
index bafee7915..7bafb76c1 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/MealCardRunTab/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/MealCardRunTab/list.vue	
@@ -188,7 +188,9 @@
 				let _postParam = {
 					pagination: {
 						rows: _this.rows,
-						page: _this.page
+						page: _this.page,
+						sidx: 'centralTm',
+						sord: 'desc',
 					},
 					queryJson: JSON.stringify(_this.multipleData)
 				};
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue
index 7dc859c37..ecf189881 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue	
@@ -2,7 +2,7 @@
   <view class="page"> 
     <!-- 主列表页 --> 
     <view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx;"> 
-      <!-- 顶部条目/分页信息栏 --> 
+      <!-- 顶部条目/分页信息栏 -->
       <l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner> 
   
       <!-- 滚动列表，跨端支持上拉/下拉 --> 
@@ -13,12 +13,14 @@
   
             <view class="customlist-item-field"> 
               <text class="customlist-item-field-title">时间：</text> 
-              {{ displayListItem(item, 'Date') }} 
+              <!-- {{ displayListItem(item, 'Date') }} -->
+			  {{ displayListItem(item, 'StartTime') }}&nbsp;-&nbsp;{{ displayListItem(item, 'EndTime') }} 
             </view> 
   
             <view class="customlist-item-field"> 
               <text class="customlist-item-field-title">值班人：</text> 
-              {{ displayListItem(item, 'Person') }} 
+              <!-- {{ displayListItem(item, 'Person') }} -->
+			  {{ displayListItem(item, 'F_RealName') }} 
             </view> 
   
             <view class="customlist-item-field"> 
@@ -41,8 +43,20 @@
     <!-- 侧边栏，用于设置查询条件 --> 
     <scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y> 
       <view v-if="ready" class="padding"> 
-  
-  
+		  <l-customlist-sidepage-datefilter
+			v-model="dateRange"
+			@change="searchChange"
+			title="按时间日期查询: "
+			ref="datefilter"
+			class="margin-bottom"
+		  /> 
+				
+		  <l-input 
+			v-model="queryData.keyword"
+			@change="searchChange"
+			title ="值班人"
+			placeholder="按值班人查询"
+		  /> 
         <!-- 重置查询条件按钮 --> 
         <view class="padding-tb"> 
           <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button> 
@@ -84,9 +98,12 @@ export default {
     return { 
       // 数据项的数据类型、结构 
       scheme: { 
-        Date: { type: 'datetime', dateformat: '0' }, 
-        Person: { type: 'text' }, 
+        // Date: { type: 'datetime', dateformat: '0' }, 
+        // Person: { type: 'text' }, 
         Remark: { type: 'textarea' }, 
+		StartTime: { type: 'datetime', dateformat: '0' },
+		EndTime: { type: 'datetime', dateformat: '0' },
+		F_RealName: { type: 'text' }, 
       }, 
   
       // 查询条件 
@@ -108,7 +125,9 @@ export default {
       // 列表与分页信息 
       page: 1, 
       total: 2, 
-      list: [] 
+      list: [] ,
+	  
+	  dateRange:null
     } 
   }, 
   
@@ -180,6 +199,12 @@ export default {
     // 设置搜索条件 
     async searchChange() { 
       const result = {} 
+	  
+	  // 时间查询相关参数
+	  if (this.dateRange) { 
+	    result.StartTime = this.dateRange.start 
+	    result.EndTime = this.dateRange.end 
+	  } 
   
       // 将其他查询项添加到查询 JSON 中 
       const queryObj = pickBy(this.queryData, t => (Array.isArray(t) ? t.length > 0 : t)) 
@@ -192,7 +217,8 @@ export default {
     // 点击「清空查询条件」按钮 
     reset() { 
       this.queryData = this.COPY(this.defaultQueryData) 
-      this.searchChange() 
+	  this.$refs.datefilter.changeDateRange('all') 
+      // this.searchChange() 
     }, 
   
     // 点击「编辑」、「查看」、「添加」、「删除」按钮 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue
index 718a3a09e..89e333ad3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue	
@@ -2,17 +2,30 @@
   <view class="page"> 
     <view v-if="ready"> 
       <l-date-picker 
-        @input="setValue('DutySchedule.Date', $event)"
-        :value="getValue('DutySchedule.Date')"
+        @input="setValue('DutySchedule.StartTime', $event)"
+        :value="getValue('DutySchedule.StartTime')"
         :disabled="!edit"
-        title="时间"
+        title="开始时间"
       /> 
-      <l-input 
+	  <l-date-picker
+	    @input="setValue('DutySchedule.EndTime', $event)"
+	    :value="getValue('DutySchedule.EndTime')"
+	    :disabled="!edit"
+	    title="结束时间"
+	  /> 
+     <!-- <l-input 
         @input="setValue('DutySchedule.Person', $event)"
         :value="getValue('DutySchedule.Person')"
         :disabled="!edit"
         title="值班人"
-      /> 
+      /> -->
+	  <l-organize-picker
+	    @input="setValue('DutySchedule.Person', $event)"
+	    :value="getValue('DutySchedule.Person')"
+	    :readonly="!edit"
+	    type="user"
+	    title="值班人"
+	  /> 
       <l-textarea 
         @input="setValue('DutySchedule.Remark', $event)"
         :value="getValue('DutySchedule.Remark')"
@@ -80,7 +93,9 @@ export default {
       // 表单项数据结构 
       scheme: { 
         DutySchedule: { 
-          Date: { type: 'datetime', title: '时间', dateformat: '0' }, 
+          // Date: { type: 'datetime', title: '时间', dateformat: '0' }, 
+		  StartTime: { type: 'datetime', dateformat: '0' },
+		  EndTime: { type: 'datetime', dateformat: '0' },
           Person: { type: 'text', title: '值班人' }, 
           Remark: { type: 'textarea', title: '备注' }, 
         }, 
@@ -127,7 +142,8 @@ export default {
         this.origin = await this.getDefaultForm() 
       } else { 
         const result = await this.HTTP_GET('learun/adms/PersonnelManagement/DutySchedule/form', this.id) 
-        this.origin = await this.formatFormData(result) 
+		let res = {DutySchedule:result.Schedule}
+        this.origin = await this.formatFormData(res) 
       } 
       this.current = this.COPY(this.origin) 
     }, 
@@ -184,7 +200,7 @@ export default {
   
             this.EMIT('PersonnelManagementDutySchedule-list-change') 
             this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
+            this.TOAST('删除成功', 'success') 
           }) 
           break
   
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue
index 1a2b42a8f..1f5209251 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue	
@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="page">
     <!-- 主列表页 -->
     <view
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue
index 6384251dd..8270211e9 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue	
@@ -13,17 +13,22 @@ export default {
   methods: {
     init() {
       let _this = this;
-      scanCodeFun.scanCodeFun().then((res) => {
+      scanCodeFun.scanCodeFun.call(_this).then((res) => {
         if (!res) return;
         var userInfo = this.GET_GLOBAL("loginUser");
         var result =  this.HTTP_GET(
           "learun/adms/PersonnelManagement/MeetingSignInRecord/scan",
           {
             userid: userInfo.userId,
-            meetid: res.result,
+            meetid: res,
           },
           "签到时出错"
-        ).then(res1=>{this.TOAST(res1.result )})
+        ).then(res1=>{
+			this.TOAST(res1.result)
+			setTimeout(()=>{
+				this.NAV_BACK()
+			},1000)
+		})
       });
     },
     tapScan() {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue
index 00d89e6e7..7bd17e8f3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue	
@@ -31,15 +31,17 @@ export default {
     async init() {
       this.LOADING('加载中…')
       const noticeItem = this.GET_PARAM()
-
       this.content = this.CONVERT_HTML(noticeItem.f_content)
-
       this.time = moment(noticeItem.f_time).format('HH : mm')
       this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日')
       this.SET_TITLE(noticeItem.f_title)
 
       this.ready = true
       this.HIDE_LOADING()
+	  let _postData = {
+	  	newsId: noticeItem.f_id,
+	  }
+	  this.HTTP_POST('learun/news/newsRead',_postData, '加载数据时出错');
     }
   }
 }
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg.vue
index bd59cb137..58981285d 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg.vue	
@@ -132,7 +132,7 @@ export default {
         return null
       }
 
-      return this.API + `/user/img?data=${item.F_OtherUserId}`
+      return this.API + `/learun/adms/user/img?data=${item.F_OtherUserId}`
     }
   },
 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg/chat.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg/chat.vue
index 1b8e6bd8a..0cebe305f 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg/chat.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/msg/chat.vue	
@@ -186,7 +186,7 @@ export default {
 
     // 获取用户头像图片 url
     avatar(id) {
-      return id === this.chatUserId && this.isSystem ? null : this.API + `/user/img?data=${id}`
+      return id === this.chatUserId && this.isSystem ? null : this.API + `/learun/adms/user/img?data=${id}`
     }
   },
 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue
index 0ae3c6381..7774d7de3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue	
@@ -156,7 +156,7 @@ export default {
         return ''
       }
 
-      return this.API + `/user/img?data=${this.currentUser.userId}`
+      return this.API + `/learun/adms/user/img?data=${this.currentUser.userId}`
     }
   },
 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/info.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/info.vue
index 1b87fb850..93b978381 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/info.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/info.vue	
@@ -34,7 +34,7 @@ export default {
     
     // 头像图片 url
     avatarSrc() {
-      return this.API + `/user/img?data=${this.currentUser.userId}`
+      return this.API + `/learun/adms/user/img?data=${this.currentUser.userId}`
     }
   }
 }
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/qrcode.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/qrcode.vue
index 272bde806..3297a7881 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/qrcode.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/qrcode.vue	
@@ -30,7 +30,7 @@ export default {
 
     // 头像图片 url
     avatar() {
-      return this.API + `/user/img?data=${this.currentUser.userId}`
+      return this.API + `/learun/adms/user/img?data=${this.currentUser.userId}`
     },
 
     // 用户公司部门 tag
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue
index 565660754..0a42f97a7 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/single.vue	
@@ -95,25 +95,28 @@ export default {
       //   t.formId 使用表单，根据这个 formId 来获取 scheme 等信息
       //   t.appurl 使用移动页面，直接跳转到本地的页面；表单结构等均写死在页面里
       const { wfForms } = this.currentNode
-	  console.log(wfForms);
-
       // 处理没有有效表单的情况，停止加载
       if (!wfForms || wfForms.every(t => !t.formId && !t.appurl)) {
         this.HIDE_LOADING()
         this.TOAST('移动表单数据(wfForms)中无有效表单')
         return
       }
+	  
+	  const fetchFolderkeyData=await this.fetchFolderkeyData(this.currentNode , this.processId);
+	  uni.setStorageSync('guids',JSON.stringify(fetchFolderkeyData));
 
-      // 处理移动端本地表单（也就是系统表单）的情况，直接跳转过去
-      const appSysPage = wfForms.find(t => t.appurl)
-      if (this.type !== 'child' && appSysPage) {
-        this.sysFormJump(appSysPage.appurl, {
-          currentNode: this.currentNode,
-          currentTask: this.currentTask,
-          logList: this.processList
-        })
-        return
-      }
+    //   // 处理移动端本地表单（也就是系统表单）的情况，直接跳转过去
+    //   const appSysPage = wfForms.find(t => t.appurl)
+    //   if (this.type !== 'child' && appSysPage) {
+    //     this.sysFormJump(appSysPage.appurl, {
+    //       currentNode: this.currentNode,
+    //       currentTask: this.currentTask,
+    //       logList: this.processList,
+		  // processInfo:this.processInfo
+    //     })
+    //     return
+    //   }
+	  
       if (this.type === 'child') {
         // 发起子流程的场合
         // 获取子流程的流程信息，提取出时间线和表单模板 code
@@ -144,7 +147,21 @@ export default {
           code: this.code,
           useDefault: true
         })
-		console.log("formValue",formValue,"scheme",scheme)
+		
+		// 处理移动端本地表单（也就是系统表单）的情况，直接跳转过去
+		const appSysPage = wfForms.find(t => t.appurl)
+		if (this.type !== 'child' && appSysPage) {
+		  this.sysFormJump(appSysPage.appurl, {
+		    currentNode: this.currentNode,
+		    currentTask: this.currentTask,
+		    logList: this.processList,
+			processInfo:this.processInfo,
+			formValue,
+			scheme,
+		  })
+		  return
+		}
+		
         this.scheme = scheme
         this.formValue = formValue
         this.rel = rel
@@ -152,8 +169,6 @@ export default {
         // 不是子流程，可以直接渲染
         const schemeData = await this.fetchSchemeData(this.currentNode)
         const formData = await this.fetchFormData(this.currentNode, this.processId)
-		console.log(schemeData)
-		console.log(formData)
         const { formValue, scheme, rel } = await this.getCustomForm({
           formData,
           schemeData,
@@ -161,7 +176,21 @@ export default {
           processId: this.processId,
           code: null
         })
-		console.log("formValue",formValue,"scheme",scheme)
+		
+		// 处理移动端本地表单（也就是系统表单）的情况，直接跳转过去
+		const appSysPage = wfForms.find(t => t.appurl)
+		if (this.type !== 'child' && appSysPage) {
+		  this.sysFormJump(appSysPage.appurl, {
+		    currentNode: this.currentNode,
+		    currentTask: this.currentTask,
+		    logList: this.processList,
+			processInfo:this.processInfo,
+			formValue,
+			scheme,
+		  })
+		  return
+		}
+		
         this.scheme = scheme
         this.formValue = formValue
         this.rel = rel
@@ -202,7 +231,7 @@ export default {
             return
           }
           this.LOADING(`提交${actionText}中…`)
-          this.HTTP_POST(`/newwf${actionUrl}`, actionData, `提交${actionText}失败`).then(success => {
+          this.HTTP_POST(`/learun/adms/newwf${actionUrl}`, actionData, `提交${actionText}失败`).then(success => {
             this.HIDE_LOADING()
             if (success) {
               this.EMIT('task-list-change')
@@ -221,7 +250,7 @@ export default {
           this.LOADING('正在提交…')
           const draftFormValue = this.$refs.form.getFormValue()
           const draftPostData = await this.getPostData(draftFormValue, this.scheme)
-          this.HTTP_POST('/newwf​/draft', draftPostData, '提交草稿失败').then(success => {
+          this.HTTP_POST('/learun/adms/newwf/draft', draftPostData, '提交草稿失败').then(success => {
             this.HIDE_LOADING()
             if (success) {
               this.EMIT('task-list-change')
@@ -250,7 +279,7 @@ export default {
             postData.parentTaskId = this.taskId
           }
           const errorTips = '流程发起失败'
-          this.HTTP_POST('/newwf/createchildflow', postData, errorTips).then(success => {
+          this.HTTP_POST('/learun/adms/newwf/createchildflow', postData, errorTips).then(success => {
             this.HIDE_LOADING()
             if (success) {
               this.EMIT('task-list-change')
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue
index 40d538e79..f8269c91d 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/releasetask/single.vue	
@@ -110,7 +110,10 @@ export default {
 
       this.needTitle = this.type !== 'again' && Number(currentNode.isTitle) === 1
       const formData = await this.fetchFormData(currentNode, processId)
-      const schemeData = await this.fetchSchemeData(currentNode)
+	  
+      const schemeData = await this.fetchSchemeData(currentNode);
+	  const fetchFolderkeyData=await this.fetchFolderkeyData(currentNode, processId);
+	  uni.setStorageSync('guids',JSON.stringify(fetchFolderkeyData));
       const { formValue, scheme, rel } = await this.getCustomForm({
         schemeData,
         processId,
@@ -119,14 +122,15 @@ export default {
         code: this.type === 'again' ? null : code,
         useDefault: true
       })
+	  
       this.rel = rel
       this.scheme = scheme
       this.formValue = formValue
       this.code = code
       this.processId = processId
-
       this.ready = true
       this.HIDE_LOADING()
+	  
     },
 
     // 提交草稿按钮
@@ -194,7 +198,6 @@ export default {
     verifyValue() {
 		
       const errList = this.$refs.form.verifyValue()
-	  console.log(errList,'errList')
       if (this.needTitle && !this.title) {
         errList.push(`流程的标题不能为空`)
       }
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js
index 89f253e06..d53429cf3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js	
@@ -32,301 +32,383 @@ import customForm from '@/common/customform.js'
  * （以上只是简单介绍；实际使用中，如果打开子流程，需要拉取父/子两个流程信息）
  */
 export default {
-  mixins: [customForm],
-
-  methods: {
-    /**
-     * 从流程信息中生成 scheme、formValue
-     * 参数： { schemeData (必填), processId, currentNode, formData (新建时为 null), code, useDefault }
-     * 返回： { scheme, formValue, rel }
-     * 
-     * 参数：
-     *  schemeData： 使用 fetchSchemeData 方法拉取到的原始 scheme 数据，未经过格式化处理
-     *  processId： 表单 GUID；如果是新建表单，可以用 this.GUID('-') 生成一个
-     *  currentNode： 使用 getCurrentNode 方法拉取到的当前节点信息，用于权限控制
-     *  formData： 填入表单的表单值，新建表单时此项为 null 即可
-     *  code： 表单编号 code，会被赋值到返回的 formValue.code；重新发起流程的场合赋 null
-     *  useDefault： 如果 formData 中某一项为空，是否对这一项填入默认值；通常在编辑草稿时启用
-     * 
-     * 该方法返回的 scheme 项可能带有以下属性：
-     *   __valuePath__： 表单值在 formValue 中的路径，使用 lodash 的 get、set 方法即可读写
-     *   __sourceData__： 表单值的选单数据
-     *   __defaultItem__： 类型为 girdtable 的表单项带有此属性，表示添加一行表格时候表格项的默认值
-     *   __schemeIndex__： （暂时用不到）表单项位于 schemeData 根级内的第几个子项中
-     *   __dataIndex__： （暂时用不到）表单项位于 F_Scheme.data 中的第几个子项中
-     */
-    async getCustomForm(prop) {
-      const { schemeData, formData, currentNode, code, processId, useDefault } = prop
-		console.log(prop,'prop')
-      // 处理字段之间的级联、绑定关系
-      // 需要绑定 change 事件的：
-      //   datetime： 修改后重新计算 datetimerange
-      //   organize： 修改后重设级联到该组件的其他组件的值，user 一级无需处理
-      // 需要绑定某值的：
-      //   organize： 级联到某个组件，company 一级无需处理
-      const schemeRef = {}
-      const refList = []
-
-      // 最终返回值：scheme、rel、formValue
-      const scheme = []
-      const rel = {}
-      const formValue = { processId, formreq: [] }
-      if (code) {
-        formValue.code = code
-      }
-
-      // 遍历 schemeData 中所有的 scheme
-      const schemeList = Array.isArray(schemeData) ? schemeData : Object.values(schemeData)
-      for (let schemeIndex = 0; schemeIndex < schemeList.length; ++schemeIndex) {
-		  
-        const schemeItem = schemeList[schemeIndex]
-        schemeItem.F_Scheme = JSON.parse(schemeItem.F_Scheme)
-        // 已有表单值的时候,舍弃掉不存在表单值中的 scheme
-        if (formData && !formData[schemeItem.F_SchemeInfoId]) {
-          continue
-        }
-		
-        // 设置 formreq 的内容,非新建模式下需要设置 keyValue
-        const { formId, field } = get(currentNode, `wfForms.${schemeIndex}`, {})
-        const formreqObj = { schemeInfoId: formId, processIdName: field, formData: {} }
-        if (formData) {
-          if (Object.values(get(formData, `${schemeItem.F_SchemeInfoId}`, {})).some(t => t && t.length > 0)) {
-            formreqObj.keyValue = processId
-          }
-        }
-        formValue.formreq[schemeIndex] = formreqObj
-
-        for (let dataIndex = 0; dataIndex < schemeItem.F_Scheme.data.length; ++dataIndex) {
-          const { componts } = schemeItem.F_Scheme.data[dataIndex]
-          for (const t of componts) {
-            // 之后的 t 即表示每个 scheme 项
-            t.__valuePath__ = `formreq.${schemeIndex}.formData.${t.id}`
-            // 以下两个属性暂时用不到
-            t.__schemeIndex__ = schemeIndex
-            t.__dataIndex__ = dataIndex
-
-            if (t.type === 'girdtable' && t.table) {
-              // 数据项是表格的情况
-              // 先设置源数据,不然无法获取默认值
-              for (const fieldItem of t.fieldsData) {
-                fieldItem.__sourceData__ = await this.getSourceData(fieldItem)
-              }
-              t.__defaultItem__ = await this.getDefaultData(t, prop)
-              if (formData) {
-                // 有表单值的情况,从表单值中获取数据
-                const val = []
-                for (const valueItem of get(formData, `${schemeItem.F_SchemeInfoId}.${t.table}`, [])) {
-                  const tableItemValue = {}
-                  for (const fieldItem of t.fieldsData.filter(t => t.field)) {
-                    const formDataValue = get(valueItem, fieldItem.field.toLowerCase())
-                    tableItemValue[fieldItem.field] = await this.convertToFormValue(fieldItem, formDataValue)
-                  }
-
-                  val.push(tableItemValue)
-                }
-
-                // useDefault 表示在从 formData 取不到值的时候使用默认值
-                if ((!val || val.length <= 0) && useDefault) {
-                  set(formValue, t.__valuePath__, [this.COPY(t.__defaultItem__)])
-                } else {
-                  set(formValue, t.__valuePath__, val)
-                }
-
-              } else {
-                // 无表单值的情况,默认值
-                set(formValue, t.__valuePath__, [this.COPY(t.__defaultItem__)])
-              }
-
-            } else if (t.field) {
-              // 数据项不是表格的情况
-              // 先设置源数据,不然无法获取默认值
-              t.__sourceData__ = await this.getSourceData(t)
-              if (formData) {
-                // 有表单值的情况,从表单值中获取数据
-                const path = `${schemeItem.F_SchemeInfoId}.${t.table}.${dataIndex}.${t.field.toLowerCase()}`
-                const formDataValue = get(formData, path)
-
-                // useDefault 表示在从 formData 取不到值的时候使用默认值
-                if (!formDataValue && useDefault) {
-                  set(formValue, t.__valuePath__, await this.getDefaultData(t, prop))
-                } else {
-                  set(formValue, t.__valuePath__, await this.convertToFormValue(t, formDataValue))
-                }
-
-              } else {
-                // 无表单值的情况,默认值
-                set(formValue, t.__valuePath__, await this.getDefaultData(t, prop))
-              }
-            }
-
-            // 权限控制
-            const authObj = get(currentNode, `wfForms.${schemeIndex}.authorize.${t.id}`, {})
-            t.edit = authObj.isEdit
-            if (Number(t.isHide) !== 1 && authObj.isLook !== 0) {
-              // 加入 scheme
-              scheme.push(t)
-
-              // organize、datetime 可能作为其他 organize 或 datetimerange 的依赖项，引用它们
-              if (['organize', 'datetime'].includes(t.type)) {
-                schemeRef[t.id] = t
-              }
-
-              // datetimerange、带有 relation 级联字段的 organize，依赖其他项
-              if ((t.type === 'datetimerange' && t.startTime && t.endTime) || (t.type === 'organize' && t.relation)) {
-                refList.push(t)
-              }
-            }
-          }
-        }
-      }
-
-      // 依次处理表单关联
-      refList.forEach(t => {
-        if (t.type === 'organize') {
-          // 处理组件结构级联
-          // 给当前组件赋上级级联的值路径 __relationPath__
-          const parent = schemeRef[t.relation]
-          t.__relationPath__ = parent.__valuePath__
-          // 给上级级联的组件注册自动重置当前组件的 change 事件
-          const relItem = { type: 'organize', id: t.id, path: t.__valuePath__ }
-          rel[parent.id] = rel[parent.id] ? rel[parent.id].concat(relItem) : [relItem]
-
-        } else if (t.type === 'datetimerange') {
-          // 处理日期区间
-          const start = schemeRef[t.startTime]
-          const end = schemeRef[t.endTime]
-
-          const relItem = {
-            type: 'datetimerange',
-            path: t.__valuePath__,
-            id: t.id,
-            startPath: start.__valuePath__,
-            endPath: end.__valuePath__,
-          }
-
-          rel[start.id] = rel[start.id] ? rel[start.id].concat(relItem) : [relItem]
-          rel[end.id] = rel[end.id] ? rel[end.id].concat(relItem) : [relItem]
-
-        }
-      })
-
-      return { scheme, formValue, rel }
-    },
-
-    /**
-     * 获取最终需要 POST 的数据
-     * 参数：formValue, scheme
-     * 返回：用于提交的数据
-     * 
-     * 遍历 formValue，将其中的表单值依次使用 convertToPostData 这个方法转化为提交值
-     */
-    async getPostData(originFormValue, scheme) {
-      const formValue = this.COPY(originFormValue)
-
-      // 依次按照 scheme 项目遍历
-      for (const item of scheme) {
-        if (item.field) {
-          // 不是表格的情况
-          const path = item.__valuePath__
-          const val = get(formValue, path)
-		  console.log(val,'val=======')
-          const result = await this.convertToPostData(item, val, originFormValue, scheme)
-          set(formValue, path, result)
-
-        } else if (item.table && item.fieldsData) {
-          // 是表格的情况
-          const tableValue = get(formValue, item.__valuePath__, [])
-          for (let valueIndex = 0; valueIndex < tableValue.length; ++valueIndex) {
-            for (const schemeItem of item.fieldsData) {
-              const path = `${item.__valuePath__}.${valueIndex}.${schemeItem.field}`
-              const val = get(formValue, path)
-			  
-              const result = await this.convertToPostData(schemeItem, val, originFormValue, scheme)
-              set(formValue, path, result)
-            }
-          }
-        }
-      }
-
-      formValue.formreq.forEach(t => { t.formData = JSON.stringify(t.formData) })
-      formValue.formreq = JSON.stringify(formValue.formreq)
-
-      return formValue
-    },
-
-    /**
-     * 获取流程信息
-     * 参数： { code, processId, taskId }
-     * 
-     */
-    async fetchProcessInfo({ code, processId, taskId }) {
-      const url = processId ? 'learun/adms/newwf/processinfo' : 'learun/adms/newwf/scheme'
-      const reqObj = { processId }
-      if (taskId) {
-        reqObj.taskId = taskId
-      }
-      const data = processId ? reqObj : code
-      const result = await this.HTTP_GET(url, data)
-
-      if (!result) { return {} }
-
-      if (result.info) {
-        result.info.Scheme = JSON.parse(result.info.Scheme)
-      } else if (result.F_Content) {
-        result.F_Content = JSON.parse(result.F_Content)
-      }
-
-      return result
-    },
-
-    /**
-     * 从 processInfo 流程信息中,提取出 currentNode
-     * 参数： processInfo
-     * 
-     */
-    getCurrentNode(processInfo) {
-      if (processInfo.info) {
-        return processInfo.info.Scheme.nodes.find(t => t.id === processInfo.info.CurrentNodeId)
-      } else if (processInfo.F_Content) {
-        return processInfo.F_Content.nodes.find(t => t.type === 'startround')
-      }
-
-      return {}
-    },
-
-    /**
-     * 拉取表单的 schemeData
-     * 参数： currentNode
-     * 
-     * 从当前节点 currentNode 中提取出表单 id，然后自 API 地址 /form/scheme 中拉取表单数据并返回
-     */
-    async fetchSchemeData(currentNode, currentTask, type) {
-      const { wfForms } = currentNode
-
-      const data = wfForms.filter(t => t.formId).map(t => ({ id: t.formId, ver: '' }))
-      const schemeData = await this.HTTP_GET('learun/adms/form/scheme', data)
-
-      return schemeData || {}
-    },
-
-    /**
-     * 拉取表单的 formData
-     * 参数： currentNode, keyValue
-     * 
-     * 提取当前节点信息、表单主键信息，从 API 地址 /form/data 中拉取表单数据
-     */
-    async fetchFormData({ wfForms }, keyValue) {
-      const reqData = wfForms
-        .filter(t => t.formId)
-        .map(t => ({
-          schemeInfoId: t.formId,
-          processIdName: t.field,
-          keyValue
-        }))
-
-      const formData = await this.HTTP_GET('learun/adms/form/data', reqData)
-
-      return formData || {}
-    }
-  }
+	mixins: [customForm],
+
+	methods: {
+		/**
+		 * 从流程信息中生成 scheme、formValue
+		 * 参数： { schemeData (必填), processId, currentNode, formData (新建时为 null), code, useDefault }
+		 * 返回： { scheme, formValue, rel }
+		 * 
+		 * 参数：
+		 *  schemeData： 使用 fetchSchemeData 方法拉取到的原始 scheme 数据，未经过格式化处理
+		 *  processId： 表单 GUID；如果是新建表单，可以用 this.GUID('-') 生成一个
+		 *  currentNode： 使用 getCurrentNode 方法拉取到的当前节点信息，用于权限控制
+		 *  formData： 填入表单的表单值，新建表单时此项为 null 即可
+		 *  code： 表单编号 code，会被赋值到返回的 formValue.code；重新发起流程的场合赋 null
+		 *  useDefault： 如果 formData 中某一项为空，是否对这一项填入默认值；通常在编辑草稿时启用
+		 * 
+		 * 该方法返回的 scheme 项可能带有以下属性：
+		 *   __valuePath__： 表单值在 formValue 中的路径，使用 lodash 的 get、set 方法即可读写
+		 *   __sourceData__： 表单值的选单数据
+		 *   __defaultItem__： 类型为 girdtable 的表单项带有此属性，表示添加一行表格时候表格项的默认值
+		 *   __schemeIndex__： （暂时用不到）表单项位于 schemeData 根级内的第几个子项中
+		 *   __dataIndex__： （暂时用不到）表单项位于 F_Scheme.data 中的第几个子项中
+		 */
+		async getCustomForm(prop) {
+			const {
+				schemeData,
+				formData,
+				currentNode,
+				code,
+				processId,
+				useDefault
+			} = prop
+			// 处理字段之间的级联、绑定关系
+			// 需要绑定 change 事件的：
+			//   datetime： 修改后重新计算 datetimerange
+			//   organize： 修改后重设级联到该组件的其他组件的值，user 一级无需处理
+			// 需要绑定某值的：
+			//   organize： 级联到某个组件，company 一级无需处理
+			const schemeRef = {}
+			const refList = []
+
+			// 最终返回值：scheme、rel、formValue
+			const scheme = []
+			const rel = {}
+			const formValue = {
+				processId,
+				formreq: []
+			}
+			if (code) {
+				formValue.code = code
+			}
+
+			// 遍历 schemeData 中所有的 scheme
+			const schemeList = Array.isArray(schemeData) ? schemeData : Object.values(schemeData)
+			for (let schemeIndex = 0; schemeIndex < schemeList.length; ++schemeIndex) {
+
+				const schemeItem = schemeList[schemeIndex]
+				schemeItem.F_Scheme = JSON.parse(schemeItem.F_Scheme)
+				// 已有表单值的时候,舍弃掉不存在表单值中的 scheme
+				if (formData && !formData[schemeItem.F_SchemeInfoId]) {
+					continue
+				}
+
+				// 设置 formreq 的内容,非新建模式下需要设置 keyValue
+				const {
+					formId,
+					field
+				} = get(currentNode, `wfForms.${schemeIndex}`, {})
+				const formreqObj = {
+					schemeInfoId: formId,
+					processIdName: field,
+					formData: {}
+				}
+				if (formData) {
+					if (Object.values(get(formData, `${schemeItem.F_SchemeInfoId}`, {})).some(t => t && t.length >
+							0)) {
+						formreqObj.keyValue = processId
+					}
+				}
+				formValue.formreq[schemeIndex] = formreqObj
+
+				for (let dataIndex = 0; dataIndex < schemeItem.F_Scheme.data.length; ++dataIndex) {
+					const {
+						componts
+					} = schemeItem.F_Scheme.data[dataIndex]
+					for (const t of componts) {
+						// 之后的 t 即表示每个 scheme 项
+						t.__valuePath__ = `formreq.${schemeIndex}.formData.${t.id}`
+						// 以下两个属性暂时用不到
+						t.__schemeIndex__ = schemeIndex
+						t.__dataIndex__ = dataIndex
+
+						if (t.type === 'girdtable' && t.table) {
+							// 数据项是表格的情况
+							// 先设置源数据,不然无法获取默认值
+							for (const fieldItem of t.fieldsData) {
+								fieldItem.__sourceData__ = await this.getSourceData(fieldItem)
+							}
+							t.__defaultItem__ = await this.getDefaultData(t, prop)
+							if (formData) {
+								// 有表单值的情况,从表单值中获取数据
+								const val = []
+								for (const valueItem of get(formData, `${schemeItem.F_SchemeInfoId}.${t.table}`,
+										[])) {
+									const tableItemValue = {}
+									for (const fieldItem of t.fieldsData.filter(t => t.field)) {
+										const formDataValue = get(valueItem, fieldItem.field.toLowerCase())
+										tableItemValue[fieldItem.field] = await this.convertToFormValue(fieldItem,
+											formDataValue)
+									}
+
+									val.push(tableItemValue)
+								}
+
+								// useDefault 表示在从 formData 取不到值的时候使用默认值
+								if ((!val || val.length <= 0) && useDefault) {
+									set(formValue, t.__valuePath__, [this.COPY(t.__defaultItem__)])
+								} else {
+									set(formValue, t.__valuePath__, val)
+								}
+
+							} else {
+								// 无表单值的情况,默认值
+								set(formValue, t.__valuePath__, [this.COPY(t.__defaultItem__)])
+							}
+
+						} else if (t.field) {
+							// 数据项不是表格的情况
+							// 先设置源数据,不然无法获取默认值
+							t.__sourceData__ = await this.getSourceData(t)
+							if (formData) {
+								// 有表单值的情况,从表单值中获取数据
+								const path =
+									`${schemeItem.F_SchemeInfoId}.${t.table}.${dataIndex}.${t.field.toLowerCase()}`
+								const formDataValue = get(formData, path)
+
+								// useDefault 表示在从 formData 取不到值的时候使用默认值
+								if (!formDataValue && useDefault) {
+									set(formValue, t.__valuePath__, await this.getDefaultData(t, prop))
+								} else {
+									set(formValue, t.__valuePath__, await this.convertToFormValue(t, formDataValue))
+								}
+
+							} else {
+								// 无表单值的情况,默认值
+								set(formValue, t.__valuePath__, await this.getDefaultData(t, prop))
+							}
+						}
+
+						// 权限控制
+						const authObj = get(currentNode, `wfForms.${schemeIndex}.authorize.${t.id}`, {})
+						t.edit = authObj.isEdit
+						if (Number(t.isHide) !== 1 && authObj.isLook !== 0) {
+							// 加入 scheme
+							scheme.push(t)
+
+							// organize、datetime 可能作为其他 organize 或 datetimerange 的依赖项，引用它们
+							if (['organize', 'datetime'].includes(t.type)) {
+								schemeRef[t.id] = t
+							}
+
+							// datetimerange、带有 relation 级联字段的 organize，依赖其他项
+							if ((t.type === 'datetimerange' && t.startTime && t.endTime) || (t.type ===
+									'organize' && t.relation)) {
+								refList.push(t)
+							}
+						}
+					}
+				}
+			}
+
+			// 依次处理表单关联
+			refList.forEach(t => {
+				if (t.type === 'organize') {
+					// 处理组件结构级联
+					// 给当前组件赋上级级联的值路径 __relationPath__
+					const parent = schemeRef[t.relation]
+					t.__relationPath__ = parent.__valuePath__
+					// 给上级级联的组件注册自动重置当前组件的 change 事件
+					const relItem = {
+						type: 'organize',
+						id: t.id,
+						path: t.__valuePath__
+					}
+					rel[parent.id] = rel[parent.id] ? rel[parent.id].concat(relItem) : [relItem]
+
+				} else if (t.type === 'datetimerange') {
+					// 处理日期区间
+					const start = schemeRef[t.startTime]
+					const end = schemeRef[t.endTime]
+
+					const relItem = {
+						type: 'datetimerange',
+						path: t.__valuePath__,
+						id: t.id,
+						startPath: start.__valuePath__,
+						endPath: end.__valuePath__,
+					}
+
+					rel[start.id] = rel[start.id] ? rel[start.id].concat(relItem) : [relItem]
+					rel[end.id] = rel[end.id] ? rel[end.id].concat(relItem) : [relItem]
+
+				}
+			})
+
+			return {
+				scheme,
+				formValue,
+				rel
+			}
+		},
+		newguid() {
+			return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+				var r = Math.random() * 16 | 0,
+					v = c == 'x' ? r : (r & 0x3 | 0x8);
+				return v.toString(16);
+			});
+		},
+		/**
+		 * 获取最终需要 POST 的数据
+		 * 参数：formValue, scheme
+		 * 返回：用于提交的数据
+		 * 
+		 * 遍历 formValue，将其中的表单值依次使用 convertToPostData 这个方法转化为提交值
+		 */
+		async getPostData(originFormValue, scheme) {
+			const formValue = this.COPY(originFormValue)
+			// 依次按照 scheme 项目遍历
+			for (const item of scheme) {
+				if (item.field) {
+					// 不是表格的情况
+					const path = item.__valuePath__
+					const val = get(formValue, path)
+
+					if (item.type == 'upload') {
+						// 先生成一个guid
+						var guid = this.newguid();
+						// 取出当前列对应的labelId
+						var labeId = item.id
+						// 从缓存取出当前审批流程所有的guid
+						var guids = JSON.parse(uni.getStorageSync('guids'))
+						if (guids&&JSON.stringify(guids)!=='{}') {
+							guid = guids[labeId]
+						}
+					}
+					const result = await this.convertToPostData(item, val, originFormValue, scheme, guid)
+					set(formValue, path, result)
+
+				} else if (item.table && item.fieldsData) {
+					// 是表格的情况
+					const tableValue = get(formValue, item.__valuePath__, [])
+					for (let valueIndex = 0; valueIndex < tableValue.length; ++valueIndex) {
+						for (const schemeItem of item.fieldsData) {
+							const path = `${item.__valuePath__}.${valueIndex}.${schemeItem.field}`
+							const val = get(formValue, path)
+
+							const result = await this.convertToPostData(schemeItem, val, originFormValue, scheme,
+								guid)
+							set(formValue, path, result)
+						}
+					}
+				}
+			}
+
+			formValue.formreq.forEach(t => {
+				t.formData = JSON.stringify(t.formData)
+			})
+			formValue.formreq = JSON.stringify(formValue.formreq)
+
+			return formValue
+		},
+
+		/**
+		 * 获取流程信息
+		 * 参数： { code, processId, taskId }
+		 * 
+		 */
+		async fetchProcessInfo({
+			code,
+			processId,
+			taskId
+		}) {
+			const url = processId ? 'learun/adms/newwf/processinfo' : 'learun/adms/newwf/scheme'
+			const reqObj = {
+				processId
+			}
+			if (taskId) {
+				reqObj.taskId = taskId
+			}
+			const data = processId ? reqObj : code
+			const result = await this.HTTP_GET(url, data)
+
+			if (!result) {
+				return {}
+			}
+
+			if (result.info) {
+				result.info.Scheme = JSON.parse(result.info.Scheme)
+			} else if (result.F_Content) {
+				result.F_Content = JSON.parse(result.F_Content)
+			}
+
+			return result
+		},
+
+		/**
+		 * 从 processInfo 流程信息中,提取出 currentNode
+		 * 参数： processInfo
+		 * 
+		 */
+		getCurrentNode(processInfo) {
+			if (processInfo.info) {
+				return processInfo.info.Scheme.nodes.find(t => t.id === processInfo.info.CurrentNodeId)
+			} else if (processInfo.F_Content) {
+				return processInfo.F_Content.nodes.find(t => t.type === 'startround')
+			}
+
+			return {}
+		},
+
+		/**
+		 * 拉取表单的 schemeData
+		 * 参数： currentNode
+		 * 
+		 * 从当前节点 currentNode 中提取出表单 id，然后自 API 地址 /form/scheme 中拉取表单数据并返回
+		 */
+		async fetchSchemeData(currentNode, currentTask, type) {
+			const {
+				wfForms
+			} = currentNode
+
+			const data = wfForms.filter(t => t.formId).map(t => ({
+				id: t.formId,
+				ver: ''
+			}))
+			const schemeData = await this.HTTP_GET('learun/adms/form/scheme', data)
+
+			return schemeData || {}
+		},
+
+		/**
+		 * 拉取表单的 formData
+		 * 参数： currentNode, keyValue
+		 * 
+		 * 提取当前节点信息、表单主键信息，从 API 地址 /form/data 中拉取表单数据
+		 */
+		async fetchFormData({
+			wfForms
+		}, keyValue) {
+			const reqData = wfForms
+				.filter(t => t.formId)
+				.map(t => ({
+					schemeInfoId: t.formId,
+					processIdName: t.field,
+					keyValue
+				}))
+
+			const formData = await this.HTTP_GET('learun/adms/form/data', reqData)
+
+			return formData || {}
+		},
+		async fetchFolderkeyData(currentNode, keyValue) {
+			const {
+				wfForms
+			} = currentNode
+
+			const reqData = wfForms
+				.filter(t => t.formId)
+				.map(t => ({
+					id: t.formId,
+					ver: '',
+					schemeInfoId: t.formId,
+					processIdName: t.field,
+					keyValue
+				}))
+			const folderkeyData = await this.HTTP_GET('learun/adms/form/folderkey', reqData)
+			return folderkeyData || {}
+		},
+	}
 }