diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs
index 09f0aecbc..893cc89ae 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ScoreCheckInfoController.cs	
@@ -3,6 +3,9 @@ using System.Data;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using Learun.Application.Base.SystemModule;
+using System;
+using System.Linq;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 {
@@ -16,6 +19,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     public class ScoreCheckInfoController : MvcControllerBase
     {
         private ScoreCheckInfoIBLL scoreCheckInfoIBLL = new ScoreCheckInfoBLL();
+        private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
+        private StuEncourgementIBLL stuEncourgementIBLL = new StuEncourgementBLL();
+        private StuPunishmentIBLL stuPunishmentIBLL = new StuPunishmentBLL();
+        private StuScoreIBLL stuScoreIBLL = new StuScoreBLL();
+        private StudentCertificateIBLL studentCertificateIBLL = new StudentCertificateBLL();
+        private StuAttendanceLeaveIBLL stuAttendanceLeaveIBLL = new StuAttendanceLeaveBLL();
 
         #region 视图功能
 
@@ -64,6 +73,46 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+
+        /// <summary>
+        /// 学业成绩考核记载表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult RecordTablePrint(string keyValue)
+        {
+            var entity = scoreCheckInfoIBLL.GetScoreCheckInfoEntity(keyValue);
+            if (entity == null)
+            {
+                entity = new ScoreCheckInfoEntity();
+            }
+            //意见盖章
+            if (!string.IsNullOrEmpty(entity.FilePath))
+            {
+                var annexesFileEntity = annexesFileIBLL.GetEntityByFolderId(entity.FilePath);
+                if (annexesFileEntity != null)
+                {
+                    entity.FilePath = annexesFileEntity.F_FilePath.Substring(annexesFileEntity.F_FilePath.IndexOf("Resource") - 1);
+                }
+                else
+                {
+                    entity.FilePath = "";
+                }
+            }
+            
+            //职业资格证书
+            entity.StudentCertificateList = studentCertificateIBLL.GetList("{\"AcademicYearNo\":\"" + entity.AcademicYearNo + "\",\"Semester\":\"" + entity.Semester + "\",\"StuNo\":\"" + entity.StuNo + "\"}").OrderByDescending(x => x.CreateTime).ToList();
+            //奖罚情况
+            entity.StuEncourgementList = stuEncourgementIBLL.GetEncourgementListByStuNo(entity.AcademicYearNo, entity.Semester, entity.StuNo).ToList();
+            entity.StuPunishmentList = stuPunishmentIBLL.GetPunishmentListByStuNo(entity.AcademicYearNo, entity.Semester, entity.StuNo).ToList();
+            //学习成绩
+            entity.StuScoreList = stuScoreIBLL.GetScoreListByStuInfo("{\"AcademicYearNo\":\"" + entity.AcademicYearNo + "\",\"Semester\":\"" + entity.Semester + "\",\"StuNo\":\"" + entity.StuNo + "\"}").ToList();
+            //考勤
+            entity.StuAttendanceLeaveList = stuAttendanceLeaveIBLL.GetListByJson("{\"AcademicYearNo\":\"" + entity.AcademicYearNo + "\",\"Semester\":\"" + entity.Semester + "\",\"StuNo\":\"" + entity.StuNo + "\"}").ToList();
+
+
+            return View(entity);
+        }
         #endregion
 
         #region 获取数据
@@ -165,7 +214,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("本次生成" + res + "条数据！");
         }
         /// <summary>
-        /// 评教
+        /// 教师评语/教务意见
         /// </summary>
         /// <param name="keyValue"></param>
         /// <param name="strEntity"></param>
@@ -176,33 +225,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             ScoreCheckInfoEntity entity = strEntity.ToObject<ScoreCheckInfoEntity>();
             scoreCheckInfoIBLL.SaveTeachEntity(keyValue, entity);
-            return Success("评教成功！");
-        }
-        /// <summary>
-        /// 提交
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AjaxOnly]
-        public ActionResult SubmitFrom(string keyValue)
-        {
-            scoreCheckInfoIBLL.SubmitEntity(keyValue);
-            return Success("提交成功！");
-        }
-        /// <summary>
-        /// 审核
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [AjaxOnly]
-        public ActionResult AuditFrom(string keyValue, string strEntity)
-        {
-            ScoreCheckInfoEntity entity = strEntity.ToObject<ScoreCheckInfoEntity>();
-            scoreCheckInfoIBLL.AuditEntity(keyValue, entity);
-            return Success("审核成功！");
+            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 70567beae..4e68b3588 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	
@@ -149,6 +149,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("操作成功！");
         }
 
+        /// <summary>
+        /// 复学
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoGoBack(string keyValue)
+        {
+            stuInfoBasicChangeIBLL.DoGoBack(keyValue);
+            return Success("操作成功！");
+        }
+
         #endregion
 
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs
index d779513c5..49057d604 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs	
@@ -256,6 +256,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
 
+        /// <summary>
+        /// 毕业证领取表单
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GraduateDiplomaReceiveForm()
+        {
+            return View();
+        }
 
         #endregion
 
@@ -413,9 +421,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpPost]
         [AjaxOnly]
 
-        public ActionResult GetCard(string keyValue,string status)
+        public ActionResult GetCard(string keyValue,string status, string strEntity)
         {
-            stuInfoBasicIBLL.GetCard(keyValue,status);
+            if (status == "1")//领取
+            {
+                StuInfoBasicEntity entity = strEntity.ToObject<StuInfoBasicEntity>();
+                stuInfoBasicIBLL.GetCard(keyValue, status, entity);
+            }
+            else//取消领取
+            {
+                stuInfoBasicIBLL.GetCard(keyValue,status,new StuInfoBasicEntity());
+            }
             return Success("操作成功");
         }
 
@@ -577,6 +593,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuInfoBasicIBLL.CreateGraduateNoByMajor(CityCode, SchoolCode, MajorList);
             return Success("生成成功");
         }
+        /// <summary>
+        /// 按学号生成毕业证号
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCreateGraduateNo()
+        {
+            stuInfoBasicIBLL.DoCreateGraduateNo();
+            return Success("生成成功");
+        }
 
         /// <summary>
         /// 审核
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml
index 2ceef9f8a..a98693ebb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.cshtml	
@@ -1,15 +1,53 @@
 @{
-    ViewBag.Title = "学业考核成绩记载审核表单";
+    ViewBag.Title = "教务意见";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
-<div class="lr-form-wrap">
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <input id="StuNo" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="StuName" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">专业部<font face="宋体">*</font></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    
+    <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">教务部门审核意见<font face="宋体">*</font></div>
+        <textarea id="CheckOpinion" type="text" class="form-control" style="height:80px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">意见日期<font face="宋体">*</font></div>
+        <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CheckTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
-        <div class="lr-form-item-title">审核通过</div>
-        <div id="CheckStatus"></div>
+        <div class="lr-form-item-title">意见填写人</div>
+        <input id="CheckUser" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
-        <div class="lr-form-item-title">审核意见</div>
-        <textarea id="CheckOpinion" type="text" class="form-control" style="height:80px;"></textarea>
+        <div class="lr-form-item-title">意见盖章</div>
+        <div id="FilePath"></div>
     </div>
 </div>
+
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js
index 7b69b0b28..428081eb0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js	
@@ -2,7 +2,7 @@
  * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
  * 日  期：2019-05-15 10:33
- * 描  述：选修课报名审核表单
+ * 描  述：教务意见
  */
 var acceptClick;
 var keyValue = request('keyValue');
@@ -15,10 +15,25 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#CheckStatus').lrRadioCheckbox({
-                type: 'radio',
-                code: 'YesOrNoInt',
+            $('#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'
+            });
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorno' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {
@@ -43,7 +58,7 @@ var bootstrap = function ($, learun) {
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/AuditFrom?keyValue=' + keyValue, postData, function (res) {
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveTeachForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();
@@ -51,4 +66,4 @@ var bootstrap = function ($, learun) {
         });
     };
     page.init();
-}
+}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml
index 5b1812e4b..478894994 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml	
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = "学业成绩考核记录表";
+    ViewBag.Title = "一键生成";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.js
index de595743c..e4a78e8b8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.js	
@@ -2,7 +2,7 @@
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
  * 日  期：2022-09-19 14:37
- * 描  述：学业成绩考核记录表
+ * 描  述：一键生成
  */
 var acceptClick;
 var keyValue = request('keyValue');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.cshtml
index 78f1fa403..829a73b18 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.cshtml	
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = "学业成绩考核记录表";
+    ViewBag.Title = "教师评语";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
@@ -13,12 +13,12 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
         <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
-        <input id="StuNo" type="text" class="form-control" readonly="readonly"/>
+        <input id="StuNo" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
         <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
         <input id="StuName" type="text" class="form-control" readonly="readonly" />
-        </div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
         <div class="lr-form-item-title">专业部<font face="宋体">*</font></div>
         <div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
@@ -31,12 +31,24 @@
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
         <div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ScoreCheckInfo">
+
+    <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
         <div class="lr-form-item-title">操作等级<font face="宋体">*</font></div>
         <div id="OperatingLevel" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
         <div class="lr-form-item-title">班主任评语<font face="宋体">*</font></div>
-        <textarea id="TeacherDemo" class="form-control" style="height: 100px;"></textarea> </div>
+        <textarea id="TeacherDemo" class="form-control" style="height: 100px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">评语日期<font face="宋体">*</font></div>
+        <input id="TDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ScoreCheckInfo">
+        <div class="lr-form-item-title">评语填写人<font face="宋体">*</font></div>
+        <input id="Signed" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    
 </div>
+
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js
index ee1dcfda5..f8ffa23ff 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormTeach.js	
@@ -2,7 +2,7 @@
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
  * 日  期：2022-09-19 14:37
- * 描  述：学业成绩考核记录表
+ * 描  述：  教师评语
  */
 var acceptClick;
 var keyValue = request('keyValue');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml
index 3150c036e..f0d14467d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.cshtml	
@@ -52,12 +52,10 @@
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_generate" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 一键生成</a>
-                        <a id="lr_Coordinator" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 教师评语</a>
-                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>
-                        <a id="lr_lock" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 审核</a>
-                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
-                        @*<a id="lr_unlock" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 去审核</a>*@
+                        <a id="lr_generate" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;一键生成</a>
+                        <a id="lr_Coordinator" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;教师评语</a>
+                        <a id="lr_Opinion" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;教务意见</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;学业成绩考核记载表打印</a>
                     </div>
                 </div>
             </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js
index 9a5fe66f4..2017e0539 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js	
@@ -105,15 +105,6 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    if (keyValue.indexOf(',') != -1) {
-                        learun.alert.warning("只能选择一条记录进行编辑！");
-                        return;
-                    }
-                    var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark == "1" || CheckMark == "2") {
-                        learun.alert.warning("当前项目已提交不能编辑！");
-                        return;
-                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
@@ -130,11 +121,6 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
-                        learun.alert.warning("选中记录中包含已审核项目,不可删除！");
-                        return;
-                    }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/DeleteForm', { keyValue: keyValue }, function () {
@@ -144,50 +130,34 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 打印
-            $('#lr_print').on('click', function () {
-                $('#gridtable').jqprintTable();
-            });
-            //  审核
-            $('#lr_lock').on('click', function () {
+            
+            //教师评语
+            $('#lr_Coordinator').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
-                        learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！");
-                        return;
-                    }
                     learun.layerForm({
                         id: 'formTeach',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormAudit?keyValue=' + keyValue,
-                        width: 800,
-                        height: 600,
+                        title: '教师评语',
+                        url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormTeach?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
                     });
                 }
             });
-            //  教师评语
-            $('#lr_Coordinator').on('click', function () {
+
+            //教务意见
+            $('#lr_Opinion').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    if (keyValue.indexOf(',') != -1) {
-                        learun.alert.warning("只能选择一条记录进行编辑！");
-                        return;
-                    }
-                    var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
-                        learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！");
-                        return;
-                    }
                     learun.layerForm({
-                        id: 'formTeach',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormTeach?keyValue=' + keyValue,
-                        width: 800,
-                        height: 600,
+                        id: 'formAudit',
+                        title: '教务意见',
+                        url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormAudit?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -208,28 +178,28 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
-            //  提交
-            $('#lr_submit').on('click', function () {
+
+            //学业成绩考核记载表打印
+            $('#lr_print').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
-                        learun.alert.warning("选中记录中包含已审核项目,请勿重复提交！");
-                        return;
-                    }
-                    learun.layerConfirm('是否确认提交选择项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SubmitFrom', { keyValue: keyValue }, function () {
-                                refreshGirdData();
-                            });
+                    learun.layerForm({
+                        id: 'recordtableprint',
+                        title: '学业成绩考核记载表',
+                        url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/RecordTablePrint?keyValue=' + keyValue,
+                        width: 1200,
+                        height: 800,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
                         }
                     });
                 }
             });
+
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/GetPageList',
                 headData: [
                     { label: "学年", name: "AcademicYearNo", width: 60, align: "left" },
@@ -275,6 +245,14 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+
+                    { label: "班主任评语", name: "TeacherDemo", width: 100, align: "left" },
+                    {
+                        label: "评语日期", name: "TDate", width: 90, align: "left"
+                    },
+                    {
+                        label: "评语填写人", name: "Signed", width: 100, align: "left"
+                    },
                     {
                         label: "操作等级", name: "OperatingLevel", width: 60, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -287,50 +265,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "学校教务部门审核意见", name: "CheckOpinion", width: 150, align: "left" },
                     {
-                        label: "评语填写人", name: "Signed", 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: "TeacherDemo", width: 200, align: "left" },
-                    {
-                        label: "评价时间", name: "TDate", width: 100, align: "left",
-                        formatter: function (cellvalue) {
-                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
-                        }
-                    },
-                    { label: "学校教务部门审核意见", name: "CheckOpinion", width: 200, align: "left" },
-                    {
-                        label: "审核时间", name: "CheckTime", width: 100, align: "left",
-                        formatter: function (cellvalue) {
-                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
-                        }
+                        label: "意见日期", name: "CheckTime", width: 90, align: "left"
                     },
                     {
-                        label: "审核状态", name: "CheckStatus", width: 100, align: "left",
-                        formatter: function (cellvalue, row) {
-                            if (cellvalue == 1) {
-                                return '<span class=\"label label-warning\" >审核中</span>';
-                            } else if (cellvalue == 2) {
-                                return '<span class=\"label label-success\" >审核通过</span>';
-                            } else {
-                                return '<span class=\"label label-default\" >草稿</span>';
-                            }
-                        }
+                        label: "意见填写人", name: "CheckUser", width: 100, align: "left"
                     },
+                   
                 ],
                 mainId: 'ID',
                 isPage: true,
-                sidx: 'CreateTime desc',
-                isMultiselect: true,
+                sidx: 'AcademicYearNo desc,Semester desc,StuNo asc',
+                isMultiselect: false,
             });
             page.search();
         },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml
new file mode 100644
index 000000000..ee726a169
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml	
@@ -0,0 +1,437 @@
+@using Learun.Application.TwoDevelopment.EducationalAdministration
+@model Learun.Application.TwoDevelopment.EducationalAdministration.ScoreCheckInfoEntity
+@{
+    ViewBag.Title = "学业成绩考核记载表";
+    Layout = null;
+}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+
+<body>
+    <div style="text-align: right;">
+        <button id="print">打印表格</button>
+    </div>
+    <div class="table-page">
+        <h1 class="table-title">学生成绩考核记载表（<span>@Model.AcademicYearNo</span>学年，第<span>@Model.Semester</span>学期）</h1>
+        <table id="table" border="1" cellspacing="0" cellpadding="10" width="100%" align="center">
+            @{
+                var scoreList = Model.StuScoreList as IEnumerable<StuScoreEntity>;
+                //两个为一组
+                var scoreListTemp = scoreList.Select((x, i) => new { Index = i, Value = x }).GroupBy(x => x.Index / 2).Select(x => x.Select(y => y.Value).ToList()).ToList();
+                //第一列占多少行
+                int rowNum = 9;
+                if (scoreList.Count() > 14)
+                {
+                    rowNum = Convert.ToInt32(Math.Ceiling(Convert.ToDecimal(scoreList.Count() / 2))) + 2;
+                }
+
+                <tr>
+                    <td rowspan="@rowNum">
+                        <div style="width:20px;display: inline-block;">学业成绩</div>
+                    </td>
+                    <td rowspan="2">学科名称</td>
+                    <td colspan="2">成 绩</td>
+                    <td rowspan="2">学科名称</td>
+                    <td colspan="2">成 绩</td>
+                </tr>
+                <tr>
+                    <td>正考</td>
+                    <td>补考</td>
+                    <td>正考</td>
+                    <td>补考</td>
+                </tr>
+                for (int i = 0; i < rowNum - 2; i++)
+                {
+                    <tr>
+                        @if (i < scoreListTemp.Count())
+                        {
+                            for (int j = 0; j < 2; j++)
+                            {
+                                if (j < scoreListTemp[i].Count())
+                                {
+                                    <td>@scoreListTemp[i][j].LessonName</td>
+                                    <td>@(scoreListTemp[i][j].Score == null ? 0 : scoreListTemp[i][j].Score)</td>
+                                    <td>@(Convert.ToInt32(scoreListTemp[i][j].ScoreOfNotPassTwo) > 0 ? scoreListTemp[i][j].ScoreOfNotPassTwo : scoreListTemp[i][j].ScoreOfNotPass)</td>
+                                }
+                                else
+                                {
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                }
+
+                            }
+                        }
+                        else
+                        {
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                        }
+                    </tr>
+                }
+                <tr>
+                    <td colspan="2">学校教务部门审核意见</td>
+                    <td colspan="5">
+                        <div style="text-align:left;">@Model.CheckOpinion</div>
+                        <div class="text-right" style="padding-right: 64px;margin-top: 10px;position:relative;">
+                            （盖&nbsp; 章）
+                            @if (!string.IsNullOrEmpty(Model.FilePath))
+                            {
+                                <img id="FilePath" src="@Model.FilePath" style="position:absolute;bottom:0;right:5px;width:50px;height:30px;" />
+                            }
+                        </div>
+                        <div class="text-right" style="padding-right: 8px;">
+                            @{
+                                if (Model.CheckTime.HasValue)
+                                {
+                                    <span>@Model.CheckTime.Value.Year 年 @Model.CheckTime.Value.Month 月 @Model.CheckTime.Value.Day 日</span>
+                                }
+                                else
+                                {
+                                    <span>年 &nbsp; &nbsp; &nbsp; 月 &nbsp; &nbsp; &nbsp; 日</span>
+                                }
+                            }
+
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td rowspan="2">考勤</td>
+                    <td style="padding: 6px;">事假（节）</td>
+                    <td colspan="5" style="border: none;padding:0">
+                        <table border="1" cellspacing="0" cellpadding="6" width="100%" align="center"
+                               style="border-width: 0px;">
+                            <tr>
+                                <td>病假（节）</td>
+                                <td>旷课（节）</td>
+                                <td>迟到（次）</td>
+                                <td>早退（次）</td>
+                            </tr>
+                        </table>
+                    </td>
+
+                </tr>
+                <tr>
+                    @{
+                        var leaveList = Model.StuAttendanceLeaveList as IEnumerable<StuAttendanceLeaveEntity>;
+
+                        <td>@leaveList.Where(x=>x.LeaveType=="事假").Count()</td>
+                        <td colspan="5" style="border: none;padding:0">
+                            <table border="1" cellspacing="0" cellpadding="10" width="100%" align="center"
+                                   style="border-width: 0px;">
+                                <tr>
+                                    <td>@leaveList.Where(x => x.LeaveType == "病假").Count()</td>
+                                    <td>@leaveList.Where(x => x.LeaveType == "旷课").Count()</td>
+                                    <td>@leaveList.Where(x => x.LeaveType == "迟到").Count()</td>
+                                    <td>@leaveList.Where(x => x.LeaveType == "早退").Count()</td>
+                                </tr>
+                            </table>
+                        </td>
+                    }
+
+                </tr>
+                <tr>
+                    <td colspan="2">职业资格证书获得情况</td>
+                    <td colspan="5">
+                        <div style="text-align:left">
+                            @foreach (var item in Model.StudentCertificateList)
+                            {
+                                <span>@(Model.StudentCertificateList.IndexOf(item) + 1)、@item.CreateTime.Value.ToShortDateString().Replace("/", "-") @item.SCName </span><br>
+                            }
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2">奖 惩 记 载</td>
+                    <td colspan="5">
+                        <div style="text-align:left;">
+                            @foreach (var item in Model.StuEncourgementList)
+                            {
+                                <div class="tableTxt">奖励 @(Model.StuEncourgementList.IndexOf(item) + 1)、@item.EncourgeDate.Value.ToShortDateString().Replace("/", "-") @item.EncourgeName @item.Fee</div>
+                            }
+                            @foreach (var item in Model.StuPunishmentList)
+                            {
+                                <div class="tableTxt">处分 @(Model.StuPunishmentList.IndexOf(item) + 1)、@item.PunishDate.Value.ToShortDateString().Replace("/", "-") @item.PunishName</div>
+                            }
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td rowspan="2">
+                        <div style="width:20px;display: inline-block;">操行鉴定</div>
+                    </td>
+                    <td>操行等级</td>
+                    <td colspan="5" id="OperatingLevel">@Model.OperatingLevel </td>
+                </tr>
+                <tr>
+                    <td><div style="width:20px;display: inline-block;">班主任评估</div></td>
+                    <td colspan="5">
+                        <div style="text-align:left;">@Model.TeacherDemo</div>
+                        <div class="text-right" style="padding-right: 64px;margin-top: 140px;">班主任签名：<span id="Signed">@Model.Signed </span></div>
+                        <div class="text-right" style="padding-right: 8px;margin-top: 12px;">
+                            @{
+                                if (Model.TDate.HasValue)
+                                {
+                                    <span>@Model.TDate.Value.Year 年 @Model.TDate.Value.Month 月 @Model.TDate.Value.Day 日</span>
+                                }
+                                else
+                                {
+                                    <span>年 &nbsp; &nbsp; &nbsp; 月 &nbsp; &nbsp; &nbsp; 日</span>
+                                }
+                            }
+
+                        </div>
+                    </td>
+                </tr>
+            }
+        </table>
+        <div style="padding-left: 8px;margin-top: 4px;">注：操行等级分优、良、中、差四等</div>
+        <style>
+            .table-page {
+                font-size: 14px;
+            }
+
+            .table-title {
+                text-align: center;
+            }
+
+            table {
+                /* width: 540px; */
+            }
+
+            td {
+                text-align: center;
+                font-size: 14px;
+                height:21px;
+            }
+
+            .text-right {
+                text-align: right;
+            }
+
+            #print {
+                padding: 6px 8px;
+                cursor: pointer;
+                display: inline-block;
+            }
+        </style>
+    </div>
+
+    <script src="~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js"></script>
+    <script>
+        const isDOM = (obj) => {
+            return typeof HTMLElement === "object"
+                ? obj instanceof HTMLElement
+                : obj &&
+                typeof obj === "object" &&
+                obj.nodeType === 1 &&
+                typeof obj.nodeName === "string";
+        };
+        /* const extend = (obj, obj2) => {
+            for (const k in obj2) {
+              if (obj2.hasOwnProperty(k)) obj[k] = obj2[k]
+            }
+            return obj
+          } */
+        const isInBody = (node) => {
+            return node === document.body ? false : document.body.contains(node);
+        };
+        const wrapperRefDom = (refDom) => {
+            let prevDom = null;
+            let currDom = refDom;
+            if (!isInBody(currDom)) return currDom;
+
+            while (currDom) {
+                if (prevDom) {
+                    const element = currDom.cloneNode(false);
+                    element.appendChild(prevDom);
+                    prevDom = element;
+                } else {
+                    prevDom = currDom.cloneNode(true);
+                }
+                currDom = currDom.parentElement;
+            }
+            return prevDom;
+        };
+        const getStyle = (options) => {
+            let str = "";
+            const styles = document.querySelectorAll("style,link");
+            for (let i = 0; i < styles.length; i++) {
+                str += styles[i].outerHTML;
+            }
+            str +=
+                "<style>" +
+                (options.noPrint ? options.noPrint : ".no-print") +
+                "{display:none;}</style>";
+            return str;
+        };
+        const getHtml = (dom, options) => {
+            const inputs = document.querySelectorAll("input");
+            const textAreas = document.querySelectorAll("textarea");
+            const selects = document.querySelectorAll("select");
+
+            for (let k = 0; k < inputs.length; k++) {
+                if (inputs[k].type === "checkbox" || inputs[k].type === "radio") {
+                    if (inputs[k].checked === true) {
+                        inputs[k].setAttribute("checked", "checked");
+                    } else {
+                        inputs[k].removeAttribute("checked");
+                    }
+                } else if (inputs[k].type === "text") {
+                    inputs[k].setAttribute("value", inputs[k].value);
+                } else {
+                    inputs[k].setAttribute("value", inputs[k].value);
+                }
+            }
+
+            for (let k2 = 0; k2 < textAreas.length; k2++) {
+                if (textAreas[k2].type === "textarea") {
+                    textAreas[k2].innerHTML = textAreas[k2].value;
+                }
+            }
+
+            for (let k3 = 0; k3 < selects.length; k3++) {
+                if (selects[k3].type === "select-one") {
+                    const child = selects[k3].children;
+                    for (const i in child) {
+                        if (child[i].tagName === "OPTION") {
+                            if (child[i].selected === true) {
+                                child[i].setAttribute("selected", "selected");
+                            } else {
+                                child[i].removeAttribute("selected");
+                            }
+                        }
+                    }
+                }
+            }
+            return options.noPrintParent ? dom.outerHTML : wrapperRefDom(dom).outerHTML;
+        };
+        const toPrint = (frameWindow) => {
+            try {
+                setTimeout(function () {
+                    frameWindow.focus();
+                    try {
+                        if (!frameWindow.document.execCommand("print", false, null)) {
+                            frameWindow.print();
+                        }
+                    } catch (e) {
+                        frameWindow.print();
+                    }
+                    frameWindow.close();
+                }, 10);
+            } catch (err) {
+                console.log("err", err);
+            }
+        };
+        const writeIframe = (content) => {
+            const iframe = document.createElement("iframe");
+            const f = document.body.appendChild(iframe);
+            iframe.id = "myIframe";
+            iframe.setAttribute(
+                "style",
+                "position:absolute;width:0;height:0;top:-10px;left:-10px;"
+            );
+            const w = f.contentWindow || f.contentDocument;
+            const doc = f.contentDocument || f.contentWindow.document;
+            doc.open();
+            doc.write(content);
+            doc.close();
+            iframe.onload = function () {
+                toPrint(w);
+                setTimeout(function () {
+                    document.body.removeChild(iframe);
+                }, 100);
+            };
+        };
+
+        const Print = (dom, options) => {
+            options = { ...options, noPrint: ".no-print" };
+            let targetDom;
+            if (typeof dom === "string") {
+                targetDom = document.querySelector(dom);
+            } else {
+                targetDom = isDOM(dom) ? dom : dom.$el;
+            }
+
+            const content = getStyle(options) + getHtml(targetDom, options);
+            writeIframe(content);
+        };
+
+        const printBtn = document.getElementById("print")
+        printBtn.addEventListener("click", () => {
+            Print(document.getElementsByClassName("table-page")[0])
+        })
+    </script>
+
+    <script>
+        //获取网站地址
+        var a = window.location.protocol;
+        var b = window.location.host;
+        var c = a + "//" + b+"/";
+        if ("@Model.FilePath" != "") {
+            $('#FilePath').attr('src',c + "@Model.FilePath");
+        }
+
+        //绑定字典或源的值
+        function GetDataSourceStr(code, value, text, valueStr, box) {
+            $(box).html("");
+            $.ajax({
+                url: "/OnlineRegistrate/GetDataSourceMap?code=" + code,
+                async: false,
+                success: function (msg) {
+                    var msgObject = $.parseJSON(msg);
+                    if (msgObject.code == 200) {
+                        $.each(msgObject.data, function (i, item) {
+                            if (item[value] == valueStr) {
+                                $(box).html(item[text]);
+                                return;
+                            }
+                        });
+                    } else {
+                        layer.msg(msgObject.info);
+                    }
+                },
+            });
+            return;
+        };
+        function GetDataItemStr(code, valueStr, box) {
+            $(box).html("");
+            $.ajax({
+                url: "/OnlineRegistrate/GetDataItemMap?code=" + code,
+                async: false,
+                success: function (msg) {
+                    var msgObject = $.parseJSON(msg);
+                    if (msgObject.code == 200) {
+                        $.each(msgObject.data, function (i, item) {
+                            if (item["F_ItemValue"] == valueStr) {
+                                $(box).html(item["F_ItemName"]);
+                                return;
+                            }
+                        });
+                    } else {
+                        layer.msg(msgObject.info);
+                    }
+                },
+            });
+            return;
+        };
+        GetDataItemStr("OperatingLevel", "@Model.OperatingLevel","#OperatingLevel");
+        //GetDataSourceStr("BaseUser", "f_account", "f_realname", "@Model.Signed", "#Signed");
+
+
+    </script>
+</body>
+
+</html>
\ No newline at end of file
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
index 43837343e..083c5c2d3 100644
--- 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	
@@ -1,63 +1,4 @@
-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) 
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) 
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
  * 创建人：超级管理员 
  * 日  期：2022-08-29 16:34 
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
index 0360c5e2e..8a3512528 100644
--- 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	
@@ -1,107 +1,4 @@
-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) 
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) 
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
  * 创建人：超级管理员 
  * 日  期：2022-08-29 16:34 
@@ -243,7 +140,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'UniversityLevel',
+                                code: 'GraduateLevel',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.cshtml
index edfd4c6db..e4034cd02 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.cshtml	
@@ -47,7 +47,7 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm">
-                        <a id="lr_create" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;生成毕业证</a>
+                        <a id="lr_create" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;生成毕业证号</a>
                     </div>
                 </div>
             </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js
index c261905c8..092c8f045 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js	
@@ -39,7 +39,7 @@ var bootstrap = function ($, learun) {
             });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#FinishSchoolMark').lrselect({
-                data: [{ text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
+                data: [{ text: "已毕业", value: "2" }, { text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
                 text: "text",
                 value: "value"
             })
@@ -47,26 +47,37 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            //生成毕业证【按专业进行排序】
+            //$('#lr_create').on('click', function () {
+            //    learun.layerForm({
+            //        id: 'form',
+            //        title: '生成毕业证',
+            //        url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/CreateGraduateNoForm',
+            //        width: 800,
+            //        height: 600,
+            //        callBack: function (id) {
+            //            return top[id].acceptClick(refreshGirdData);
+            //        }
+            //    });
+            //})
+            //生成毕业证【按学号排序】
             $('#lr_create').on('click', function () {
-                learun.layerForm({
-                    id: 'form',
-                    title: '生成毕业证',
-                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/CreateGraduateNoForm',
-                    width: 800,
-                    height: 600,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
+                learun.layerConfirm('1.毕业证号的生成规则：年份两位（22）+学校编码十位（3642000004）+顺序号四位（0001）组成； <br> 2.此次操作仅对毕业状态为“准许毕业”和“已毕业”的学生进行操作； <br>  3.生成毕业证号后不可撤消，请谨慎操作！<br>', function (res) {
+                    if (res) {
+                        learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/DoCreateGraduateNo', {}, function () {
+                            refreshGirdData();
+                        });
                     }
                 });
             })
-
+            
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "学号", name: "StuNo", width: 150, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -139,12 +150,12 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
-                    { label: "毕业证", name: "DiplomaNo", width: 100, align: "left" },
                     { label: "毕业时间", name: "FinishSchoolDate", width: 100, align: "left" },
+                    { label: "毕业证号", name: "DiplomaNo", width: 100, align: "left" },
                 ],
                 mainId: 'StuId',
                 isPage: true,
-                isMultiselect: true,
+                isMultiselect: false,
                 
             });
             page.search();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml
index ac6ccb25e..e3805f7cf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml	
@@ -16,8 +16,8 @@
         <input id="StuCode" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">考生号<font face="宋体">*</font></div>
-        <input id="ksh" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">考生号</div>
+        <input id="ksh" type="text" class="form-control" />
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
             <div class="lr-form-item-title">通知书号<font face="宋体">*</font></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml
index a53a6a7b5..ebe3afece 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.cshtml	
@@ -20,10 +20,6 @@
                                     <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="Grade" type="text" class="form-control" />
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
@@ -36,6 +32,10 @@
                                     <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="Grade"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">准许毕业</div>
                                     <div id="FinishSchoolMark"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js
index 21899f1ff..39f8aa099 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js	
@@ -10,34 +10,116 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 290, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
                     }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
+
                 }
             });
-            $('#MajorNo').lrDataSourceSelect({
-                code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
-                    function (val) {
-                        var majorNo = '';
-                        if (val) {
-                            majorNo = val.MajorNo;
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
                         }
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
-                            text: "ClassName",
-                            value: "ClassNo"
-                        })
                     }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
             });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#FinishSchoolMark').lrselect({
                 data: [{ text: "已毕业", value: "2" }, { text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
                 text: "text",
@@ -173,6 +255,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'StuId',
                 isPage: true,
+                rows: 100,
                 isMultiselect: true,
 
             });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml
index 187e05d2d..e1dd43e39 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.cshtml	
@@ -20,10 +20,6 @@
                                     <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="Grade" type="text" class="form-control" />
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
@@ -36,6 +32,10 @@
                                     <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="Grade"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">准许毕业</div>
                                     <div id="FinishSchoolMark"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js
index 47c0d2308..aec500e18 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js	
@@ -10,34 +10,116 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 290, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
                     }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
+
                 }
             });
-            $('#MajorNo').lrDataSourceSelect({
-                code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
-                    function (val) {
-                        var majorNo = '';
-                        if (val) {
-                            majorNo = val.MajorNo;
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
                         }
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
-                            text: "ClassName",
-                            value: "ClassNo"
-                        })
                     }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
             });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#FinishSchoolMark').lrselect({
                 data: [{ text: "已毕业", value: "2" }, { text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
                 text: "text",
@@ -173,6 +255,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'StuId',
                 isPage: true,
+                rows: 100,
                 isMultiselect: true,
 
             });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.cshtml
index 096c17ab1..f284679c0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.cshtml	
@@ -20,10 +20,6 @@
                                     <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="Grade" type="text" class="form-control" />
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
@@ -37,8 +33,8 @@
                                     <div id="ClassNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">准许毕业</div>
-                                    <div id="FinishSchoolMark"></div>
+                                    <div class="lr-form-item-title">年级</div>
+                                    <div id="Grade"></div>
                                 </div>
                             </div>
                         </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js
index c40319e8f..ac1b90546 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js	
@@ -10,34 +10,116 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 290, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
                     }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
+
                 }
             });
-            $('#MajorNo').lrDataSourceSelect({
-                code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
-                    function (val) {
-                        var majorNo = '';
-                        if (val) {
-                            majorNo = val.MajorNo;
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
                         }
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
-                            text: "ClassName",
-                            value: "ClassNo"
-                        })
                     }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
             });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#FinishSchoolMark').lrselect({
                 data: [{ text: "已毕业", value: "2" }, { text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
                 text: "text",
@@ -52,14 +134,30 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 var DiplomaReceiveStatus = $('#gridtable').jfGridValue('DiplomaReceiveStatus');
                 if (learun.checkrow(keyValue)) {
-                    if (DiplomaReceiveStatus.indexOf('1') != -1) {
-                        return learun.alert.warning("选中项包括已领取数据！");
+                    //if (DiplomaReceiveStatus.indexOf('1') != -1) {
+                    //    return learun.alert.warning("选中项包括已领取数据！");
+                    //}
+                    //learun.layerConfirm('是否确认领取毕业证！', function (res) {
+                    //    if (res) {
+                    //        learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '1' }, function () {
+                    //            refreshGirdData();
+                    //        });
+                    //    }
+                    //});
+                    if (keyValue.split(',').length > 1) {
+                        return learun.alert.warning("只能选择一条记录进行操作！");
                     }
-                    learun.layerConfirm('是否确认领取毕业证！', function (res) {
-                        if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '1' }, function () {
-                                refreshGirdData();
-                            });
+                    if (DiplomaReceiveStatus == "1") {
+                        return learun.alert.warning("当前记录毕业证已领取！");
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '毕业证领取',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GraduateDiplomaReceiveForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
                         }
                     });
                 }
@@ -168,10 +266,14 @@ var bootstrap = function ($, learun) {
                             return cellvalue == "1" ? "已领取" : "未领取"
                         }
                     },
-                    { label: "毕业证领取时间", name: "DiplomaReceiveDate", width: 100, align: "left" },
+                    { label: "毕业证领取时间", name: "DiplomaReceiveDate", width: 120, align: "left" },
+                    { label: "领取人签名", name: "DiplomaReceiveSign", width: 100, align: "left" },
+                    { label: "代领人身份证号", name: "DiplomaReceiveIdcard", width: 130, align: "left" },
+                    { label: "代领备注", name: "DiplomaReceiveRemark", width: 100, align: "left" },
                 ],
                 mainId: 'StuId',
                 isPage: true,
+                rows: 100,
                 isMultiselect: true,
 
             });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceiveForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceiveForm.cshtml
new file mode 100644
index 000000000..4b671c936
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceiveForm.cshtml	
@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "毕业证领取表单";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">领取人签名<font face="宋体">*</font></div>
+        <input id="DiplomaReceiveSign" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">代领人身份证号</div>
+        <input id="DiplomaReceiveIdcard" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">代领备注</div>
+        <input id="DiplomaReceiveRemark" type="text" class="form-control" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceiveForm.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceiveForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceiveForm.js
new file mode 100644
index 000000000..63f2ce1c6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceiveForm.js	
@@ -0,0 +1,57 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2022-09-26 16:53
+ * 描  述：毕业证领取表单
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+            page.hide();
+        },
+        hide: function () {
+            
+        },
+        bind: function () {
+            
+        }, 
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/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 = {
+            status:"1",
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml
index 3acfdea75..42b0205b3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.cshtml	
@@ -20,10 +20,6 @@
                                     <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="Grade" type="text" class="form-control" />
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
@@ -36,6 +32,10 @@
                                     <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="Grade"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">准许毕业</div>
                                     <div id="FinishSchoolMark"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js
index 2da57c622..cb2210ffc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js	
@@ -10,34 +10,116 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 290, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
                     }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
+
                 }
             });
-            $('#MajorNo').lrDataSourceSelect({
-                code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
-                    function (val) {
-                        var majorNo = '';
-                        if (val) {
-                            majorNo = val.MajorNo;
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
                         }
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
-                            text: "ClassName",
-                            value: "ClassNo"
-                        })
                     }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
             });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#FinishSchoolMark').lrselect({
                 data: [{ text: "已毕业", value: "2" }, { text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
                 text: "text",
@@ -173,6 +255,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'StuId',
                 isPage: true,
+                rows: 100,
                 isMultiselect: true,
 
             });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml
index 32c74ebb1..e93609736 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.cshtml	
@@ -20,10 +20,6 @@
                                     <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="Grade" type="text" class="form-control" />
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
@@ -36,6 +32,10 @@
                                     <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="Grade"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">准许毕业</div>
                                     <div id="FinishSchoolMark"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js
index ab806d828..68664f728 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js	
@@ -10,34 +10,116 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 290, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
                     }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
+
                 }
             });
-            $('#MajorNo').lrDataSourceSelect({
-                code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
-                    function (val) {
-                        var majorNo = '';
-                        if (val) {
-                            majorNo = val.MajorNo;
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
                         }
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
-                            text: "ClassName",
-                            value: "ClassNo"
-                        })
                     }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
             });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#FinishSchoolMark').lrselect({
                 data: [{ text: "已毕业", value: "2" }, { text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
                 text: "text",
@@ -173,6 +255,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'StuId',
                 isPage: true,
+                rows: 100,
                 isMultiselect: true,
 
             });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml
index 28b483019..e532c9d15 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml	
@@ -20,10 +20,6 @@
                                     <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="Grade" type="text" class="form-control" />
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
@@ -36,6 +32,10 @@
                                     <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="Grade"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">准许毕业</div>
                                     <div id="FinishSchoolMark"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js
index 8405fcd53..623c8a3ff 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js	
@@ -10,34 +10,116 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 290, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
                     }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
+
                 }
             });
-            $('#MajorNo').lrDataSourceSelect({
-                code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
-                    function (val) {
-                        var majorNo = '';
-                        if (val) {
-                            majorNo = val.MajorNo;
-                        }
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
-                            text: "ClassName",
-                            value: "ClassNo"
-                        })
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
                     }
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
             });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#FinishSchoolMark').lrselect({
                 data: [{ text: "已毕业", value: "2" }, { text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
                 text: "text",
@@ -217,6 +299,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'StuId',
                 isPage: true,
+                rows: 100,
                 isMultiselect: true,
 
             });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml
index b3a955fa3..b2e8e86a1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml	
@@ -20,10 +20,6 @@
                                     <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="Grade" type="text" class="form-control" />
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
@@ -36,6 +32,10 @@
                                     <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="Grade"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">准许毕业</div>
                                     <div id="FinishSchoolMark"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js
index bfe5f5e4d..c72ab983f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js	
@@ -10,34 +10,116 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 290, 400);
-            $('#DeptNo').lrDataSourceSelect({
-                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-                    var deptno = "";
-                    if (val) {
-                        deptno = val.deptno;
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
                     }
-                    $('#MajorNo').lrselectRefresh({
-                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-                        text: "MajorName",
-                        value: "MajorNo"
-                    })
+
                 }
             });
-            $('#MajorNo').lrDataSourceSelect({
-                code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
-                    function (val) {
-                        var majorNo = '';
-                        if (val) {
-                            majorNo = val.MajorNo;
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
                         }
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo,
-                            text: "ClassName",
-                            value: "ClassNo"
-                        })
                     }
+                }
+            });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
             });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#FinishSchoolMark').lrselect({
                 data: [{ text: "已毕业", value: "2" }, { text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
                 text: "text",
@@ -173,6 +255,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'StuId',
                 isPage: true,
+                rows: 100,
                 isMultiselect: true,
 
             });
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 6dfe0411e..134f5d2ce 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	
@@ -15,8 +15,16 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#StuChangeType').lrDataItemSelect({
-                code: 'StuChangeType', select: function (item) {
+            //$('#StuChangeType').lrDataItemSelect({
+            //    code: 'StuChangeType',
+            //    select: function (item) {
+            //        console.log(item);
+            //    }
+            //});
+            //异动类型下拉不显示复学、学籍关键信息更改、转入/进、；
+            $('#StuChangeType').lrselect({
+                data: [{ text: '留级', id: '01' }, { text: '转出/校', id: '02' }, { text: '退学', id: '05' }, { text: '休学', id: '06' }, { text: '转班', id: '07' }, { text: '转专业', id: '08' }],
+                select: function (item) {
                     if (item != null && item != undefined) {
                         var StuNo = $('#StuNo').val();
                         if (!StuNo) {
@@ -59,25 +67,6 @@ var bootstrap = function ($, learun) {
                             $('#OutSchool').attr("checkexpession", "NotNull");
                             $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $(".NewSchool").show();
-                        } else if (item.id === "03") { //复学
-                            $("#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 if (item.id === "05" || item.id === "06") { //退学、休学、
                             $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
@@ -213,13 +202,8 @@ var bootstrap = function ($, learun) {
                                 $('#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');
-                            } else if (data[id].StuChangeType == "04") { //转入/进
-                                learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！");
-                                $("#StuNo").val("");
-                                $("#StuName").val("");
-                            } else if (data[id].StuChangeType == "05" || data[id].StuChangeType == "06") { //退学、休学、
+                            }
+                            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');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.cshtml
index 9a9b8447c..37c2510c8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.cshtml	
@@ -26,9 +26,13 @@
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a>
-                        <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;去审核</a>
+                        @*todo:带异动开发完成，解除注释*@
+                        @*<a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a>
+                        <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;去审核</a>*@
                     </div>
+                    @*<div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_goback" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;复学</a>
+                    </div>*@
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>
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 76ceab8f3..823e32372 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	
@@ -99,6 +99,11 @@ var bootstrap = function ($, learun) {
                         learun.alert.warning("当前项目未审核无法去审！");
                         return;
                     }
+                    var GoBackStatus = $('#gridtable').jfGridValue('GoBackStatus');
+                    if (GoBackStatus == 1) {
+                        learun.alert.warning("当前休学项已复学,无法去审！");
+                        return;
+                    }
                     learun.layerConfirm('是否确认去审核该项！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/UnCheckForm', { keyValue: keyValue }, function () {
@@ -108,10 +113,40 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+            // 复学
+            $('#lr_goback').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    //对已审核&休学&未复学
+                    var StuChangeType = $('#gridtable').jfGridValue('StuChangeType');
+                    if (StuChangeType != "06") {
+                        learun.alert.warning("当前项异动类型不是休学，无法复学！");
+                        return;
+                    }
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus != 1) {
+                        learun.alert.warning("当前休学项未审核，无法复学！");
+                        return;
+                    }
+                    var GoBackStatus = $('#gridtable').jfGridValue('GoBackStatus');
+                    if (GoBackStatus == 1) {
+                        learun.alert.warning("当前休学项已复学！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认复学该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/DoGoBack', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/GetPageList',
                 headData: [
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
@@ -230,6 +265,14 @@ var bootstrap = function ($, learun) {
                             return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                         }
                     },
+                    {
+                        label: "复学状态", name: "GoBackStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">已复学</span>" : "<span class=\"label label-default\">未复学</span>";
+                        }
+                    },
+                    { label: "复学时间", name: "GoBackTime", width: 150, align: "left" },
+
                 ],
                 mainId: 'Id',
                 isPage: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Form.cshtml
index 58b5233ba..2862393b1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Form.cshtml	
@@ -3,49 +3,57 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
+        <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="StudentCertificate">
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <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-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <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-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">专业部<font face="宋体">*</font></div>
-        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly ></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo" isvalid="yes" checkexpession="NotNull" readonly ></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
-        <div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly ></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">证书名称<font face="宋体">*</font></div>
         <input id="SCName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">证书级别<font face="宋体">*</font></div>
         <input id="SCLevel" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">证书种类<font face="宋体">*</font></div>
         <input id="SCType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">分值<font face="宋体">*</font></div>
         <input id="SCScore" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">获取时间<font face="宋体">*</font></div>
-        <input id="SCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#SCTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+        <input id="SCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#SCTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">附件上传</div>
-        <div id="SCUrl"  ></div>
+        <div id="SCUrl"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StudentCertificate/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Form.js
index b9084206b..4d5744584 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Form.js	
@@ -43,6 +43,22 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            //学年
+            $('#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'
+            });
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.cshtml
index 4b65b764f..adc2f3ffd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.cshtml	
@@ -10,6 +10,14 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></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" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.js
index 820478021..280c34adf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Index.js	
@@ -20,6 +20,22 @@ var bootstrap = function ($, learun) {
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            //学年
+            $('#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();
@@ -30,8 +46,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/StudentCertificate/Form',
-                    width: 720,
-                    height: 550,
+                    width: 800,
+                    height: 600,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
@@ -53,8 +69,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/StudentCertificate/Form?keyValue=' + keyValue,
-                        width: 720,
-                        height: 550,
+                        width: 800,
+                        height: 600,
                         callBack: function (id) {
                             var res = false;
                             // 验证数据
@@ -164,6 +180,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StudentCertificate/GetPageList',
                 headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 80, align: "left" },
+                    { label: "学期", name: "Semester", width: 80, align: "left" },
                     { label: "学生学号", name: "StuNo", width: 150, align: "left" },
                     { label: "学生姓名", name: "StuName", width: 100, align: "left" },
                     {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js
index 31607c8ab..efff7aa67 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js	
@@ -615,6 +615,9 @@ var bootstrap = function ($, learun) {
                     // 加载审批按钮
                     var $signBtn = $('#sign');
                     $.each(nwflow.currentNode.btnList || [{ id: "1", name: "同意", code: "agree", file: "1", next: "1" }, { id: "2", name: "不同意", code: "disagree", file: "1", next: "1" }], function (_index, _item) {
+                        if (_item.name == "同意") {
+                            _item.name = "领导审批";
+                        }
                         if (_item.isHide != '1') {
                             var _class = ' btn-warning';
                             if (_item.code == 'agree') {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs
index a545684e2..a75f20c42 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs	
@@ -187,52 +187,52 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
         {
             var userinfo = LoginUserInfo.Get();
             Pagination paginationobj = new Pagination();
-            var newsList = noticeIBLL.GetList(keyword, userinfo.userId, categoryId);
-            var newsListOfSelf = new List<NewsEntity>();
+            var newsList = noticeIBLL.GetList(keyword, categoryId);
+            //var newsListOfSelf = new List<NewsEntity>();
 
-            foreach (var newsitemEntity in newsList)
-            {
-                if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
-                {
-                    if (!string.IsNullOrEmpty(userinfo.postIds))
-                    {
-                        if (userinfo.postIds.Contains(","))
-                        {
-                            foreach (var postid in userinfo.postIds.Split(','))
-                            {
-                                if (newsitemEntity.F_SendPostId.Contains(postid))
-                                {
-                                    newsListOfSelf.Add(newsitemEntity);
-                                    break;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
-                            {
-                                newsListOfSelf.Add(newsitemEntity);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
-                    {
-                        if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
-                        {
-                            newsListOfSelf.Add(newsitemEntity);
-                        }
-                    }
-                    else
-                    {
-                        newsListOfSelf.Add(newsitemEntity);
-                    }
-                }
-            }
+            //foreach (var newsitemEntity in newsList)
+            //{
+            //    if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
+            //    {
+            //        if (!string.IsNullOrEmpty(userinfo.postIds))
+            //        {
+            //            if (userinfo.postIds.Contains(","))
+            //            {
+            //                foreach (var postid in userinfo.postIds.Split(','))
+            //                {
+            //                    if (newsitemEntity.F_SendPostId.Contains(postid))
+            //                    {
+            //                        newsListOfSelf.Add(newsitemEntity);
+            //                        break;
+            //                    }
+            //                }
+            //            }
+            //            else
+            //            {
+            //                if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
+            //                {
+            //                    newsListOfSelf.Add(newsitemEntity);
+            //                }
+            //            }
+            //        }
+            //    }
+            //    else
+            //    {
+            //        if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
+            //        {
+            //            if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
+            //            {
+            //                newsListOfSelf.Add(newsitemEntity);
+            //            }
+            //        }
+            //        else
+            //        {
+            //            newsListOfSelf.Add(newsitemEntity);
+            //        }
+            //    }
+            //}
 
-            return JsonResult(newsListOfSelf);
+            return JsonResult(newsList);
         }
         /// <summary>
         /// 查看通知公告
@@ -244,53 +244,53 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
         {
             var userinfo = LoginUserInfo.Get();
             Pagination paginationobj = new Pagination();
-            var newsList = noticeIBLL.GetList(keyword, userinfo.userId, categoryId).
+            var newsList = noticeIBLL.GetList(keyword, categoryId).
             Where(a => a.F_Status == "2");
-            var newsListOfSelf = new List<NewsEntity>();
+            //var newsListOfSelf = new List<NewsEntity>();
 
-            foreach (var newsitemEntity in newsList)
-            {
-                if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
-                {
-                    if (!string.IsNullOrEmpty(userinfo.postIds))
-                    {
-                        if (userinfo.postIds.Contains(","))
-                        {
-                            foreach (var postid in userinfo.postIds.Split(','))
-                            {
-                                if (newsitemEntity.F_SendPostId.Contains(postid))
-                                {
-                                    newsListOfSelf.Add(newsitemEntity);
-                                    break;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
-                            {
-                                newsListOfSelf.Add(newsitemEntity);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
-                    {
-                        if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
-                        {
-                            newsListOfSelf.Add(newsitemEntity);
-                        }
-                    }
-                    else
-                    {
-                        newsListOfSelf.Add(newsitemEntity);
-                    }
-                }
-            }
+            //foreach (var newsitemEntity in newsList)
+            //{
+            //    if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
+            //    {
+            //        if (!string.IsNullOrEmpty(userinfo.postIds))
+            //        {
+            //            if (userinfo.postIds.Contains(","))
+            //            {
+            //                foreach (var postid in userinfo.postIds.Split(','))
+            //                {
+            //                    if (newsitemEntity.F_SendPostId.Contains(postid))
+            //                    {
+            //                        newsListOfSelf.Add(newsitemEntity);
+            //                        break;
+            //                    }
+            //                }
+            //            }
+            //            else
+            //            {
+            //                if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
+            //                {
+            //                    newsListOfSelf.Add(newsitemEntity);
+            //                }
+            //            }
+            //        }
+            //    }
+            //    else
+            //    {
+            //        if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
+            //        {
+            //            if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
+            //            {
+            //                newsListOfSelf.Add(newsitemEntity);
+            //            }
+            //        }
+            //        else
+            //        {
+            //            newsListOfSelf.Add(newsitemEntity);
+            //        }
+            //    }
+            //}
 
-            return JsonResult(newsListOfSelf);
+            return JsonResult(newsList);
         }
         /// <summary>
         /// 获取实体数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml
index b9fd499af..e9a3da405 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml	
@@ -23,7 +23,8 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">信息来源<font face="宋体">*</font></div>
-        <input id="F_SourceName" type="text" isvalid="yes" checkexpession="NotNull" class="form-control" />
+        @*<input id="F_SourceName" type="text" isvalid="yes" checkexpession="NotNull" class="form-control" />*@
+        <div id="F_SourceName" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">来源地址</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js
index 157c9d654..2cd5c1ec5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js	
@@ -42,6 +42,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
+            $('#F_SourceName').lrDepartmentSelect();
             $('#F_NewsImage').lrUploader({ extensions:'gif,jpeg,jpg,png,bmp'});
             $('#F_IsSendFX').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#F_SendDeptId').lrDepartmentSelect({ type: 'treemultiple' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml
index a7961a014..cd196c351 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml	
@@ -22,8 +22,9 @@
         <input id="F_ReleaseTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd HH:mm' })" isvalid="yes" readonly="readonly" checkexpession="NotNull" value="@Learun.Util.Time.GetToday("yyyy/MM/dd HH:mm")" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
-        <div class="lr-form-item-title">信息来源</div>
-        <input id="F_SourceName" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">信息来源<font face="宋体">*</font></div>
+        @*<input id="F_SourceName" type="text" isvalid="yes" checkexpession="NotNull" class="form-control" />*@
+        <div id="F_SourceName" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">来源地址</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js
index d4260d011..8f56b24e4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js	
@@ -41,6 +41,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
+            $('#F_SourceName').lrDepartmentSelect();
             $('#F_NewsImage').lrUploader();
             $('#F_IsSendFX').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#F_SendDeptId').lrDepartmentSelect({ type: 'treemultiple' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js
index aadb445bc..9bc0618e2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js	
@@ -172,7 +172,19 @@ var bootstrap = function ($, learun) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm');
                         }
                     },
-                    { label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center' },
+                    {
+                        label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name'] || value);
+                                }
+                            });
+                        }
+                    },
                     { label: '阅读次数', name: 'F_PV', index: 'F_PV', width: 80, align: 'center' },
                     {
                         label: "审核状态", name: "F_Status", width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/DataItemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/DataItemController.cs
index 9ee6b61a1..de0fe52d1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/DataItemController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/DataItemController.cs	
@@ -160,6 +160,19 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
             return JsonResult(data);
         }
         /// <summary>
+        /// 获取数据字典明显根据分类编号
+        /// </summary>
+        /// <param name="itemCode">分类编号</param>
+        /// <param name="keyword">查询条件</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetDetailList2(string itemCode, string keyword)
+        {
+            var data = dataItemIBLL.GetDetailList2(itemCode, keyword);
+            return JsonResult(data);
+        }
+        /// <summary>
         /// 获取数据字典明显树形数据
         /// </summary>
         /// <param name="itemCode">分类编号</param>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js
index 6da6953f8..d8a33ddbe 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/Index.js	
@@ -106,7 +106,7 @@ var bootstrap = function ($, learun) {
         },
         initGrid: function () {
             $('#gridtable').jfGrid({
-                url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList',
+                url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList2',
                 headData: [
                     {
                         label: '标准编码', name: 'F_ItemCodeGB', width: 200, align: 'left'
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs
index 5494939a2..c9f2bff6c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs	
@@ -103,8 +103,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             Acc_GoodsDemageEntity entity = strEntity.ToObject<Acc_GoodsDemageEntity>();
-            var loginUserInfo = LoginUserInfo.Get();
-            entity.F_CreateAccount = loginUserInfo.account;//上报学生学号
             acc_GoodsDemageIBLL.SaveEntity(keyValue,entity);
             return Success("保存成功！");
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.cshtml
index d174946cf..57d8e3197 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.cshtml	
@@ -26,7 +26,7 @@
                                     <div id="ClassNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学生姓名</div>
+                                    <div class="lr-form-item-title">姓名</div>
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                             </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js
index fb8928268..adba89088 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js	
@@ -263,14 +263,14 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "学生姓名", name: "F_CreateAccount", width: 100, align: "left",
+                        label: "姓名", name: "F_CreateAccount", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
-                                keyId: 'stuno',
+                                keyId: 'f_account',
                                 callback: function (_data) {
-                                    callback(_data['stuname']);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js
index 0cb2af6f2..d1346879b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js	
@@ -100,6 +100,7 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     acceptClick = function (callBack) {
+        learun.layerClose('indexBed', '');
         if (!!callBack) {
             callBack();
         }
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
index c14bfe9c6..dd231f67f 100644
--- 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	
@@ -70,7 +70,12 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/ClassPatrol/GetPageList',
                 headData: [
-                    { label: "时间", name: "Time", width: 100, align: "left"},
+                    {
+                        label: "时间", name: "Time", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                     { label: "课节", name: "Section", width: 100, align: "left"},
                     { label: "教师", name: "EmpNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
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 78fd9ae4f..46cdf18ea 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	
@@ -1172,6 +1172,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\GraduateDiplomaReceiveForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\FormTran.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\FormOfDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\Graduate.js" />
@@ -1247,6 +1248,8 @@
     <Content Include="Areas\EducationalAdministration\Views\ScoreCheckInfo\FormGene.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ScoreCheckInfo\FormTeach.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ScoreCheckInfo\FormAudit.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\GraduateDiplomaReceiveForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\ScoreCheckInfo\RecordTablePrint.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" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config
index 847cc2703..871d1b737 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config	
@@ -65,7 +65,7 @@
 
   <add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
   <!-- ==================注意附件上传地址  修改到部署目录下的Resource要不然飞星会报错================== -->
-  <add key="AnnexesFile" value="D:\work\DigitalScholl\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
+  <add key="AnnexesFile" value="D:\Job\DigitalScholl\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
   <!-- ================== 8：流程服务地址 ================== -->
   <add key="workflowapi" value="http://localhost:8013" />
   <!--Redis 缓存前缀 -->
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
index 44223121a..0d2a2619b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj	
@@ -195,6 +195,7 @@
     <Compile Include="Modules\ArrangeLessonTermAttemperApi.cs" />
     <Compile Include="Modules\DataSourceNoLoginApi.cs" />
     <Compile Include="Modules\AskApi.cs" />
+    <Compile Include="Modules\EducationalAdministration\StuGraduateStatisticApi.cs" />
     <Compile Include="Modules\EducationalAdministration\Sys_ReceiveComplaintApi.cs" />
     <Compile Include="Modules\EducationalAdministration\Sys_SendComplaintApi.cs" />
     <Compile Include="Modules\EducationalAdministration\LoginUserBindApi.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs
index c437d009d..e0fd4693c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs	
@@ -150,6 +150,7 @@ namespace Learun.Application.WebApi.Modules
         }
         private Response GetAllUsers(dynamic _)
         {
+            var webrootpath= Config.GetValue("webrootpath");
             var result = userIbll.GetAllList().Where(m => !m.F_Account.Contains("System") && m.F_DeleteMark == 0 && m.F_EnabledMark == 1).Select(m => new
             {
                 m.F_UserId,
@@ -160,6 +161,8 @@ namespace Learun.Application.WebApi.Modules
                 m.F_RealName,
                 m.F_Account,
                 Year = "20" + stuInfoBasicIbll.GetStuInfoBasicEntityByStuNo(m.F_Account)?.Grade,
+                m.F_IdentityCardNo,
+                F_HeadIcon= webrootpath + m?.F_HeadIcon
             });
             return Success(result);
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/StuGraduateStatisticApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/StuGraduateStatisticApi.cs
new file mode 100644
index 000000000..5d9b7344d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/StuGraduateStatisticApi.cs	
@@ -0,0 +1,127 @@
+using Nancy;
+using Learun.Util;
+using System.Collections.Generic;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+namespace Learun.Application.WebApi
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2022-09-23 15:31
+    /// 描 述：毕业信息统计
+    /// </summary>
+    public class StuGraduateStatisticApi : BaseApi
+    {
+        private StuGraduateStatisticIBLL stuGraduateStatisticIBLL = new StuGraduateStatisticBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+
+        /// <summary>
+        /// 注册接口
+        /// <summary>
+        public StuGraduateStatisticApi()
+            : base("/Learun/adms/EducationalAdministration/StuGraduateStatistic")
+        {
+            Get["/pagelist"] = GetPageList;
+            Get["/form"] = GetForm;
+            Post["/delete"] = DeleteForm;
+            Post["/save"] = SaveForm;
+        }
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetPageList(dynamic _)
+        {
+            ReqPageParam parameter = this.GetReqData<ReqPageParam>();
+            var data = stuGraduateStatisticIBLL.GetPageList(parameter.pagination, parameter.queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = parameter.pagination.total,
+                page = parameter.pagination.page,
+                records = parameter.pagination.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetForm(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+            var StuGraduateStatisticData = stuGraduateStatisticIBLL.GetStuGraduateStatisticEntity( keyValue );
+            var jsonData = new {
+                StuGraduateStatistic = StuGraduateStatisticData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="_"></param>
+        /// <summary>
+        /// <returns></returns>
+        public Response DeleteForm(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+            stuGraduateStatisticIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="_"></param>
+        /// <summary>
+        /// <returns></returns>
+        public Response SaveForm(dynamic _)
+        {
+            ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
+            StuGraduateStatisticEntity entity = parameter.strEntity.ToObject<StuGraduateStatisticEntity>();
+            if (string.IsNullOrEmpty(parameter.keyValue))
+            {
+                var loginUserInfo = LoginUserInfo.Get();
+                var stuInfoEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(loginUserInfo.account);
+                if (stuInfoEntity != null)
+                {
+                    entity.StuNo = stuInfoEntity.StuNo;
+                    entity.StuName = stuInfoEntity.StuName;
+                    entity.GenderNo = stuInfoEntity.GenderNo;
+                    entity.IdentityCardNo = stuInfoEntity.IdentityCardNo;
+                    entity.StuCode = stuInfoEntity.StuCode;
+                    entity.ProvinceCode = stuInfoEntity.ProvinceCode;
+                    entity.MajorNo = stuInfoEntity.MajorNo;
+                    entity.EduSystem = stuInfoEntity.EduSystem;
+                    entity.ClassNo = stuInfoEntity.ClassNo;
+                    entity.mobile = stuInfoEntity.mobile;
+                }
+                else
+                {
+                    return Fail("登录用户学籍信息不存在！");
+                }
+            }
+            stuGraduateStatisticIBLL.SaveEntity(parameter.keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+        #region  私有类
+
+        /// <summary>
+        /// 表单实体类
+        /// <summary>
+        private class ReqFormEntity {
+            public string keyValue { get; set; }
+            public string strEntity{ get; set; }
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs
index f91e166c1..920b6c51d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs	
@@ -87,7 +87,6 @@ namespace Learun.Application.WebApi
         {
             ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
             Acc_GoodsDemageEntity entity = parameter.strEntity.ToObject<Acc_GoodsDemageEntity>();
-            entity.F_CreateAccount = LoginUserInfo.Get().account;
             acc_GoodsDemageIBLL.SaveEntity(parameter.keyValue, entity);
             return Success("保存成功！");
         }
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 d06470df0..7303f4a7d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs	
@@ -40,56 +40,56 @@ 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 newsListOfSelf = new List<NewsEntity>();
+             var newsList = noticeIBLL.GetList("",(Request.Query["F_CategoryId"]!=null?Request.Query["F_CategoryId"].ToString():""));
+            //var newsListOfSelf = new List<NewsEntity>();
 
-            foreach (var newsitemEntity in newsList)
-            {
-                if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
-                {
-                    if (!string.IsNullOrEmpty(userinfo.postIds))
-                    {
-                        if (userinfo.postIds.Contains(","))
-                        {
-                            foreach (var postid in userinfo.postIds.Split(','))
-                            {
-                                if (newsitemEntity.F_SendPostId.Contains(postid))
-                                {
-                                    newsListOfSelf.Add(newsitemEntity);
-                                    break;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
-                            {
-                                newsListOfSelf.Add(newsitemEntity);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
-                    {
-                        if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
-                        {
-                            newsListOfSelf.Add(newsitemEntity);
-                        }
-                    }
-                    else
-                    {
-                        newsListOfSelf.Add(newsitemEntity);
-                    }
-                }
-            }
+            //foreach (var newsitemEntity in newsList)
+            //{
+            //    if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
+            //    {
+            //        if (!string.IsNullOrEmpty(userinfo.postIds))
+            //        {
+            //            if (userinfo.postIds.Contains(","))
+            //            {
+            //                foreach (var postid in userinfo.postIds.Split(','))
+            //                {
+            //                    if (newsitemEntity.F_SendPostId.Contains(postid))
+            //                    {
+            //                        newsListOfSelf.Add(newsitemEntity);
+            //                        break;
+            //                    }
+            //                }
+            //            }
+            //            else
+            //            {
+            //                if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
+            //                {
+            //                    newsListOfSelf.Add(newsitemEntity);
+            //                }
+            //            }
+            //        }
+            //    }
+            //    else
+            //    {
+            //        if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
+            //        {
+            //            if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
+            //            {
+            //                newsListOfSelf.Add(newsitemEntity);
+            //            }
+            //        }
+            //        else
+            //        {
+            //            newsListOfSelf.Add(newsitemEntity);
+            //        }
+            //    }
+            //}
             var jsonData = new
             {
-                rows = newsListOfSelf,
-                total = newsListOfSelf.Count,
+                rows = newsList,
+                total = newsList.Count,
                 page = 0,
-                records = newsListOfSelf.Count
+                records = newsList.Count
             };
             return Success(jsonData);
         }
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 8157c1b0d..f4cec3a59 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs	
@@ -202,12 +202,15 @@ namespace Learun.Application.WebApi.Modules
                 // 校历
                 var entity = schoolCalendarIbll.GetSchoolCalendarEntityByNo(semesterAndYear.AcademicYearShort, semesterAndYear.Semester);
                 var StartTime = entity.StartTime.Value;
-                startDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(3)).ToString("yyyy-MM-dd");//StartTime.AddDays(((curWeek - 1) * 14)).ToString("yyyy-MM-dd");
-                if (Convert.ToDateTime(startDate) < StartTime)
+                //获取第几周
+                var curWeek = WeekOfYear(startdate, entity.StartTime.Value, entity.EndTime.Value);
+                ///获取当前周次开始时间
+                startDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(((curWeek - 1) * 14))).ToString("yyyy-MM-dd");
+                if (curWeek == 1 && Convert.ToDateTime(startDate) < StartTime)//判断第几周
                 {
                     startDate = StartTime.ToString("yyyy-MM-dd");
                 }
-                endDate = Common.CalculateFirstDateOfWeek(StartTime).AddDays(12).ToString("yyyy-MM-dd");
+                endDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(((curWeek - 1) * 14))).AddDays(9).ToString("yyyy-MM-dd");
                 param.StartDate = startDate;
                 param.EndDate = endDate;
             }
@@ -217,7 +220,7 @@ namespace Learun.Application.WebApi.Modules
                 var Stulist = stuInfoBasicIBLL.GetAllList().Where(x => x.StuNo == param.Account).FirstOrDefault();
                 if (Stulist != null)
                 {
-                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, param.ClassNo, "", "");
+                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, Stulist.ClassNo, "", "");
                 }
             }
             else if (param.Description == "教师")
@@ -311,6 +314,37 @@ namespace Learun.Application.WebApi.Modules
             }
             return res;
         }
+        /// <summary>
+        /// 换算周次
+        /// </summary>
+        /// <param name="curDay"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <returns></returns>
+        private static int WeekOfYear(DateTime curDay, DateTime startTime, DateTime endTime)
+        {
+            int firstdayofweek = Convert.ToInt32(startTime.DayOfWeek);
+            var startDate = DateTime.Parse(Common.CalculateFirstDateOfWeek(startTime).ToString("yyyy-MM-dd"));
+            int k = Convert.ToInt32(startTime.DayOfWeek);//得到开始时间的第一天是周几
+            int days = curDay.Subtract(startTime).Days;
+            //int days = curDay.DayOfYear;
+            int daysOutOneWeek = days - (14 - firstdayofweek);
+
+            if (daysOutOneWeek <= 0)
+            {
+                return 1;
+            }
+            else
+            {
+                int weeks = daysOutOneWeek / 14;
+                if (daysOutOneWeek % 14 != 0)
+                    weeks++;
+
+                return weeks + 1;
+
+            }
+
+        }
     }
 
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs
index ee81424af..f4293a4d1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs	
@@ -131,7 +131,8 @@ namespace Learun.Application.Base.SystemModule
         /// <param name="keyValue">主键</param>
         /// <param name="itemCode">编码</param>
         /// <returns></returns>
-        public bool ExistItemCode(string keyValue, string itemCode) {
+        public bool ExistItemCode(string keyValue, string itemCode)
+        {
             try
             {
                 bool res = false;
@@ -199,7 +200,8 @@ namespace Learun.Application.Base.SystemModule
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveClassifyEntity(string keyValue, DataItemEntity entity) {
+        public void SaveClassifyEntity(string keyValue, DataItemEntity entity)
+        {
             try
             {
                 dataItemService.SaveClassifyEntity(keyValue, entity);
@@ -279,7 +281,7 @@ namespace Learun.Application.Base.SystemModule
             try
             {
                 List<DataItemDetailEntity> list = cache.Read<List<DataItemDetailEntity>>(cacheKeyDetail + itemCode, CacheId.dataItem);
-                if (list?.Count==0 || list==null)
+                if (list?.Count == 0 || list == null)
                 {
                     list = (List<DataItemDetailEntity>)dataItemService.GetDetailList(itemCode);
                     cache.Write<List<DataItemDetailEntity>>(cacheKeyDetail + itemCode, list, CacheId.dataItem);
@@ -298,12 +300,35 @@ namespace Learun.Application.Base.SystemModule
                 }
             }
         }
-
+        /// <summary>
+        /// 获取数据字典明显
+        /// </summary>
+        /// <param name="itemCode">分类编码</param>
+        /// <returns></returns>
+        public List<DataItemDetailEntity> GetDetailList2(string itemCode)
+        {
+            try
+            {
+                List<DataItemDetailEntity> list = (List<DataItemDetailEntity>)dataItemService.GetDetailList2(itemCode);
+                return list;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         public IEnumerable<DataItemDetailEntity> GetAllDetailList()
         {
             try
             {
-                return dataItemService.GetAllDetailList(); 
+                return dataItemService.GetAllDetailList();
             }
             catch (Exception ex)
             {
@@ -322,20 +347,24 @@ namespace Learun.Application.Base.SystemModule
         /// 获取数据字典详细映射数据
         /// </summary>
         /// <returns></returns>
-        public Dictionary<string, Dictionary<string,DataItemModel>> GetModelMap()
+        public Dictionary<string, Dictionary<string, DataItemModel>> GetModelMap()
         {
             try
             {
-                Dictionary<string, Dictionary<string,DataItemModel>> dic = cache.Read<Dictionary<string, Dictionary<string,DataItemModel>>>(cacheKeyDetail + "dic", CacheId.dataItem);
-                if (dic == null) {
-                    dic = new Dictionary<string, Dictionary<string,DataItemModel>>();
+                Dictionary<string, Dictionary<string, DataItemModel>> dic = cache.Read<Dictionary<string, Dictionary<string, DataItemModel>>>(cacheKeyDetail + "dic", CacheId.dataItem);
+                if (dic == null)
+                {
+                    dic = new Dictionary<string, Dictionary<string, DataItemModel>>();
                     var list = GetClassifyList();
-                    foreach (var item in list) {
+                    foreach (var item in list)
+                    {
                         var detailList = GetDetailList(item.F_ItemCode);
-                        if (!dic.ContainsKey(item.F_ItemCode)) {
-                            dic.Add(item.F_ItemCode,new Dictionary<string,DataItemModel>());
+                        if (!dic.ContainsKey(item.F_ItemCode))
+                        {
+                            dic.Add(item.F_ItemCode, new Dictionary<string, DataItemModel>());
                         }
-                        foreach (var detailItem in detailList) {
+                        foreach (var detailItem in detailList)
+                        {
                             dic[item.F_ItemCode].Add(detailItem.F_ItemDetailId, new DataItemModel()
                             {
                                 parentId = detailItem.F_ParentId,
@@ -373,7 +402,37 @@ namespace Learun.Application.Base.SystemModule
             try
             {
                 List<DataItemDetailEntity> list = GetDetailList(itemCode);
-                if (!string.IsNullOrEmpty(keyword)) {
+                if (!string.IsNullOrEmpty(keyword))
+                {
+                    list = list.FindAll(t => t.F_ItemName.Contains(keyword) || t.F_ItemValue.Contains(keyword));
+                }
+                return list;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取数据字典明显
+        /// </summary>
+        /// <param name="itemCode">分类编码</param>
+        /// <param name="keyword">关键词（名称/值）</param>
+        /// <returns></returns>
+        public List<DataItemDetailEntity> GetDetailList2(string itemCode, string keyword)
+        {
+            try
+            {
+                List<DataItemDetailEntity> list = GetDetailList2(itemCode);
+                if (!string.IsNullOrEmpty(keyword))
+                {
                     list = list.FindAll(t => t.F_ItemName.Contains(keyword) || t.F_ItemValue.Contains(keyword));
                 }
                 return list;
@@ -435,7 +494,8 @@ namespace Learun.Application.Base.SystemModule
             {
                 List<DataItemDetailEntity> list = GetDetailList(itemCode);
                 List<TreeModel> treeList = new List<TreeModel>();
-                foreach (var item in list) {
+                foreach (var item in list)
+                {
                     TreeModel node = new TreeModel();
                     node.id = item.F_ItemDetailId;
                     node.text = item.F_ItemName;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemIBLL.cs
index 48d312cfc..a6255d2a7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemIBLL.cs	
@@ -78,6 +78,13 @@ namespace Learun.Application.Base.SystemModule
         /// <param name="keyword">关键词（名称/值）</param>
         /// <returns></returns>
         List<DataItemDetailEntity> GetDetailList(string itemCode, string keyword);
+        /// <summary>
+        /// 获取数据字典明显
+        /// </summary>
+        /// <param name="itemCode">分类编码</param>
+        /// <param name="keyword">关键词（名称/值）</param>
+        /// <returns></returns>
+        List<DataItemDetailEntity> GetDetailList2(string itemCode, string keyword);
 
         /// <summary>
         /// 获取数据字典详细映射数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs
index dbf42ec92..2f965041b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs	
@@ -210,6 +210,34 @@ namespace Learun.Application.Base.SystemModule
             }
         }
         /// <summary>
+        /// 获取数据字典明显根据分类编号
+        /// </summary>
+        /// <param name="itemCode">分类编号</param>
+        /// <returns></returns>
+        public IEnumerable<DataItemDetailEntity> GetDetailList2(string itemCode)
+        {
+            try
+            {
+                StringBuilder strSql = new StringBuilder();
+                strSql.Append("SELECT " + detailFieldSql + @" FROM LR_Base_DataItemDetail t
+                            INNER JOIN LR_Base_DataItem t2 ON t.F_ItemId = t2.F_ItemId
+                            WHERE t2.F_ItemCode = @itemCode AND t.F_DeleteMark = 0 Order By t.F_SortCode
+                           ");
+                return this.BaseRepository().FindList<DataItemDetailEntity>(strSql.ToString(), new { itemCode = itemCode });
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
         /// 获取数据字典明细实体类
         /// </summary>
         /// <param name="keyValue">主键</param>
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 778209e76..2964baaf7 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	
@@ -577,6 +577,7 @@ namespace Learun.Application.Form
                     TableTree.Add(treeone);
                 }
                 TableTree = TableTree.ToTree();
+                bool hasupload = false;
 
                 // 确定表与组件之间的关系
                 Dictionary<string, List<FormCompontModel>> tableComponts = new Dictionary<string, List<FormCompontModel>>();
@@ -592,6 +593,7 @@ namespace Learun.Application.Form
                             }
                             if (compont.type == "upload")
                             {
+                                hasupload = true;
                                 tableComponts[compont.table].Add(compont);
                             }
                             if (compont.type == "guid")
@@ -602,8 +604,13 @@ namespace Learun.Application.Form
                         }
                     }
                 }
+                Dictionary<string, string> uploadfieldkeyvalue = new Dictionary<string, string>();
+
+                if (!hasupload)
+                {
+                    return uploadfieldkeyvalue;
+                }
                 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)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoDropMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoDropMap.cs
new file mode 100644
index 000000000..564dfa6f4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoDropMap.cs	
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2022-10-13 16:53
+    /// 描 述：学生退学
+    /// </summary>
+    public class StuInfoDropMap : EntityTypeConfiguration<StuInfoDropEntity>
+    {
+        public StuInfoDropMap()
+        {
+            #region  表、主键
+            //表
+            this.ToTable("STUINFODROP");
+            //主键
+            this.HasKey(t => t.StuId);
+            #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 915eb6e3a..b1063e1b3 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	
@@ -109,6 +109,7 @@
     <Compile Include="EducationalAdministration\StuDisciplineManagementMap.cs" />
     <Compile Include="EducationalAdministration\StuGrantMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoBasicChangeMap.cs" />
+    <Compile Include="EducationalAdministration\StuInfoDropMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoFreshMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoFreshOnlineServiceMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoSemsterMap.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs
index 0524d769f..94addfad0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs	
@@ -161,11 +161,11 @@ namespace Learun.Application.OA
         /// </summary>
         /// <param name="keyword">关键词</param>
         /// <returns></returns>
-        public IEnumerable<NewsEntity> GetList(string keyword, string userId, string categoryId = null)
+        public IEnumerable<NewsEntity> GetList(string keyword, string categoryId = null)
         {
             try
             {
-                return noticeService.GetList(keyword, userId, categoryId);
+                return noticeService.GetList(keyword, categoryId);
             }
             catch (Exception ex)
             {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs
index 01c6de29f..73ca1235d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs	
@@ -50,7 +50,7 @@ namespace Learun.Application.OA
         /// </summary>
         /// <param name="keyword">关键词</param>
         /// <returns></returns>
-        IEnumerable<NewsEntity> GetList(string keyword, string userId,string categoryId=null);
+        IEnumerable<NewsEntity> GetList(string keyword,string categoryId=null);
 
         #endregion
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs
index 1d303f0e1..5ecfdcd2b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs	
@@ -206,21 +206,55 @@ namespace Learun.Application.OA
         /// </summary>
         /// <param name="keyword">关键词</param>
         /// <returns></returns>
-        public IEnumerable<NewsEntity> GetList(string keyword, string userId, string categoryId = null)
+        public IEnumerable<NewsEntity> GetList(string keyword, string categoryId = null)
         {
             try
             {
+                var userinfo = LoginUserInfo.Get();
+                var userId = userinfo.userId;
+                var deptId = userinfo.departmentId;
+                var postIds = userinfo.postIds;
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT t.*,r.RNewsId,r.RTime FROM LR_OA_News t ");
                 strSql.Append(" left join LR_OA_NewsRead r on t.F_NewsId = r.NewsId and r.RUserId=@userId ");
-                strSql.Append(" WHERE t.F_TypeId = 2 and F_Status<>'-1' and t.F_DeleteMark=0 ");
+                strSql.Append(" WHERE t.F_TypeId = 2 and t.F_DeleteMark=0  and t.F_EnabledMark=1 ");
+                strSql.Append($@" and (
+((t.F_SendDeptId is null or len(t.F_SendDeptId)=0) and (t.F_SendPostId is null  or len(t.F_SendPostId)=0))
+");
+                if (!string.IsNullOrEmpty(deptId))
+                {
+                    strSql.Append($"  or (t.F_SendDeptId is not null and t.F_SendDeptId like '%{deptId}%')");
+                }
+                if (!string.IsNullOrEmpty(postIds))
+                {
+                    strSql.Append(" or (t.F_SendPostId is not null and ");
+                    if (postIds.Contains(","))
+                    {
+                        string postidSql = " (";
+                        foreach (var postId in postIds)
+                        {
+                            postidSql += $" t.F_SendPostId like '%{postId}%' or";
+                        }
+
+                        postidSql = postidSql.Substring(0, postidSql.LastIndexOf("or")) + ")";
+                        strSql.Append(postidSql);
+                    }
+                    else
+                    {
+                        strSql.Append($"  t.F_SendPostId like '%{postIds}%'");
+                    }
+
+                    strSql.Append(")");
+                }
+
+                strSql.Append(") ");
                 if (!string.IsNullOrEmpty(categoryId))
                 {
-                    strSql.Append($" AND F_CategoryId = '{categoryId}'");
+                    strSql.Append($" AND t.F_CategoryId = '{categoryId}'");
                 }
                 if (!string.IsNullOrEmpty(keyword))
                 {
-                    strSql.Append(" AND F_FullHead like @keyword");
+                    strSql.Append(" AND t.F_FullHead like @keyword");
                 }
                 strSql.Append("  ORDER BY t.F_ReleaseTime DESC ");
                 return this.BaseRepository().FindList<NewsEntity>(strSql.ToString(), new { keyword = "%" + keyword + "%", userId = userId });
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM
index c3f240629..d4ddddaac 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1659945962" Name="Physical Data Model 1" Objects="169" Symbols="24" Target="ORACLE Version 11g" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1665383162" Name="Physical Data Model 1" Objects="182" Symbols="25" Target="ORACLE Version 11g" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,8 +12,8 @@
 <a:Code>PHYSICAL_DATA_MODEL_1</a:Code>
 <a:CreationDate>0</a:CreationDate>
 <a:Creator/>
-<a:ModificationDate>1657685724</a:ModificationDate>
-<a:Modifier>l</a:Modifier>
+<a:ModificationDate>1665282522</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
 [FolderOptions\Physical Objects]
@@ -1178,8 +1178,8 @@ PhysOpts=</a:ModelOptionsText>
 <a:Code>DIAGRAM_1</a:Code>
 <a:CreationDate>0</a:CreationDate>
 <a:Creator/>
-<a:ModificationDate>1657693977</a:ModificationDate>
-<a:Modifier>l</a:Modifier>
+<a:ModificationDate>1665282522</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
 <a:DisplayPreferences>[DisplayPreferences]
 
 [DisplayPreferences\PDM]
@@ -1614,20 +1614,21 @@ Shadow=0</a:DisplayPreferences>
 </o:TextSymbol>
 <o:RoundRectangleSymbol Id="o6">
 <a:CreationDate>1657685045</a:CreationDate>
-<a:ModificationDate>1657685045</a:ModificationDate>
-<a:Rect>((-45412,14475), (25088,-33075))</a:Rect>
+<a:ModificationDate>1665282509</a:ModificationDate>
+<a:Rect>((-45412,14475), (25088,-40759))</a:Rect>
 <a:TextStyle>4130</a:TextStyle>
 <a:AutoAdjustToText>0</a:AutoAdjustToText>
 <a:LineColor>16711680</a:LineColor>
 <a:FillColor>16777215</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:FontName>新宋体,8,N</a:FontName>
+<a:ManuallyResized>1</a:ManuallyResized>
 </o:RoundRectangleSymbol>
 <o:TextSymbol Id="o7">
 <a:Text>基础信息，数据无论是否有更新，每天1点都会全量更新一次。</a:Text>
 <a:CreationDate>1657685099</a:CreationDate>
-<a:ModificationDate>1657685193</a:ModificationDate>
-<a:Rect>((-9337,-23701), (4312,-19276))</a:Rect>
+<a:ModificationDate>1665282529</a:ModificationDate>
+<a:Rect>((-37537,-37276), (-23888,-32851))</a:Rect>
 <a:TextStyle>4130</a:TextStyle>
 <a:AutoAdjustToText>0</a:AutoAdjustToText>
 <a:LineColor>0</a:LineColor>
@@ -1959,6 +1960,33 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:FontName>新宋体,12,B</a:FontName>
 <a:ManuallyResized>1</a:ManuallyResized>
 </o:TextSymbol>
+<o:TableSymbol Id="o32">
+<a:CreationDate>1665282522</a:CreationDate>
+<a:ModificationDate>1665282526</a:ModificationDate>
+<a:IconMode>-1</a:IconMode>
+<a:Rect>((-15902,-28408), (-527,-15596))</a:Rect>
+<a:AutoAdjustToText>0</a:AutoAdjustToText>
+<a:LineColor>12615680</a:LineColor>
+<a:FillColor>16570034</a:FillColor>
+<a:ShadowColor>12632256</a:ShadowColor>
+<a:FontList>STRN 0 新宋体,8,N
+DISPNAME 0 新宋体,8,N
+OWNRDISPNAME 0 新宋体,8,N
+Columns 0 新宋体,8,N
+TablePkColumns 0 新宋体,8,U
+TableFkColumns 0 新宋体,8,N
+Keys 0 新宋体,8,N
+Indexes 0 新宋体,8,N
+Triggers 0 新宋体,8,N
+LABL 0 新宋体,8,N</a:FontList>
+<a:BrushStyle>6</a:BrushStyle>
+<a:GradientFillMode>65</a:GradientFillMode>
+<a:GradientEndColor>16777215</a:GradientEndColor>
+<a:ManuallyResized>1</a:ManuallyResized>
+<c:Object>
+<o:Table Ref="o33"/>
+</c:Object>
+</o:TableSymbol>
 </c:Symbols>
 </o:PhysicalDiagram>
 </c:PhysicalDiagrams>
@@ -1976,7 +2004,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o32">
+<o:ExtendedCollection Id="o34">
 <a:ObjectID>FF26818E-946D-4688-9949-70A96F6678AF</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -1987,7 +2015,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o33">
+<o:Column Id="o35">
 <a:ObjectID>3595DD6F-8483-4B8D-92A5-6F94C77CBB96</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -1999,7 +2027,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o34">
+<o:Column Id="o36">
 <a:ObjectID>C35E233D-EE5E-44BD-BC73-481300E32B7B</a:ObjectID>
 <a:Name>父级部门Id</a:Name>
 <a:Code>ParentId</a:Code>
@@ -2010,7 +2038,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o35">
+<o:Column Id="o37">
 <a:ObjectID>CB412D00-DA74-4995-8AE1-5946D4697118</a:ObjectID>
 <a:Name>部门编号</a:Name>
 <a:Code>Code</a:Code>
@@ -2021,7 +2049,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o36">
+<o:Column Id="o38">
 <a:ObjectID>AB391F98-15E9-4545-98DC-94164D6FBE74</a:ObjectID>
 <a:Name>部门名称</a:Name>
 <a:Code>Name</a:Code>
@@ -2032,7 +2060,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o37">
+<o:Column Id="o39">
 <a:ObjectID>0C2EA7B3-C16E-4756-B01E-1037AB6BF076</a:ObjectID>
 <a:Name>部门负责人Id</a:Name>
 <a:Code>ManagerId</a:Code>
@@ -2043,7 +2071,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o38">
+<o:Column Id="o40">
 <a:ObjectID>681C88A1-510A-4CF8-AD68-A369D4C049C7</a:ObjectID>
 <a:Name>分管校长Id</a:Name>
 <a:Code>SMId</a:Code>
@@ -2054,7 +2082,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o39">
+<o:Column Id="o41">
 <a:ObjectID>6BB164A7-9B2A-4C8B-803B-D9FF5A1CDB4B</a:ObjectID>
 <a:Name>排序号</a:Name>
 <a:Code>Order</a:Code>
@@ -2066,7 +2094,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o40">
+<o:Key Id="o42">
 <a:ObjectID>6FD90701-CDC4-4BE2-9094-F3151F356179</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2075,12 +2103,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657617405</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o33"/>
+<o:Column Ref="o35"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o40"/>
+<o:Key Ref="o42"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o14">
@@ -2093,7 +2121,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o41">
+<o:ExtendedCollection Id="o43">
 <a:ObjectID>86BE58F3-BF68-49AD-A459-7039D4863757</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2104,7 +2132,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o42">
+<o:Column Id="o44">
 <a:ObjectID>01720DCA-B288-4B05-84BC-63357E9EE0AB</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2116,7 +2144,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o43">
+<o:Column Id="o45">
 <a:ObjectID>3CE5A1FC-C7E1-49C7-9043-35CE439A9628</a:ObjectID>
 <a:Name>系部编号</a:Name>
 <a:Code>DeptNo</a:Code>
@@ -2127,7 +2155,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o44">
+<o:Column Id="o46">
 <a:ObjectID>1E89BF25-4639-43A3-89AE-FF8DBCC8B303</a:ObjectID>
 <a:Name>系部名称</a:Name>
 <a:Code>DeptName</a:Code>
@@ -2138,7 +2166,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o45">
+<o:Column Id="o47">
 <a:ObjectID>7E784D19-A634-43F8-8615-56A470DF8547</a:ObjectID>
 <a:Name>部门负责人Id</a:Name>
 <a:Code>DMId</a:Code>
@@ -2151,7 +2179,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o46">
+<o:Key Id="o48">
 <a:ObjectID>6194A0FA-1EE9-4311-9FBE-717B7B76FF5A</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2160,12 +2188,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657618612</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o42"/>
+<o:Column Ref="o44"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o46"/>
+<o:Key Ref="o48"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o16">
@@ -2178,7 +2206,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>dyy</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o47">
+<o:ExtendedCollection Id="o49">
 <a:ObjectID>6A35731E-743D-44BA-A46F-05E20C1BB547</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2189,7 +2217,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o48">
+<o:Column Id="o50">
 <a:ObjectID>03C6A62A-3644-49F3-99C5-92B1F3692903</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2201,7 +2229,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o49">
+<o:Column Id="o51">
 <a:ObjectID>BFBDE752-328A-4401-BF30-37F9294EF4DB</a:ObjectID>
 <a:Name>系部编号</a:Name>
 <a:Code>DeptNo</a:Code>
@@ -2212,7 +2240,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o50">
+<o:Column Id="o52">
 <a:ObjectID>0E1A8FFC-53D3-417E-890E-4BCAD53FF0CE</a:ObjectID>
 <a:Name>专业编号</a:Name>
 <a:Code>MajorNo</a:Code>
@@ -2223,7 +2251,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o51">
+<o:Column Id="o53">
 <a:ObjectID>8F34DFD9-5DB2-43B2-9620-882FC7FB7618</a:ObjectID>
 <a:Name>专业名称</a:Name>
 <a:Code>zymc</a:Code>
@@ -2234,7 +2262,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o52">
+<o:Column Id="o54">
 <a:ObjectID>925347EA-AC73-41CF-9F48-5D4E11F216F6</a:ObjectID>
 <a:Name>学制</a:Name>
 <a:Code>A0425</a:Code>
@@ -2246,7 +2274,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o53">
+<o:Key Id="o55">
 <a:ObjectID>4AD61D05-C03C-436F-9851-8737CA4A67A0</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2255,12 +2283,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657619057</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o48"/>
+<o:Column Ref="o50"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o53"/>
+<o:Key Ref="o55"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o18">
@@ -2273,7 +2301,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>dyy</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o54">
+<o:ExtendedCollection Id="o56">
 <a:ObjectID>4B838334-70D9-45DC-8AC2-495953EDD95D</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2284,7 +2312,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o55">
+<o:Column Id="o57">
 <a:ObjectID>722109E4-54F4-4648-AB91-8D54D8085C97</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2296,7 +2324,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o56">
+<o:Column Id="o58">
 <a:ObjectID>5B11B296-ABD4-4E50-85E1-D8D946E8C76B</a:ObjectID>
 <a:Name>系部编号</a:Name>
 <a:Code>DeptNo</a:Code>
@@ -2307,7 +2335,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o57">
+<o:Column Id="o59">
 <a:ObjectID>14B27FA9-B8C0-48F4-A09B-08A0182DE8D3</a:ObjectID>
 <a:Name>专业编号</a:Name>
 <a:Code>MajorNo</a:Code>
@@ -2318,7 +2346,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o58">
+<o:Column Id="o60">
 <a:ObjectID>DF2215BC-3EF9-4C24-A71B-7D810562F2C5</a:ObjectID>
 <a:Name>班级名称</a:Name>
 <a:Code>bjmc</a:Code>
@@ -2329,7 +2357,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o59">
+<o:Column Id="o61">
 <a:ObjectID>C6775154-39D1-4A70-A68F-D6CA180848C3</a:ObjectID>
 <a:Name>班级编号</a:Name>
 <a:Code>bj</a:Code>
@@ -2340,7 +2368,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o60">
+<o:Column Id="o62">
 <a:ObjectID>BC73F282-AEA4-44F0-8D3E-1313343A7989</a:ObjectID>
 <a:Name>年级</a:Name>
 <a:Code>nj</a:Code>
@@ -2351,7 +2379,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o61">
+<o:Column Id="o63">
 <a:ObjectID>51B12E2D-A1E0-47FD-99B8-778B7E6811E6</a:ObjectID>
 <a:Name>班主任编号</a:Name>
 <a:Code>ClassDiredctorNo</a:Code>
@@ -2362,7 +2390,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o62">
+<o:Column Id="o64">
 <a:ObjectID>1786F396-5EA4-484A-9AE0-1DAA14570E67</a:ObjectID>
 <a:Name>辅导员编号</a:Name>
 <a:Code>ClassTutorNo</a:Code>
@@ -2375,7 +2403,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o63">
+<o:Key Id="o65">
 <a:ObjectID>7929E237-29B2-48D5-A59A-1F42A8BFE6FB</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2384,12 +2412,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657679435</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o55"/>
+<o:Column Ref="o57"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o63"/>
+<o:Key Ref="o65"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o20">
@@ -2402,7 +2430,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o64">
+<o:ExtendedCollection Id="o66">
 <a:ObjectID>777ECA8B-F5D6-493D-9F2A-905924AECF9B</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2413,7 +2441,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o65">
+<o:Column Id="o67">
 <a:ObjectID>FB699D7A-6267-41D1-9C74-DD5D1BF0DBBF</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2425,7 +2453,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o66">
+<o:Column Id="o68">
 <a:ObjectID>36F815DD-14A0-4C21-A0A4-436F01FC0C73</a:ObjectID>
 <a:Name>教室编号</a:Name>
 <a:Code>ClassroomNo</a:Code>
@@ -2436,7 +2464,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o67">
+<o:Column Id="o69">
 <a:ObjectID>4D9928D1-D647-42C9-B2DF-14B177A89D99</a:ObjectID>
 <a:Name>教室名称</a:Name>
 <a:Code>ClassroomName</a:Code>
@@ -2447,7 +2475,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o68">
+<o:Column Id="o70">
 <a:ObjectID>8F7C6CD6-49AB-4945-AFEC-A78D993F0433</a:ObjectID>
 <a:Name>容纳人数</a:Name>
 <a:Code>ContainStuNum</a:Code>
@@ -2459,7 +2487,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o69">
+<o:Key Id="o71">
 <a:ObjectID>62A53ED8-5B19-49F2-A3E9-71CC109A26F7</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2468,12 +2496,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657679722</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o65"/>
+<o:Column Ref="o67"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o69"/>
+<o:Key Ref="o71"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o22">
@@ -2486,7 +2514,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>dyy</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o70">
+<o:ExtendedCollection Id="o72">
 <a:ObjectID>6EBB2A64-5A66-4F40-A6F5-ACD68FBEE360</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2497,7 +2525,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o71">
+<o:Column Id="o73">
 <a:ObjectID>ED58F529-833D-47E7-90C0-D4A87D413C24</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2509,7 +2537,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o72">
+<o:Column Id="o74">
 <a:ObjectID>B1D90F4D-456C-46F6-A7CB-842036844EB8</a:ObjectID>
 <a:Name>学生编号</a:Name>
 <a:Code>xsxh</a:Code>
@@ -2520,7 +2548,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o73">
+<o:Column Id="o75">
 <a:ObjectID>792DB026-752C-4204-8B65-E79C20C31054</a:ObjectID>
 <a:Name>姓名</a:Name>
 <a:Code>xsxm</a:Code>
@@ -2531,7 +2559,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o74">
+<o:Column Id="o76">
 <a:ObjectID>7D8241D7-77C2-478B-815D-4E7B3BE2B9E6</a:ObjectID>
 <a:Name>系部编号</a:Name>
 <a:Code>DeptNo</a:Code>
@@ -2542,7 +2570,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o75">
+<o:Column Id="o77">
 <a:ObjectID>1A146A9E-7A18-4E9E-A752-DE13D04AB00D</a:ObjectID>
 <a:Name>专业编号</a:Name>
 <a:Code>MajorNo</a:Code>
@@ -2553,7 +2581,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o76">
+<o:Column Id="o78">
 <a:ObjectID>A57C3BFD-DF44-480D-A716-AAB5AB8BB1AE</a:ObjectID>
 <a:Name>班级编号</a:Name>
 <a:Code>bj</a:Code>
@@ -2564,7 +2592,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o77">
+<o:Column Id="o79">
 <a:ObjectID>2AF4E230-E28B-45D4-B53F-B054BEDD7EBA</a:ObjectID>
 <a:Name>年级</a:Name>
 <a:Code>nj</a:Code>
@@ -2575,7 +2603,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o78">
+<o:Column Id="o80">
 <a:ObjectID>8C8C3184-3774-477F-9794-41D37FEEA493</a:ObjectID>
 <a:Name>出生日期</a:Name>
 <a:Code>A0111</a:Code>
@@ -2585,7 +2613,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>dyy</a:Modifier>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o79">
+<o:Column Id="o81">
 <a:ObjectID>22F8F70C-410B-4A5B-9B89-0C131B199B0B</a:ObjectID>
 <a:Name>性别</a:Name>
 <a:Code>A0107</a:Code>
@@ -2596,7 +2624,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>CHAR(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o80">
+<o:Column Id="o82">
 <a:ObjectID>44C9FBC1-46A6-44C4-A93D-1721235FB73B</a:ObjectID>
 <a:Name>身份证号</a:Name>
 <a:Code>sfzh</a:Code>
@@ -2607,7 +2635,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o81">
+<o:Column Id="o83">
 <a:ObjectID>DB840626-AECF-4EA7-BAA1-C8F16DBC5EB0</a:ObjectID>
 <a:Name>联系电话</a:Name>
 <a:Code>phone</a:Code>
@@ -2620,7 +2648,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o82">
+<o:Key Id="o84">
 <a:ObjectID>AE735D7A-D489-4A3C-BA6B-89680DBC2DDF</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2629,12 +2657,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657680259</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o71"/>
+<o:Column Ref="o73"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o82"/>
+<o:Key Ref="o84"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o24">
@@ -2647,7 +2675,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>dyy</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o83">
+<o:ExtendedCollection Id="o85">
 <a:ObjectID>5425B1A7-6A8F-477C-BF88-09D5914F3A3C</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2658,7 +2686,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o84">
+<o:Column Id="o86">
 <a:ObjectID>C0B04110-9C71-408C-A7A4-803DFD125792</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2670,7 +2698,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o85">
+<o:Column Id="o87">
 <a:ObjectID>824877E7-2C98-46A2-BF9A-BA15FDC107CE</a:ObjectID>
 <a:Name>教师编号</a:Name>
 <a:Code>jgh</a:Code>
@@ -2681,7 +2709,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o86">
+<o:Column Id="o88">
 <a:ObjectID>ACCD9438-788D-4274-A358-2C201C618257</a:ObjectID>
 <a:Name>姓名</a:Name>
 <a:Code>xm</a:Code>
@@ -2692,7 +2720,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o87">
+<o:Column Id="o89">
 <a:ObjectID>42DE8C48-F02E-47D2-90D6-52ADE85C67D9</a:ObjectID>
 <a:Name>部门Id</a:Name>
 <a:Code>DepartmentId</a:Code>
@@ -2703,7 +2731,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o88">
+<o:Column Id="o90">
 <a:ObjectID>DB03B7D5-E5CA-492C-A4AA-8FCD55299CCA</a:ObjectID>
 <a:Name>教学系部编号</a:Name>
 <a:Code>DeptNo</a:Code>
@@ -2714,7 +2742,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o89">
+<o:Column Id="o91">
 <a:ObjectID>6A4CF63B-C673-40D7-B4B1-6E384FD768E8</a:ObjectID>
 <a:Name>出生日期</a:Name>
 <a:Code>A0111</a:Code>
@@ -2724,7 +2752,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>dyy</a:Modifier>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o90">
+<o:Column Id="o92">
 <a:ObjectID>C586C289-061B-4A9A-AB10-C03092A53626</a:ObjectID>
 <a:Name>性别</a:Name>
 <a:Code>A0107</a:Code>
@@ -2735,7 +2763,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>CHAR(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o91">
+<o:Column Id="o93">
 <a:ObjectID>87B1BC29-8CF8-43AD-BEDB-8587BDBD931D</a:ObjectID>
 <a:Name>身份证号</a:Name>
 <a:Code>sfzh</a:Code>
@@ -2746,7 +2774,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>VARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o92">
+<o:Column Id="o94">
 <a:ObjectID>21A503A9-9F6A-4FB7-8C2D-80205D0F1FC8</a:ObjectID>
 <a:Name>联系电话</a:Name>
 <a:Code>phone</a:Code>
@@ -2759,7 +2787,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o93">
+<o:Key Id="o95">
 <a:ObjectID>95F85F33-69EB-4704-86D0-BBEC72D9AE1A</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -2768,12 +2796,12 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:ModificationDate>1657680820</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o84"/>
+<o:Column Ref="o86"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o93"/>
+<o:Key Ref="o95"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o27">
@@ -2786,7 +2814,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o94">
+<o:ExtendedCollection Id="o96">
 <a:ObjectID>0913886D-4511-408C-8BB6-7EE9E7EA4008</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2797,7 +2825,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o95">
+<o:Column Id="o97">
 <a:ObjectID>0F6F186D-3A1B-4C1E-99CF-D782685B21BA</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2808,7 +2836,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o96">
+<o:Column Id="o98">
 <a:ObjectID>7B6CAE4E-C137-4AA5-888B-A7B9A753DF43</a:ObjectID>
 <a:Name>学生学号</a:Name>
 <a:Code>StuNo</a:Code>
@@ -2819,7 +2847,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o97">
+<o:Column Id="o99">
 <a:ObjectID>20413846-FE6C-4415-A4C2-7CD7E8B139CF</a:ObjectID>
 <a:Name>身份证号</a:Name>
 <a:Code>IdentityNo</a:Code>
@@ -2830,7 +2858,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o98">
+<o:Column Id="o100">
 <a:ObjectID>80A83A2D-F20F-45BD-A6B9-1C77D79C055F</a:ObjectID>
 <a:Name>人脸图片Url</a:Name>
 <a:Code>FaceUrl</a:Code>
@@ -2853,7 +2881,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
-<o:ExtendedCollection Id="o99">
+<o:ExtendedCollection Id="o101">
 <a:ObjectID>DEFF5BA6-9BEF-44B5-B4A6-254A59A5A55B</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
@@ -2864,7 +2892,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
 <c:Columns>
-<o:Column Id="o100">
+<o:Column Id="o102">
 <a:ObjectID>1DF34B9F-EBDF-4530-9554-8587C84E964F</a:ObjectID>
 <a:Name>Id</a:Name>
 <a:Code>Id</a:Code>
@@ -2875,7 +2903,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o101">
+<o:Column Id="o103">
 <a:ObjectID>4094E0BC-8242-4DAD-98AF-B1601C95A1DC</a:ObjectID>
 <a:Name>学生学号</a:Name>
 <a:Code>StuNo</a:Code>
@@ -2886,7 +2914,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o102">
+<o:Column Id="o104">
 <a:ObjectID>07E1BDF0-350A-420A-9409-578D60116CD4</a:ObjectID>
 <a:Name>身份证号</a:Name>
 <a:Code>IdentityNo</a:Code>
@@ -2897,7 +2925,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o103">
+<o:Column Id="o105">
 <a:ObjectID>7092EFB1-DBDD-40B9-9016-7D2AF961A914</a:ObjectID>
 <a:Name>一卡通号</a:Name>
 <a:Code>CardNo</a:Code>
@@ -2908,7 +2936,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>NVARCHAR2(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o104">
+<o:Column Id="o106">
 <a:ObjectID>3F5122A6-4236-4D21-A438-B3FA6160882D</a:ObjectID>
 <a:Name>用户类型(1教师，2学生，3其他)</a:Name>
 <a:Code>UType</a:Code>
@@ -2919,7 +2947,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>CHAR(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o105">
+<o:Column Id="o107">
 <a:ObjectID>61DB9EFE-A4E9-4A3D-841E-4E4DEFA14A51</a:ObjectID>
 <a:Name>交易类型（1交易，2充值）</a:Name>
 <a:Code>TransType</a:Code>
@@ -2930,7 +2958,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:DataType>CHAR(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>
-<o:Column Id="o106">
+<o:Column Id="o108">
 <a:ObjectID>891DB1A1-5893-466D-AB8C-0A0C4A9AB531</a:ObjectID>
 <a:Name>交易金额（元，精确到1位小数）</a:Name>
 <a:Code>TransAmount</a:Code>
@@ -2942,7 +2970,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Length>10</a:Length>
 <a:Precision>1</a:Precision>
 </o:Column>
-<o:Column Id="o107">
+<o:Column Id="o109">
 <a:ObjectID>64C30399-01FB-4C0E-9ED3-4D83FF039706</a:ObjectID>
 <a:Name>交易时间</a:Name>
 <a:Code>TransTime</a:Code>
@@ -2952,7 +2980,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Modifier>l</a:Modifier>
 <a:DataType>DATE</a:DataType>
 </o:Column>
-<o:Column Id="o108">
+<o:Column Id="o110">
 <a:ObjectID>2DDBE0BC-3C5F-4E43-A100-D4B19DBEF540</a:ObjectID>
 <a:Name>交易地点（文字说明）</a:Name>
 <a:Code>TransAddr</a:Code>
@@ -2965,9 +2993,311 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 </o:Table>
+<o:Table Id="o33">
+<a:ObjectID>3873EDB7-7A05-4197-B034-359876C15542</a:ObjectID>
+<a:Name>宿舍表</a:Name>
+<a:Code>DS_DormitoryBuild</a:Code>
+<a:CreationDate>1657616336</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665383162</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:TotalSavingCurrency/>
+<c:Columns>
+<o:Column Id="o111">
+<a:ObjectID>991A765C-ADE5-4B33-8A7B-4CD1AD0BC561</a:ObjectID>
+<a:Name>ID</a:Name>
+<a:Code>ID</a:Code>
+<a:CreationDate>1657616446</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283208</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>VARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+<a:Column.Mandatory>1</a:Column.Mandatory>
+</o:Column>
+<o:Column Id="o112">
+<a:ObjectID>499F573A-4E7B-446B-84DC-3D17BCC1B0B3</a:ObjectID>
+<a:Name>宿舍编号</a:Name>
+<a:Code>DNo</a:Code>
+<a:CreationDate>1657679511</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665287635</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>VARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o113">
+<a:ObjectID>3327D89E-CD23-4A8A-AF91-C03F8EE0049E</a:ObjectID>
+<a:Name>宿舍名称</a:Name>
+<a:Code>Name</a:Code>
+<a:CreationDate>1657679511</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665287635</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>VARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o114">
+<a:ObjectID>767EA157-8CB9-4B0E-BC9C-114F33812F80</a:ObjectID>
+<a:Name>宿舍楼ID</a:Name>
+<a:Code>ApartmentId</a:Code>
+<a:CreationDate>1657680996</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665287653</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>VARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o115">
+<a:ObjectID>6E303EA2-6164-455B-B85B-004FD88CC574</a:ObjectID>
+<a:Name>单元ID</a:Name>
+<a:Code>UnitId</a:Code>
+<a:CreationDate>1657620531</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665287635</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>VARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o116">
+<a:ObjectID>CE4F2007-F382-4759-845B-8DC07A55DCA0</a:ObjectID>
+<a:Name>楼层ID</a:Name>
+<a:Code>FloorId</a:Code>
+<a:CreationDate>1657680312</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665287635</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>VARCHAR(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o117">
+<a:ObjectID>EA9E8AF0-979F-4F68-8A18-D12F3DA8E283</a:ObjectID>
+<a:Name>负责人</a:Name>
+<a:Code>Functionary</a:Code>
+<a:CreationDate>1657680525</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283208</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>VARCHAR(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o118">
+<a:ObjectID>FFB9DE67-77CD-41E6-9D29-61B5E1FDD525</a:ObjectID>
+<a:Name>舍长</a:Name>
+<a:Code>Leader</a:Code>
+<a:CreationDate>1657680724</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283208</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>VARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o119">
+<a:ObjectID>92E4482E-455C-40A0-BD64-079F1E6FD4B7</a:ObjectID>
+<a:Name>类型（1宿舍楼，2单元，3楼层，4房间，5床）</a:Name>
+<a:Code>BuildType</a:Code>
+<a:CreationDate>1657680873</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283673</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>VARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o120">
+<a:ObjectID>FE9B9044-CC15-4002-B128-1E9F25C61717</a:ObjectID>
+<a:Name>价格</a:Name>
+<a:Code>jg</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665288318</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>DECIMAL(18, 0)</a:DataType>
+<a:Length>18</a:Length>
+</o:Column>
+<o:Column Id="o121">
+<a:ObjectID>77F241B8-63BD-4EED-8C30-35E60F265561</a:ObjectID>
+<a:Name>电话</a:Name>
+<a:Code>phone</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665288353</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o122">
+<a:ObjectID>B31C9901-A16D-445C-8D4B-3626C79CEDC1</a:ObjectID>
+<a:Name>位置</a:Name>
+<a:Code>Address</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283576</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o123">
+<a:ObjectID>2EFE01BD-582C-4373-8E02-66F03DF9FD51</a:ObjectID>
+<a:Name>校区Id</a:Name>
+<a:Code>Campus</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665288085</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o124">
+<a:ObjectID>F31F28F6-1E3B-469E-B246-257D3471EC0A</a:ObjectID>
+<a:Name>性别</a:Name>
+<a:Code>A0107</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665287884</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o125">
+<a:ObjectID>9902A1DC-9E72-4B87-BE57-FC1FA76D02CC</a:ObjectID>
+<a:Name>父ID</a:Name>
+<a:Code>ParentID</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283576</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o126">
+<a:ObjectID>DB35F300-B5BA-4DEF-9788-4C809F48CC66</a:ObjectID>
+<a:Name>是否独卫</a:Name>
+<a:Code>HasToilet</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283576</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o127">
+<a:ObjectID>6A88C571-2032-4390-A9CB-3BC3F26F4DDA</a:ObjectID>
+<a:Name>星级</a:Name>
+<a:Code>Starred</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283576</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o128">
+<a:ObjectID>6B1E08F2-F598-451E-848F-D4F482D8D37A</a:ObjectID>
+<a:Name>排序</a:Name>
+<a:Code>sort</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283576</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NUMBER</a:DataType>
+</o:Column>
+<o:Column Id="o129">
+<a:ObjectID>C79B423D-C642-411E-8923-E2D97FEF8261</a:ObjectID>
+<a:Name>寝室类型（几人寝）</a:Name>
+<a:Code>RoomType</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283576</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NUMBER</a:DataType>
+</o:Column>
+<o:Column Id="o130">
+<a:ObjectID>D0B5211D-5141-4D55-B104-C68D270005DB</a:ObjectID>
+<a:Name>入住人数</a:Name>
+<a:Code>CheckInStu</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665283576</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NUMBER</a:DataType>
+</o:Column>
+<o:Column Id="o131">
+<a:ObjectID>A7262226-2499-4E2C-A9F1-2062C7A51864</a:ObjectID>
+<a:Name>住宿学生编号</a:Name>
+<a:Code>xsxh</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665383162</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o132">
+<a:ObjectID>06210BAA-6804-4C11-8FE6-E4C078B0D9F2</a:ObjectID>
+<a:Name>系部编号</a:Name>
+<a:Code>Dept</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665288119</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o133">
+<a:ObjectID>39C975BA-1332-425C-8AB3-4233952C4E09</a:ObjectID>
+<a:Name>专业编号</a:Name>
+<a:Code>Major</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665288085</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+<o:Column Id="o134">
+<a:ObjectID>9DD0D75C-A90B-47A0-BFB3-0E296E2AF4A2</a:ObjectID>
+<a:Name>班级编号</a:Name>
+<a:Code>Class</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665288085</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(200)</a:DataType>
+<a:Length>200</a:Length>
+</o:Column>
+<o:Column Id="o135">
+<a:ObjectID>E57CF7A0-BE53-48E1-8AA7-74B539D67F76</a:ObjectID>
+<a:Name>主班级编号</a:Name>
+<a:Code>bj</a:Code>
+<a:CreationDate>1665282532</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665288108</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<a:DataType>NVARCHAR2(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
+</c:Columns>
+<c:Keys>
+<o:Key Id="o136">
+<a:ObjectID>B4455740-9529-4713-B2CE-B63B84155753</a:ObjectID>
+<a:Name>Key_1</a:Name>
+<a:Code>Key_1</a:Code>
+<a:CreationDate>1657617396</a:CreationDate>
+<a:Creator>dyy</a:Creator>
+<a:ModificationDate>1665282522</a:ModificationDate>
+<a:Modifier>dyy</a:Modifier>
+<c:Key.Columns>
+<o:Column Ref="o111"/>
+</c:Key.Columns>
+</o:Key>
+</c:Keys>
+<c:PrimaryKey>
+<o:Key Ref="o136"/>
+</c:PrimaryKey>
+</o:Table>
 </c:Tables>
 <c:DefaultGroups>
-<o:Group Id="o109">
+<o:Group Id="o137">
 <a:ObjectID>46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -2978,7 +3308,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Group>
 </c:DefaultGroups>
 <c:TargetModels>
-<o:TargetModel Id="o110">
+<o:TargetModel Id="o138">
 <a:ObjectID>AF25C190-A5BF-4CF4-8137-C7E7446D61A4</a:ObjectID>
 <a:Name>ORACLE Version 11g</a:Name>
 <a:Code>ORA11GR1</a:Code>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
index 7a3e7c5c1..d6bb386f9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs	
@@ -376,7 +376,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 50 and DATEDIFF(YYYY, t.Bi
 sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 40 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 50 then 1 else 0 end) as age3,
 sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 30 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 40 then 1 else 0 end) as age4,
 sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 30 then 1 else 0 end) as age5
- from empinfo t where t.Birthday is not null");
+ from empinfo t where t.Birthday is not null and CheckMark = '1' ");
                 return this.BaseRepository("CollegeMIS").FindEntity<EmpInfoEntity>(strSql.ToString(), null);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs
index 690e778ba..8291fd7c2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs	
@@ -185,52 +185,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-        /// <summary>
-        /// 提交选中项
-        /// </summary>
-        /// <param name="keyValue"></param>
-        public void SubmitEntity(string keyValue)
-        {
-            try
-            {
-                scoreCheckInfoService.SubmitEntity(keyValue);
-            }
-            catch (Exception ex)
-            {
-                if (ex is ExceptionEx)
-                {
-                    throw;
-                }
-                else
-                {
-                    throw ExceptionEx.ThrowBusinessException(ex);
-                }
-            }
-        }
-        /// <summary>
-        /// 审核
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <param name="entity"></param>
-        public void AuditEntity(string keyValue, ScoreCheckInfoEntity entity)
-        {
-            try
-            {
-                scoreCheckInfoService.AuditEntity(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/ScoreCheckInfo/ScoreCheckInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoEntity.cs
index 559514e03..1c5117aee 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoEntity.cs	
@@ -1,5 +1,6 @@
 using Learun.Util;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Learun.Application.TwoDevelopment.EducationalAdministration
@@ -138,6 +139,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public void Create()
         {
             this.ID = Guid.NewGuid().ToString();
+            var loginUserInfo = LoginUserInfo.Get();
+            this.CreateUser = loginUserInfo.userId;
+            this.CreateTime = DateTime.Now;
         }
         /// <summary>
         /// 编辑调用
@@ -146,9 +150,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public void Modify(string keyValue)
         {
             this.ID = keyValue;
+            var loginUserInfo = LoginUserInfo.Get();
+            this.UpdateUser = loginUserInfo.userId;
+            this.UpdateTime = DateTime.Now;
         }
         #endregion
         #region 扩展字段
+        [NotMapped] public List<StuEncourgementEntity> StuEncourgementList { get; set; }
+        [NotMapped] public List<StuPunishmentEntity> StuPunishmentList { get; set; }
+
+        [NotMapped] public List<StuScoreEntity> StuScoreList { get; set; }
+
+        [NotMapped] public List<StudentCertificateEntity> StudentCertificateList { get; set; }
+        [NotMapped] public List<StuAttendanceLeaveEntity> StuAttendanceLeaveList { get; set; }
+
         #endregion
     }
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs
index 06485c722..e322af11d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoIBLL.cs	
@@ -43,6 +43,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, ScoreCheckInfoEntity entity);
+        /// <summary>
+        /// 教师评语/教务意见
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="entity"></param>
         void SaveTeachEntity(string keyValue, ScoreCheckInfoEntity entity);
         /// <summary>
         /// 一键生成
@@ -51,15 +56,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="Semester"></param>
         /// <returns></returns>
         int SaveGeneEntity(string AcademicYearNo, string Semester);
-        /// <summary>
-        /// 提交
-        /// </summary>
-        /// <param name="keyValue"></param>
-        void SubmitEntity(string keyValue);
-        /// <summary>
-        /// 审核
-        /// </summary>
-        void AuditEntity(string keyValue, ScoreCheckInfoEntity entity);
+        
         #endregion
 
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs
index c22d79983..5bbfbdbdf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs	
@@ -31,7 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@" * ");
+                strSql.Append(@" t.* ");
                 strSql.Append("  FROM ScoreCheckInfo t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -172,21 +172,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                var userlogin = LoginUserInfo.Get();
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
-                    entity.UpdateTime = DateTime.Now;
-                    entity.UpdateUser = userlogin.userId;
                     this.BaseRepository("CollegeMIS").Update(entity);
                 }
                 else
                 {
                     entity.Create();
-                    entity.CreateTime = DateTime.Now;
-                    entity.UpdateUser = userlogin.userId;
-                    entity.UpdateTime = DateTime.Now;
-                    entity.UpdateUser = userlogin.userId;
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }
             }
@@ -202,17 +195,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        /// <summary>
+        /// 教师评语/教务意见
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="entity"></param>
         public void SaveTeachEntity(string keyValue, ScoreCheckInfoEntity entity)
         {
             try
             {
-                var userlogin = LoginUserInfo.Get();
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
-                    entity.UpdateTime = DateTime.Now;
-                    entity.UpdateUser = userlogin.userId;
-                    entity.Signed = userlogin.account;
                     this.BaseRepository("CollegeMIS").Update(entity);
                 }
             }
@@ -228,6 +222,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        /// <summary>
+        /// 一键生成
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <returns></returns>
         public int SaveGeneEntity(string AcademicYearNo, string Semester)
         {
             try
@@ -251,73 +251,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
-        public void SubmitEntity(string keyValue)
-        {
-            var db = this.BaseRepository("CollegeMIS").BeginTrans();
-            try
-            {
-                //多个提交
-                var keyValueArr = keyValue.Split(',');
-                foreach (var item in keyValueArr)
-                {
-                    var entity = db.FindEntity<ScoreCheckInfoEntity>(x => x.ID == item);
-                    entity.CheckStatus = "1";
-                    db.Update(entity);
-                }
-                db.Commit();
-            }
-            catch (Exception ex)
-            {
-                db.Rollback();
-                if (ex is ExceptionEx)
-                {
-                    throw;
-                }
-                else
-                {
-                    throw ExceptionEx.ThrowServiceException(ex);
-                }
-            }
-        }
-        /// <summary>
-        /// 审核
-        /// </summary>
-        /// <param name="keyValue"></param>
-        /// <param name="entity"></param>
-        public void AuditEntity(string keyValue, ScoreCheckInfoEntity entity)
-        {
-            var db = this.BaseRepository("CollegeMIS").BeginTrans();
-            try
-            {
-                var userlogin = LoginUserInfo.Get();
-                var keyValueArr = keyValue.Split(',');
-                foreach (var item in keyValueArr)
-                {
-                    var model = db.FindEntity<ScoreCheckInfoEntity>(x => x.ID == item);
-                    model.CheckStatus = entity.CheckStatus;
-                    model.CheckTime = DateTime.Now;
-                    model.CheckUser = userlogin.userId;
-                    model.UpdateTime = DateTime.Now;
-                    model.UpdateUser = userlogin.userId;
-                    db.Update(model);
-                }
-                db.Commit();
-            }
-            catch (Exception ex)
-            {
-                db.Rollback();
-                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/StuAttendanceLeave/StuAttendanceLeaveBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveBLL.cs
index 2eee75bfe..f89805d7f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveBLL.cs	
@@ -111,6 +111,32 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuAttendanceLeaveEntity> GetListByJson(string queryJson)
+        {
+            try
+            {
+                return stuAttendanceLeaveService.GetListByJson(queryJson);
+            }
+            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/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveIBLL.cs
index 99d81538e..4c920ad71 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveIBLL.cs	
@@ -36,6 +36,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         StuAttendanceLeaveEntity GetStuAttendanceLeaveEntity(string keyValue);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StuAttendanceLeaveEntity> GetListByJson(string queryJson);
         #endregion
 
         #region  提交数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveService.cs
index fbce92265..83b1154f7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveService.cs	
@@ -211,6 +211,75 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuAttendanceLeaveEntity> GetListByJson(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM StuAttendanceLeave t");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["LessonName"].IsEmpty())
+                {
+                    dp.Add("LessonName", "%" + queryParam["LessonName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.LessonName Like @LessonName ");
+                }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Grade = @Grade ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo", "%" + queryParam["EmpNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.EmpNo Like @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 ");
+                }
+                var result = this.BaseRepository("CollegeMIS").FindList<StuAttendanceLeaveEntity>(strSql.ToString(), dp);
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
         #endregion
 
         #region  提交数据
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
index b4b468f85..c120fc62e 100644
--- 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	
@@ -30,27 +30,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             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("SELECT t.* ");
                 strSql.Append("  FROM StuGraduateStatistic t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -63,8 +43,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["StuNo"].IsEmpty())
                 {
-                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.StuNo Like @StuNo ");
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
                 }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs
index af294f537..ce2fc8776 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs	
@@ -109,6 +109,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        /// <summary>
+        /// 获取StuInfoBasic表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoCreateGraduateNo()
+        {
+            try
+            {
+                stuInfoBasicService.DoCreateGraduateNo();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取StuInfoBasic表实体数据
         /// <param name="keyValue">主键</param>
@@ -398,11 +422,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void GetCard(string keyValue, string status)
+        public void GetCard(string keyValue, string status, StuInfoBasicEntity entity)
         {
             try
             {
-                stuInfoBasicService.GetCard(keyValue, status);
+                stuInfoBasicService.GetCard(keyValue, status,entity);
             }
             catch (Exception ex)
             {
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 99cc714b8..bb9da95e2 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	
@@ -896,6 +896,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns> 
         [Column("TISSUEDATE")]
         public DateTime? TissueDate { get; set; }
+        /// <summary> 
+        /// 毕业证领取-领取人签名 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVESIGN")]
+        public string DiplomaReceiveSign { get; set; }
+        /// <summary> 
+        /// 毕业证领取-代领人身份证号 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEIDCARD")]
+        public string DiplomaReceiveIdcard { get; set; }
+        /// <summary> 
+        /// 毕业证领取-代领备注 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEREMARK")]
+        public string DiplomaReceiveRemark { get; set; }
         #endregion
 
         #region  扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs
index e9201ee79..e07debd2d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs	
@@ -29,6 +29,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         StuInfoBasicEntity GetStuInfoBasicEntity(string keyValue);
         List<CdMajorEntity> GetMajorInfoWithGraduation();
         void CreateGraduateNoByMajor(string CityCode,string SchoolCode,string MajorList);
+
+        /// <summary>
+        /// 获取StuInfoBasic表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DoCreateGraduateNo();
         StuInfoBasicEntity GetStuNoByAccount(string keyValue);
 
         List<string> GetSaveClassStudents(string account);
@@ -60,7 +67,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 领取毕业证
         /// </summary>
         /// <param name="keyValue"></param>
-        void GetCard(string keyValue,string status);
+        void GetCard(string keyValue,string status, StuInfoBasicEntity entity);
         /// <summary>
         /// 图书资料归还
         /// </summary>
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 c126dcd57..53f6a37f3 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	
@@ -389,6 +389,56 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        /// <summary>
+        /// 获取StuInfoBasic表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoCreateGraduateNo()
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                //年份
+                var year = DateTime.Now.Year.ToString().Substring(2, 2);
+                //学校编码十位
+                var schoolCode = "3642000004";
+                //顺序号四位
+                var numberCode = 1;
+
+                //获取最大的序号
+                var DiplomaNoList = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(x => x.DiplomaNo.Contains(year + schoolCode)).Select(x => x.DiplomaNo).ToList();
+                if (DiplomaNoList.Any())
+                {
+                    numberCode = DiplomaNoList.Max(x => x).Substring(12,4).ToInt()+1;
+                }
+
+                //获取所有要毕业的学生按年级查询出来，再按学号进行由小到大排序，
+                var stuList = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(x => (x.FinishSchoolMark == "1" || x.FinishSchoolMark == "2") && (x.DiplomaNo == null || x.DiplomaNo == "")).OrderBy(x=>x.Grade).ThenBy(x=>x.StuNo);
+                foreach (var item in stuList)
+                {
+                    item.DiplomaNo = year + schoolCode + numberCode.ToString().PadLeft(4, '0');
+                    db.Update(item);
+
+                    numberCode++;
+                }
+                
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取StuInfoBasic表实体数据
         /// <param name="keyValue">主键</param>
@@ -624,7 +674,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void GetCard(string keyValue, string status)
+        public void GetCard(string keyValue, string status, StuInfoBasicEntity entity)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -635,11 +685,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     var keyValueArr = keyValue.Split(',');
                     foreach (var item in keyValueArr)
                     {
-                        var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate='{now}' WHERE StuId='{item}'";
+                        var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate='{now}',DiplomaReceiveSign='{entity.DiplomaReceiveSign}',DiplomaReceiveIdcard='{entity.DiplomaReceiveIdcard}',DiplomaReceiveRemark='{entity.DiplomaReceiveRemark}' WHERE StuId='{item}'";
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and FileTransferStatus='1' and TissueStatus='1' ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -649,7 +699,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     var keyValueArr = keyValue.Split(',');
                     foreach (var item in keyValueArr)
                     {
-                        var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate=null WHERE StuId='{item}'";
+                        var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate=null,DiplomaReceiveSign=null,DiplomaReceiveIdcard=null,DiplomaReceiveRemark=null WHERE StuId='{item}'";
                         db.ExecuteBySql(sql);
 
                         //判断毕业状态是否为已毕业，若是，则毕业状态修改为准许毕业，毕业时间为空；
@@ -693,7 +743,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1'  ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -747,7 +797,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1'  ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -801,7 +851,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1'  ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -855,7 +905,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1'  ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -909,7 +959,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         db.ExecuteBySql(sql);
 
                         //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' ";
+                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and DiplomaReceiveStatus='1' and FileTransferStatus='1' and TissueStatus='1'  ";
                         db.ExecuteBySql(sql2);
                     }
                 }
@@ -1071,7 +1121,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         adb.Delete(accountInfo);
                     }
                     //清空宿舍信息
-                    var dormitory = db.FindEntity<Acc_DormitoryBuildEntity>(a => a.StudentID == item.StuId);
+                    var dormitory = db.FindEntity<Acc_DormitoryBuildEntity>(a => a.StudentID == item.StuNo);
                     if (dormitory != null)
                     {
                         dormitory.StudentID = "";
@@ -1205,32 +1255,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     entity.Create();
                     if (entity.IsTran == "0")//转入/进
                     {
-                        //学籍异动表
-                        //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
                         {
                             StuID = entity.StuId,
-                            BeforeChange = "",
-                            AfterChange = "",
-                            FieldName = "",
+                            BeforeChange = null,
+                            AfterChange = entity.StuId,
+                            FieldName = "学籍表主键",
                             UpdateBy = loginUser.userId,
                             UpdateTime = DateTime.Now,
                             StuChangeType = "04",
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeBLL.cs
index 2372848e8..66a0afa6c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeBLL.cs	
@@ -166,6 +166,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 复学
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoGoBack(string keyValue)
+        {
+            try
+            {
+                stuInfoBasicChangeService.DoGoBack(keyValue);
+            }
+            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/StuInfoBasicChange/StuInfoBasicChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs
index 298b37876..ac951a664 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	
@@ -104,6 +104,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("OUTSCHOOL")]
         public string OutSchool { get; set; }
+        /// <summary>
+        /// 复学状态（0未复学1已复学）
+        /// </summary>
+        [Column("GOBACKSTATUS")]
+        public int? GoBackStatus { get; set; }
+        /// <summary>
+        /// 复学时间
+        /// </summary>
+        [Column("GOBACKTIME")]
+        public DateTime? GoBackTime { get; set; }
+        /// <summary>
+        /// 退学表Id
+        /// </summary>
+        [Column("STUIDINDROP")]
+        public string StuIdInDrop { get; set; }
         #endregion
 
         #region  扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeIBLL.cs
index 0b89d4c67..7cdb8eafc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeIBLL.cs	
@@ -58,6 +58,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         void DoUnCheck(string keyValue);
 
+        /// <summary>
+        /// 复学
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DoGoBack(string keyValue);
+
         #endregion
 
     }
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 b0b62d8ac..b4747de37 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	
@@ -1,4 +1,5 @@
 using Dapper;
+using Learun.Application.Organization;
 using Learun.DataBase.Repository;
 using Learun.Util;
 using System;
@@ -147,15 +148,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public void DoCheck(string keyValue)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            var dbbase = this.BaseRepository().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);
+                var entity = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicChangeEntity>(x => x.Id == keyValue);
                 if (entity != null)
                 {
-                    var stuInfoBasicEntity = db.FindEntity<StuInfoBasicEntity>(x => x.StuNo == entity.StuNo);
+                    var stuInfoBasicEntity = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(x => x.StuNo == entity.StuNo);
                     if (stuInfoBasicEntity != null)
                     {
                         //处理数据
@@ -207,12 +209,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         }
                         else if (entity.StuChangeType == "02" || entity.StuChangeType == "05" || entity.StuChangeType == "06")  //转校、退学、休学、
                         {
-                            //增加异动日志表：学籍异动状态
+                            //增加异动日志表：学籍id被删除
                             var logentity = new StuInfoBasic_ChangeLogEntity()
                             {
-                                FieldName = "学籍异动状态",
-                                BeforeChange = stuInfoBasicEntity.ChangeStatus?.ToString(),
-                                AfterChange = "1",
+                                FieldName = "学籍表主键",
+                                BeforeChange = stuInfoBasicEntity.StuId,
+                                AfterChange = null,
                                 UpdateBy = loginUserInfo.userId,
                                 UpdateTime = now,
                                 StuID = stuInfoBasicEntity.StuId,
@@ -222,28 +224,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             };
                             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()
+                            //增加退学表
+                            db.ExecuteBySql($"insert into StuInfoDrop select * from StuInfoBasic where StuId='{stuInfoBasicEntity.StuId}' ");
+                            //修改异动表：退学表id
+                            entity.StuIdInDrop = stuInfoBasicEntity.StuId;
+                            //删除学籍表
+                            db.ExecuteBySql($"delete from StuInfoBasic where StuId='{stuInfoBasicEntity.StuId}' ");
+                            //删除账户表
+                            var userEntity = this.BaseRepository().FindEntity<UserEntity>(x => x.F_Account == stuInfoBasicEntity.StuNo);
+                            if (userEntity != null)
                             {
-                                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}' ");
+                                dbbase.Delete(userEntity);
+                            }
+
                         }
                         else if (entity.StuChangeType == "08")   //转专业、
                         {
@@ -350,6 +343,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 }
                             }
                         }
+
                         db.Insert(logList);
 
                         //修改异动表：审批状态、审批人、
@@ -360,10 +354,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     }
                 }
                 db.Commit();
+                dbbase.Commit();
             }
             catch (Exception ex)
             {
                 db.Rollback();
+                dbbase.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;
@@ -400,17 +396,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     }
                     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($"insert into StuInfoBasic select * from StuInfoDrop where StuId='{entity.StuIdInDrop}' ");
+                        //删除退学表
+                        db.ExecuteBySql($"delete from StuInfoDrop where StuId='{entity.StuIdInDrop}' ");
+                        //修改异动表：退学表id 为空
 
+                    }
+                    
                     //修改异动表：审批状态、审批人、
-                    db.ExecuteBySql("update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0 where Id='" + keyValue + "' ");
+                    db.ExecuteBySql($"update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0,StuIdInDrop=null where Id='" + keyValue + "' ");
                     //删除异动日志表：学籍异动主键id
                     db.ExecuteBySql("delete from StuInfoBasic_ChangeLog where StuChangeId='" + keyValue + "' ");
 
@@ -430,6 +425,71 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        /// <summary>
+        /// 复学
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoGoBack(string keyValue)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                var loginUserInfo = LoginUserInfo.Get();
+                var now = DateTime.Now;
+                var logList = new List<StuInfoBasic_ChangeLogEntity>();
+                var entity = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicChangeEntity>(x => x.Id == keyValue);
+                if (entity != null)
+                {
+                    var stuInfoDropEntity = this.BaseRepository("CollegeMIS").FindEntity<StuInfoDropEntity>(x => x.StuId == entity.StuIdInDrop);
+                    if (stuInfoDropEntity != null)
+                    {
+                        //增加异动日志表：学籍id增加
+                        var logentity = new StuInfoBasic_ChangeLogEntity()
+                        {
+                            FieldName = "学籍表主键",
+                            BeforeChange = null,
+                            AfterChange = stuInfoDropEntity.StuId,
+                            UpdateBy = loginUserInfo.userId,
+                            UpdateTime = now,
+                            StuID = stuInfoDropEntity.StuId,
+                            StuChangeType = "03",
+                            StuChangeRemark = "复学",
+                            StuChangeId = entity.Id
+                        };
+                        logentity.Create();
+                        logList.Add(logentity);
+                        //增加学籍表
+                        db.ExecuteBySql($"insert into StuInfoBasic select * from StuInfoDrop where StuId='{entity.StuIdInDrop}' ");
+                        //删除退学表
+                        db.ExecuteBySql($"delete from StuInfoDrop where StuId='{entity.StuIdInDrop}' ");
+
+                        //修改异动表：复学状态、复学时间、
+                        entity.GoBackStatus = 1;
+                        entity.GoBackTime = now;
+                        db.Update(entity);
+
+                        db.Insert(logList);
+
+                    }
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                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/StuInfoDrop/StuInfoDropEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoDrop/StuInfoDropEntity.cs
new file mode 100644
index 000000000..7f866ccc7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoDrop/StuInfoDropEntity.cs	
@@ -0,0 +1,942 @@
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2022-10-13 16:53
+    /// 描 述：学生退学
+    /// </summary>
+    public class StuInfoDropEntity
+    {
+        #region  实体成员
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        [Column("F_SCHOOLID")]
+        public string F_SchoolId { get; set; }
+
+        /// <summary>
+        /// 学号
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+
+        /// <summary>
+        /// 学籍号
+        /// </summary>
+        [Column("STUCODE")]
+        public string StuCode { get; set; }
+        /// <summary>
+        /// 通知书号
+        /// </summary>
+        [Column("NOTICENO")]
+        public string NoticeNo { get; set; }
+        /// <summary>
+        /// GraduateYear
+        /// </summary>
+        [Column("GRADUATEYEAR")]
+        public string GraduateYear { get; set; }
+        /// <summary>
+        /// 考生号
+        /// </summary>
+        [Column("KSH")]
+        public string ksh { get; set; }
+        /// <summary>
+        /// 系所代码
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 专业代码
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// 专业方向号（如0，1，2，3，4，5）
+        ///代表无专业方向细分
+        /// </summary>
+        [Column("MAJORDETAILNO")]
+        public string MajorDetailNo { get; set; }
+        /// <summary>
+        /// 专业方向名
+        /// </summary>
+        [Column("MAJORDETAILNAME")]
+        public string MajorDetailName { get; set; }
+        /// <summary>
+        /// 专业拼音全称
+        /// </summary>
+        [Column("MAJORDETAILSPELL")]
+        public string MajorDetailSpell { get; set; }
+        /// <summary>
+        /// 年级
+        /// </summary>
+        [Column("GRADE")]
+        public string Grade { get; set; }
+        /// <summary>
+        /// 行政班号
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        [Column("STUNAME")]
+        public string StuName { get; set; }
+        /// <summary>
+        /// 拼音全称
+        /// </summary>
+        [Column("SPELLFULL")]
+        public string SpellFull { get; set; }
+        /// <summary>
+        /// 拼音简称
+        /// </summary>
+        [Column("SPELLBRIEF")]
+        public string SpellBrief { get; set; }
+        /// <summary>
+        /// 性别码
+        /// </summary>
+        [Column("GENDERNO")]
+        public bool? GenderNo { get; set; }
+        /// <summary>
+        /// 出生日期
+        /// </summary>
+        [Column("BIRTHDAY")]
+        public DateTime? Birthday { get; set; }
+        /// <summary>
+        /// 政治面貌码
+        /// </summary>
+        [Column("PARTYFACENO")]
+        public string PartyFaceNo { get; set; }
+        /// <summary>
+        /// 家庭出身份
+        /// </summary>
+        [Column("FAMILYORIGINNO")]
+        public string FamilyOriginNo { get; set; }
+        /// <summary>
+        /// 民族码
+        /// </summary>
+        [Column("NATIONALITYNO")]
+        public string NationalityNo { get; set; }
+        /// <summary>
+        /// 籍贯省代码 废除
+        /// </summary>
+        [Column("PROVINCENO")]
+        public string ProvinceNo { get; set; }
+        /// <summary>
+        /// 籍贯省代码代码
+        /// </summary>
+        [Column("F_PROVINCEID")]
+        public string F_ProvinceId { get; set; }
+        /// <summary>
+        /// 籍贯市代码
+        /// </summary>
+        [Column("F_CITYID")]
+        public string F_CityId { get; set; }
+
+        /// <summary>
+        /// 籍贯县代码
+        /// </summary>
+        [Column("F_COUNTYID")]
+        public string F_CountyId { get; set; }
+        /// <summary>
+        /// 籍贯
+        /// </summary>
+        [Column("REGIONNO")]
+        public string RegionNo { get; set; }
+        /// <summary>
+        /// 农业户口（是否农户）
+        /// </summary>
+        [Column("RESIDENCENO")]
+        public string ResidenceNo { get; set; }
+        /// <summary>
+        /// 考生类别
+        /// </summary>
+        [Column("TESTSTUSORTNO")]
+        public string TestStuSortNo { get; set; }
+        /// <summary>
+        /// 健康状况
+        /// </summary>
+        [Column("HEALTHSTATUSNO")]
+        public string HealthStatusNo { get; set; }
+        /// <summary>
+        /// 第几志愿
+        /// </summary>
+        [Column("WILLNO")]
+        public string WillNo { get; set; }
+        /// <summary>
+        /// TestStuSubjectNo
+        /// </summary>
+        [Column("TESTSTUSUBJECTNO")]
+        public string TestStuSubjectNo { get; set; }
+        /// <summary>
+        /// 本专科
+        /// </summary>
+        [Column("GRADUATENO")]
+        public string GraduateNo { get; set; }
+        /// <summary>
+        /// 计划形式
+        /// </summary>
+        [Column("PLANFORMNO")]
+        public string PlanFormNo { get; set; }
+        /// <summary>
+        /// 三好
+        /// </summary>
+        [Column("ISTHREEGOOD")]
+        public string IsThreeGood { get; set; }
+        /// <summary>
+        /// 优干
+        /// </summary>
+        [Column("ISEXCELLENT")]
+        public string IsExcellent { get; set; }
+        /// <summary>
+        /// 一般学生干部
+        /// </summary>
+        [Column("ISNORMALCADRE")]
+        public string IsNormalCadre { get; set; }
+        /// <summary>
+        /// 省市前三
+        /// </summary>
+        [Column("ISPROVINCEFIRSTTHREE")]
+        public string IsProvinceFirstThree { get; set; }
+        /// <summary>
+        /// 港澳台侨
+        /// </summary>
+        [Column("OVERSEASCHINESENO")]
+        public string OverseasChineseNo { get; set; }
+        /// <summary>
+        /// 录取类别
+        /// </summary>
+        [Column("MATRICULATESORT")]
+        public string MatriculateSort { get; set; }
+        /// <summary>
+        /// 来源地区码
+        /// </summary>
+        [Column("COMEPROVINCENO")]
+        public string ComeProvinceNo { get; set; }
+        /// <summary>
+        /// 原单位码
+        /// </summary>
+        [Column("HIGHSCHOOLNO")]
+        public string HighSchoolNo { get; set; }
+        /// <summary>
+        /// 原单位
+        /// </summary>
+        [Column("HIGHSCHOOLNAME")]
+        public string HighSchoolName { get; set; }
+        /// <summary>
+        /// 入学年月
+        /// </summary>
+        [Column("ENTRANCEDATE")]
+        public DateTime? EntranceDate { get; set; }
+        /// <summary>
+        /// 宗教
+        /// </summary>
+        [Column("RELIGION")]
+        public string Religion { get; set; }
+        /// <summary>
+        /// 特长
+        /// </summary>
+        [Column("GOODAT")]
+        public string GoodAt { get; set; }
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        [Column("IDENTITYCARDNO")]
+        public string IdentityCardNo { get; set; }
+        /// <summary>
+        /// 入党时间
+        /// </summary>
+        [Column("JOINPARTYDATE")]
+        public DateTime? JoinPartyDate { get; set; }
+        /// <summary>
+        /// 入团时间
+        ///团员league
+        /// </summary>
+        [Column("JOINLEAGUEDATE")]
+        public DateTime? JoinLeagueDate { get; set; }
+        /// <summary>
+        /// 校内地址
+        /// </summary>
+        [Column("INSCHOOLADDRESS")]
+        public string InSchoolAddress { get; set; }
+        /// <summary>
+        /// 校内电话
+        /// </summary>
+        [Column("INSCHOOLTELEPHONE")]
+        public string InSchoolTelephone { get; set; }
+        /// <summary>
+        /// 当前异动类别
+        /// </summary>
+        [Column("ABMORMITYMOVEMARK")]
+        public string AbmormityMoveMark { get; set; }
+        /// <summary>
+        /// 奖励标志
+        /// </summary>
+        [Column("AWARDMARK")]
+        public string AwardMark { get; set; }
+        /// <summary>
+        /// 处分标志
+        /// </summary>
+        [Column("PUNISHMARK")]
+        public string PunishMark { get; set; }
+        /// <summary>
+        /// 联系人标志
+        /// </summary>
+        [Column("LINKMANMARK")]
+        public string LinkmanMark { get; set; }
+        /// <summary>
+        /// 学号异动标志
+        /// </summary>
+        [Column("STUNOCHANGEMARK")]
+        public string StuNoChangeMark { get; set; }
+        /// <summary>
+        /// 毕业标志（0待准许，1准许毕业，2已毕业，）
+        /// </summary>
+        [Column("FINISHSCHOOLMARK")]
+        public string FinishSchoolMark { get; set; }
+        /// <summary>
+        /// 当前注册标志
+        /// </summary>
+        [Column("CURRENTREGISTERMARK")]
+        public string CurrentRegisterMark { get; set; }
+        /// <summary>
+        /// 毕业年月
+        /// </summary>
+        [Column("FINISHSCHOOLDATE")]
+        public DateTime? FinishSchoolDate { get; set; }
+        /// <summary>
+        /// 毕业证书号
+        /// </summary>
+        [Column("DIPLOMANO")]
+        public string DiplomaNo { get; set; }
+        /// <summary>
+        /// 毕业证书备注
+        /// </summary>
+        [Column("DIPLOMAREMARK")]
+        public string DiplomaRemark { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 报到日期
+        /// </summary>
+        [Column("REGISTERDATE")]
+        public DateTime? RegisterDate { get; set; }
+        /// <summary>
+        /// Photo
+        /// </summary>
+        [Column("PHOTO")]
+        public string Photo { get; set; }
+        /// <summary>
+        /// TeachPlanNo
+        /// </summary>
+        [Column("TEACHPLANNO")]
+        public string TeachPlanNo { get; set; }
+        /// <summary>
+        /// 审查标志
+        /// </summary>
+        [Column("CHECKMARK")]
+        public string CheckMark { get; set; }
+        /// <summary>
+        /// 联系电话（手机）
+        /// </summary>
+        [Column("MOBILE")]
+        public string mobile { get; set; }
+        /// <summary>
+        /// 电子邮件地址
+        /// </summary>
+        [Column("EMAIL")]
+        public string EMail { get; set; }
+        /// <summary>
+        ///QQ
+        /// </summary>
+        [Column("QQ")]
+        public string QQ { get; set; }
+        /// <summary>
+        /// 户口所在地
+        /// </summary>
+        [Column("FATHERUNIT")]
+        public string FatherUnit { get; set; }
+        /// <summary>
+        /// 父亲姓名
+        /// </summary>
+        [Column("FATHERNAME")]
+        public string FatherName { get; set; }
+        /// <summary>
+        /// 父亲电话
+        /// </summary>
+        [Column("FATHERPHONE")]
+        public string FatherPhone { get; set; }
+        /// <summary>
+        /// 母亲姓名
+        /// </summary>
+        [Column("MATHERNAME")]
+        public string MatherName { get; set; }
+        /// <summary>
+        /// 档案所在地
+        /// </summary>
+        [Column("MATHERUNIT")]
+        public string MatherUnit { get; set; }
+        /// <summary>
+        /// 母亲电话
+        /// </summary>
+        [Column("MATHERPHONE")]
+        public string MatherPhone { get; set; }
+        /// <summary>
+        /// 用户名
+        /// </summary>
+        [Column("USERNAME")]
+        public string username { get; set; }
+        /// <summary>
+        /// 密码
+        /// </summary>
+        [Column("PASSWORD")]
+        public string password { get; set; }
+        /// <summary>
+        /// MailAddress收件人名址（收件人地址+ 姓名,可置默认值为家庭地址）
+        /// </summary>
+        [Column("MAILADDRESS")]
+        public string MailAddress { get; set; }
+        /// <summary>
+        /// PostalCode邮政编码
+        /// </summary>
+        [Column("POSTALCODE")]
+        public string PostalCode { get; set; }
+        /// <summary>
+        /// InSchoolStatus
+        /// </summary>
+        [Column("INSCHOOLSTATUS")]
+        public string InSchoolStatus { get; set; }
+        /// <summary>
+        /// TransMark
+        /// </summary>
+        [Column("TRANSMARK")]
+        public string TransMark { get; set; }
+        /// <summary>
+        /// ClassTutorNo
+        /// </summary>
+        [Column("CLASSTUTORNO")]
+        public string ClassTutorNo { get; set; }
+        /// <summary>
+        /// 学籍卡审核
+        /// </summary>
+        [Column("RESUMECHECK")]
+        public string ResumeCheck { get; set; }
+        /// <summary>
+        /// PracStatus
+        /// </summary>
+        [Column("PRACSTATUS")]
+        public string PracStatus { get; set; }
+        /// <summary>
+        /// RegisterStatus
+        /// </summary>
+        [Column("REGISTERSTATUS")]
+        public int? RegisterStatus { get; set; }
+        /// <summary>
+        /// PunishmentDate
+        /// </summary>
+        [Column("PUNISHMENTDATE")]
+        public DateTime? PunishmentDate { get; set; }
+        /// <summary>
+        /// StuId
+        /// </summary>
+        [Column("STUID")]
+        public string StuId { get; set; }
+
+        /// <summary>
+        /// 学制
+        /// </summary>
+        [Column("EDUSYSTEM")]
+        public string EduSystem { get; set; }
+
+        /// <summary>
+        /// 学习形式
+        /// </summary>
+        [Column("STUDYMODALITY")]
+        public string StudyModality { get; set; }
+        /// <summary>
+        /// 学籍异动状态（1表示不显示成绩）
+        /// </summary>
+        /// <returns></returns>
+        [Column("CHANGESTATUS")]
+        public int? ChangeStatus { get; set; }
+        /// <summary>
+        /// SyncFlag
+        /// </summary>
+        [Column("SYNCFLAG")]
+        public bool? SyncFlag { get; set; }
+
+        /// <summary>
+        /// 余额
+        /// </summary>
+        [Column("BALANCE")]
+        public string Balance { get; set; }
+
+        /// <summary>
+        /// 身体健康状况
+        /// </summary>
+        [Column("HEALTHSTATUS")]
+        public string HealthStatus { get; set; }
+
+
+        /// <summary>
+        /// 身份证件类型
+        /// </summary>
+        [Column("IDCARDTYPE")]
+        public string IdCardType { get; set; }
+        /// <summary>
+        /// 入学方式
+        /// </summary>
+        [Column("ENTRANCEWAY")]
+        public string EntranceWay { get; set; }
+        /// <summary>
+        /// 就读方式
+        /// </summary>
+        [Column("STUDYINGWAY")]
+        public string StudyingWay { get; set; }
+        /// <summary>
+        /// 国籍/地区
+        /// </summary>
+        [Column("COUNTRYNO")]
+        public string CountryNo { get; set; }
+        /// <summary>
+        /// 婚姻状况
+        /// </summary>
+        [Column("MARRIAGESTATUS")]
+        public string MarriageStatus { get; set; }
+        /// <summary>
+        /// 乘火车区间
+        /// </summary>
+        [Column("TRAININTERVAL")]
+        public string TrainInterval { get; set; }
+        /// <summary>
+        /// 是否随迁子女
+        /// </summary>
+        [Column("ISTRAILCHILDREN")]
+        public string IsTrailChildren { get; set; }
+        /// <summary>
+        /// 生源地行政区划码
+        /// </summary>
+        [Column("STUPLACECODE")]
+        public string StuPlaceCode { get; set; }
+        /// <summary>
+        /// 出生地行政区划码
+        /// </summary>
+        [Column("BIRTHPLACECODE")]
+        public string BirthPlaceCode { get; set; }
+        /// <summary>
+        /// 籍贯地行政区划码
+        /// </summary>
+        [Column("NATIVEPLACECODE")]
+        public string NativePlaceCode { get; set; }
+        /// <summary>
+        /// 户口所在地行政区划码
+        /// </summary>
+        [Column("RESIDENCEPLACECODE")]
+        public string ResidencePlaceCode { get; set; }
+        /// <summary>
+        /// 所属派出所
+        /// </summary>
+        [Column("BELONGPOLICE")]
+        public string BelongPolice { get; set; }
+        /// <summary>
+        /// 学生居住地类型
+        /// </summary>
+        [Column("STULIVEPLACETYPE")]
+        public string StuLivePlaceType { get; set; }
+        /// <summary>
+        /// 学生来源
+        /// </summary>
+        [Column("STUORIGIN")]
+        public string StuOrigin { get; set; }
+        /// <summary>
+        /// 招生对象
+        /// </summary>
+        [Column("RECRUITOBJECT")]
+        public string RecruitObject { get; set; }
+        /// <summary>
+        /// 贫困户否建档立卡贫困户
+        /// </summary>
+        [Column("POORISRECORD")]
+        public string PoorIsRecord { get; set; }
+        /// <summary>
+        /// 招生方式
+        /// </summary>
+        [Column("RECRUITWAY")]
+        public string RecruitWay { get; set; }
+        /// <summary>
+        /// 联招合作类型
+        /// </summary>
+        [Column("RECRUITCOOPERATETYPE")]
+        public string RecruitCooperateType { get; set; }
+        /// <summary>
+        /// 准考证号
+        /// </summary>
+        [Column("ADMISSIONNO")]
+        public string AdmissionNo { get; set; }
+        /// <summary>
+        /// 考试总分
+        /// </summary>
+        [Column("EXAMSCORE")]
+        public decimal? ExamScore { get; set; }
+        /// <summary>
+        /// 联招合作办学形式
+        /// </summary>
+        [Column("RECRUITCOOPERATEFORM")]
+        public string RecruitCooperateForm { get; set; }
+        /// <summary>
+        /// 联招合作学校代码
+        /// </summary>
+        [Column("RECRUITCOOPERATESCHOOLNO")]
+        public string RecruitCooperateSchoolNo { get; set; }
+        /// <summary>
+        /// 校外教学点
+        /// </summary>
+        [Column("SCHOOLOUTSIDEPLACE")]
+        public string SchoolOutsidePlace { get; set; }
+        /// <summary>
+        /// 分段培养方式
+        /// </summary>
+        [Column("PIECECULTIVATEWAY")]
+        public string PieceCultivateWay { get; set; }
+        /// <summary>
+        /// 英文姓名
+        /// </summary>
+        [Column("ENGLISHNAME")]
+        public string EnglishName { get; set; }
+        /// <summary>
+        /// 成员1关系
+        /// </summary>
+        [Column("ONEMEMBERSHIP")]
+        public string OneMembership { get; set; }
+        /// <summary>
+        /// 成员1是否监护人
+        /// </summary>
+        [Column("ONEISGUARDIAN")]
+        public string OneIsGuardian { get; set; }
+        /// <summary>
+        /// 成员1出生年月
+        /// </summary>
+        [Column("ONEBIRTHDAY")]
+        public string OneBirthday { get; set; }
+        /// <summary>
+        /// 成员1身份证件类型
+        /// </summary>
+        [Column("ONEIDCARDTYPE")]
+        public string OneIdCardType { get; set; }
+        /// <summary>
+        /// 成员1身份证件号
+        /// </summary>
+        [Column("ONEIDCARDNO")]
+        public string OneIdCardNo { get; set; }
+        /// <summary>
+        /// 成员1民族
+        /// </summary>
+        [Column("ONENATIONALITYNO")]
+        public string OneNationalityNo { get; set; }
+        /// <summary>
+        /// 成员1政治面貌
+        /// </summary>
+        [Column("ONEPARTYFACENO")]
+        public string OnePartyFaceNo { get; set; }
+        /// <summary>
+        /// 成员1健康状况
+        /// </summary>
+        [Column("ONEHEALTHSTATUS")]
+        public string OneHealthStatus { get; set; }
+        /// <summary>
+        /// 成员1工作或学习单位
+        /// </summary>
+        [Column("ONEJOB")]
+        public string OneJob { get; set; }
+        /// <summary>
+        /// 成员1职务
+        /// </summary>
+        [Column("ONEPOSITION")]
+        public string OnePosition { get; set; }
+        /// <summary>
+        /// 成员2关系
+        /// </summary>
+        [Column("TWOMEMBERSHIP")]
+        public string TwoMembership { get; set; }
+        /// <summary>
+        /// 成员2是否监护人
+        /// </summary>
+        [Column("TWOISGUARDIAN")]
+        public string TwoIsGuardian { get; set; }
+        /// <summary>
+        /// 成员2出生年月
+        /// </summary>
+        [Column("TWOBIRTHDAY")]
+        public string TwoBirthday { get; set; }
+        /// <summary>
+        /// 成员2身份证件类型
+        /// </summary>
+        [Column("TWOIDCARDTYPE")]
+        public string TwoIdCardType { get; set; }
+        /// <summary>
+        /// 成员2身份证件号
+        /// </summary>
+        [Column("TWOIDCARDNO")]
+        public string TwoIdCardNo { get; set; }
+        /// <summary>
+        /// 成员2民族
+        /// </summary>
+        [Column("TWONATIONALITYNO")]
+        public string TwoNationalityNo { get; set; }
+        /// <summary>
+        /// 成员2政治面貌
+        /// </summary>
+        [Column("TWOPARTYFACENO")]
+        public string TwoPartyFaceNo { get; set; }
+        /// <summary>
+        /// 成员2健康状况
+        /// </summary>
+        [Column("TWOHEALTHSTATUS")]
+        public string TwoHealthStatus { get; set; }
+        /// <summary>
+        /// 成员2工作或学习单位
+        /// </summary>
+        [Column("TWOJOB")]
+        public string TwoJob { get; set; }
+        /// <summary>
+        /// 成员2职务
+        /// </summary>
+        [Column("TWOPOSITION")]
+        public string TwoPosition { get; set; }
+        /// <summary>
+        /// 学号
+        /// </summary>
+        [Column("PROVINCECODE")]
+        public string ProvinceCode { get; set; }
+        /// <summary>
+        /// 监护人
+        /// </summary>
+        [Column("GUARDIAN")]
+        public string Guardian { get; set; }
+        /// <summary>
+        /// 监护人电话
+        /// </summary>
+        [Column("GUARDIANPHONE")]
+        public string GuardianPhone { get; set; }
+        /// <summary>
+        /// 监护人与被监护人的关系
+        /// </summary>
+        [Column("GUARDIANTYPE")]
+        public string GuardianType { get; set; }
+        /// <summary>
+        /// 单亲
+        /// </summary>
+        [Column("ISSINGLE")]
+        public bool? IsSingle { get; set; }
+        /// <summary>
+        /// 留守
+        /// </summary>
+        [Column("ISLEFT")]
+        public bool? IsLeft { get; set; }
+        /// <summary>
+        /// 残疾
+        /// </summary>
+        [Column("ISDISABILITY")]
+        public bool? IsDisability { get; set; }
+        /// <summary>
+        /// 走读
+        /// </summary>
+        [Column("ISRUNSCHOOL")]
+        public bool? IsRunSchool { get; set; }
+        /// <summary>
+        /// 困难
+        /// </summary>
+        [Column("ISDDIFFICULTY")]
+        public bool? IsDdifficulty { get; set; }
+        /// <summary>
+        /// 五年一贯制
+        /// </summary>
+        [Column("FiveYear")]
+        public string FiveYear { get; set; }
+        /// <summary>
+        /// 实习状态
+        /// </summary>
+        [Column("INTERNSHIPSTATUS")]
+        public string InternshipStatus { get; set; }
+        /// <summary>
+        /// 是否复读
+        /// </summary>
+        [Column("ISRESTUDY")]
+        public string IsRestudy { get; set; }
+
+        /// <summary>
+        /// 成员1名称
+        /// </summary>
+        [Column("OneName")]
+        public string OneName { get; set; }
+        /// <summary>
+        /// 成员2名称
+        /// </summary>
+        [Column("TWONAME")]
+        public string TwoName { get; set; }
+        /// <summary>
+        /// 其他联系方式
+        /// </summary>
+        [Column("OTHERCONTACT")]
+        public string OtherContact { get; set; }
+        /// <summary>
+        /// 成员1联系方式
+        /// </summary>
+        [Column("ONEMOBILE")]
+        public string OneMobile { get; set; }
+        /// <summary>
+        /// 成员2联系方式
+        /// </summary>
+        [Column("TWOMOBILE")]
+        public string TwoMobile { get; set; }
+
+        /// <summary> 
+        /// 图书资料归还状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("RETURNBOOKSSTATUS")]
+        public string ReturnBooksStatus { get; set; }
+        /// <summary> 
+        /// 图书资料归还时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("RETURNBOOKSDATE")]
+        public DateTime? ReturnBooksDate { get; set; }
+        /// <summary> 
+        /// 就业协议备案状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("EMPLOYAGREESTATUS")]
+        public string EmployAgreeStatus { get; set; }
+        /// <summary> 
+        /// 就业协议备案时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("EMPLOYAGREEDATE")]
+        public DateTime? EmployAgreeDate { get; set; }
+        /// <summary> 
+        /// 学杂费结算状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("FEESETTLESTATUS")]
+        public string FeeSettleStatus { get; set; }
+        /// <summary> 
+        /// 学杂费结算时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("FEESETTLEDATE")]
+        public DateTime? FeeSettleDate { get; set; }
+        /// <summary> 
+        /// 办理退住手续状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("CHECKOUTSTATUS")]
+        public string CheckOutStatus { get; set; }
+        /// <summary> 
+        /// 办理退住手续时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("CHECKOUTDATE")]
+        public DateTime? CheckOutDate { get; set; }
+        /// <summary> 
+        /// 校园卡注销状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("CARDDEREGISTRATESTATUS")]
+        public string CardDeregistrateStatus { get; set; }
+        /// <summary> 
+        /// 校园卡注销时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("CARDDEREGISTRATEDATE")]
+        public DateTime? CardDeregistrateDate { get; set; }
+        /// <summary> 
+        /// 毕业证领取状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVESTATUS")]
+        public string DiplomaReceiveStatus { get; set; }
+        /// <summary> 
+        /// 毕业证领取时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEDATE")]
+        public DateTime? DiplomaReceiveDate { get; set; }
+        /// <summary> 
+        /// 档案关系转出状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("FILETRANSFERSTATUS")]
+        public string FileTransferStatus { get; set; }
+        /// <summary> 
+        /// 档案关系转出状态时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("FILETRANSFERDATE")]
+        public DateTime? FileTransferDate { get; set; }
+        /// <summary> 
+        /// 组织关系转出状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("TISSUESTATUS")]
+        public string TissueStatus { get; set; }
+        /// <summary> 
+        /// 组织关系转出状态时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("TISSUEDATE")]
+        public DateTime? TissueDate { get; set; }
+        /// <summary> 
+        /// 毕业证领取-领取人签名 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVESIGN")]
+        public string DiplomaReceiveSign { get; set; }
+        /// <summary> 
+        /// 毕业证领取-代领人身份证号 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEIDCARD")]
+        public string DiplomaReceiveIdcard { get; set; }
+        /// <summary> 
+        /// 毕业证领取-代领备注 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEREMARK")]
+        public string DiplomaReceiveRemark { get; set; }
+        #endregion
+
+        #region  扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.StuId = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.StuId = keyValue;
+        }
+        #endregion
+        #region  扩展字段
+        
+        #endregion
+        
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs
index b74538d33..b9d87cd96 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs	
@@ -873,17 +873,47 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("DIPLOMARECEIVEDATE")]
         public DateTime? DiplomaReceiveDate { get; set; }
         /// <summary> 
-        /// 档案与组织关系转出状态 
+        /// 档案关系转出状态 
         /// </summary> 
         /// <returns></returns> 
         [Column("FILETRANSFERSTATUS")]
         public string FileTransferStatus { get; set; }
         /// <summary> 
-        /// 档案与组织关系转出状态时间 
+        /// 档案关系转出状态时间 
         /// </summary> 
         /// <returns></returns> 
         [Column("FILETRANSFERDATE")]
         public DateTime? FileTransferDate { get; set; }
+        /// <summary> 
+        /// 组织关系转出状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("TISSUESTATUS")]
+        public string TissueStatus { get; set; }
+        /// <summary> 
+        /// 组织关系转出状态时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("TISSUEDATE")]
+        public DateTime? TissueDate { get; set; }
+        /// <summary> 
+        /// 毕业证领取-领取人签名 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVESIGN")]
+        public string DiplomaReceiveSign { get; set; }
+        /// <summary> 
+        /// 毕业证领取-代领人身份证号 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEIDCARD")]
+        public string DiplomaReceiveIdcard { get; set; }
+        /// <summary> 
+        /// 毕业证领取-代领备注 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("DIPLOMARECEIVEREMARK")]
+        public string DiplomaReceiveRemark { get; set; }
         #endregion
 
         #region  扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateBLL.cs
index ccebd9597..751dd057f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateBLL.cs	
@@ -67,6 +67,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<StudentCertificateEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return studentCertificateService.GetList(queryJson);
+
+            }
+            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.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateEntity.cs
index 0ccdc6e68..59a33a8a3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateEntity.cs	
@@ -94,6 +94,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("STATUS")]
         public int? Status { get; set; }
+        /// <summary>
+        /// 学年
+        /// </summary>
+        [Column("ACADEMICYEARNO")]
+        public string AcademicYearNo { get; set; }
+        /// <summary>
+        /// 学期
+        /// </summary>
+        [Column("SEMESTER")]
+        public string Semester { get; set; }
         #endregion
 
         #region 扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateIBLL.cs
index df0f17d7e..72e2ce42c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateIBLL.cs	
@@ -28,6 +28,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         StudentCertificateEntity GetStudentCertificateEntity(string keyValue);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<StudentCertificateEntity> GetList(string queryJson);
         /// <summary>
         /// 获取主表实体数据
         /// </summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateService.cs
index 6c39ee105..a534979ca 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateService.cs	
@@ -142,6 +142,58 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<StudentCertificateEntity> GetList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM StudentCertificate t ");
+                strSql.Append("  WHERE 1=1 and t.Status=2 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                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 ");
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<StudentCertificateEntity>(strSql.ToString(), dp);
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据
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 38123e9b6..685fa64e5 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	
@@ -273,6 +273,7 @@
     <Compile Include="EducationalAdministration\StuInfoBasicChange\StuInfoBasicChangeEntity.cs" />
     <Compile Include="EducationalAdministration\StuInfoBasicChange\StuInfoBasicChangeIBLL.cs" />
     <Compile Include="EducationalAdministration\StuInfoBasicChange\StuInfoBasicChangeService.cs" />
+    <Compile Include="EducationalAdministration\StuInfoDrop\StuInfoDropEntity.cs" />
     <Compile Include="EducationalAdministration\StuInfoFreshOnlineService\StuInfoFreshOnlineServiceBLL.cs" />
     <Compile Include="EducationalAdministration\StuInfoFreshOnlineService\StuInfoFreshOnlineServiceEntity.cs" />
     <Compile Include="EducationalAdministration\StuInfoFreshOnlineService\StuInfoFreshOnlineServiceIBLL.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageEntity.cs
index 1257cb8a5..0c4b463f2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageEntity.cs	
@@ -91,6 +91,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             this.F_CreateDate = DateTime.Now;
             UserInfo userInfo = LoginUserInfo.Get();
             this.F_CreateUserId = userInfo.userId;
+            this.F_CreateAccount = userInfo.account;
         }
         /// <summary>
         /// 编辑调用
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageService.cs
index 9741d3de3..b86af0663 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageService.cs	
@@ -26,12 +26,13 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <returns></returns>
         public IEnumerable<Acc_GoodsDemageEntity> GetPageList(Pagination pagination, string queryJson)
         {
+            var dbbase = this.BaseRepository().getDbConnection().Database;
             try
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM Acc_GoodsDemage t ");
-                strSql.Append(" left join StuInfoBasic s on t.F_CreateAccount=s.StuNo ");
+                strSql.Append(" left join " + dbbase + ".dbo.LR_Base_User u on t.F_CreateAccount=u.F_Account");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -60,7 +61,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 if (!queryParam["StuName"].IsEmpty())
                 {
                     dp.Add("StuName", "%"+queryParam["StuName"].ToString()+"%", DbType.String);
-                    strSql.Append(" AND s.StuName like @StuName ");
+                    strSql.Append(" AND u.F_RealName like @StuName ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<Acc_GoodsDemageEntity>(strSql.ToString(),dp, pagination);
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs
index a98290d30..d3d5f70a3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs	
@@ -131,7 +131,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         [Column("SEX")]
         public string Sex { get; set; }
         /// <summary>
-        /// 住宿学生id
+        /// 住宿学生编号（存值为StuNo）
         /// </summary>
         [Column("STUDENTID")]
         public string StudentID { get; set; }
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-action.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-action.vue
index 7b8c68d9e..138efabbe 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-action.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/workflow-action.vue	
@@ -32,7 +32,7 @@
         size="lg"
         block
       >
-        {{ button.name }}
+        {{ button.name=="同意"?"领导审批":button.name }}
       </l-button>
     </view>
 
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 f3f6ba6fe..185c5d9b1 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
@@ -21,13 +21,13 @@ export default {
   //   "http://192.168.2.98:8088/"
   // ],
   "apiHost": [
-    "http://cyzjzx.gnway.cc:30626/"//测试地址
+    // "http://cyzjzx.gnway.cc:30626/"//测试地址
 	// "http://cyzjzx.gnway.cc:29615/"//正式地址
-	 // "http://192.168.10.31:8088/"
+	 "http://192.168.10.58:8012/"
   ],
-  "webHost":"http://cyzjzx.gnway.cc:29618/",//测试地址
+  // "webHost":"http://cyzjzx.gnway.cc:29618/",//测试地址
   //"webHost":"http://wxd3f.cyzjzx.com/",//正式地址
-  // "webHost":"http://192.168.10.31:8087/",
+  "webHost":"http://192.168.10.31:8087/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
 	  // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026      420528200507261428
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 1654e0fba..38c9cbe18 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
@@ -1077,6 +1077,19 @@
 			"style": {
 				"navigationBarTitleText": "详情"
 			}
+		},
+		//毕业信息统计
+		{
+			"path": "pages/EducationalAdministration/StuGraduateStatistic/list",
+			"style": {
+				"navigationBarTitleText": "毕业信息统计"
+			}
+		},
+		{
+			"path": "pages/EducationalAdministration/StuGraduateStatistic/single",
+			"style": {
+				"navigationBarTitleText": "详情"
+			}
 		}
 		
 		
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuGraduateStatistic/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuGraduateStatistic/list.vue
new file mode 100644
index 000000000..5380d72e6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuGraduateStatistic/list.vue	
@@ -0,0 +1,404 @@
+<template> 
+  <view class="page"> 
+    <!-- 主列表页 --> 
+    <view class="mainpage" style="padding-top: 80rpx;"> 
+      <!-- 顶部条目/分页信息栏 --> 
+	  <view class="customlist-banner-header">
+	    <view class="customlist-banner-content">
+	      <slot>{{tips}}</slot>
+	    </view>
+	  </view>
+  
+      <!-- 滚动列表，跨端支持上拉/下拉 --> 
+      <l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list"> 
+        <l-customlist :tips="loadState" showTips> 
+          <!-- 单条记录 --> 
+          <view class="customlist-item" v-for="item of list" :key="item.Id"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">学生编码：</text> 
+              {{ displayListItem(item, 'StuNo') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">姓名：</text> 
+              {{ displayListItem(item, 'StuName') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">性别：</text> 
+              {{ displayListItem(item, 'GenderNo') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">身份证号：</text> 
+              {{ displayListItem(item, 'IdentityCardNo') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">学籍号：</text> 
+              {{ displayListItem(item, 'StuCode') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">学号：</text> 
+              {{ displayListItem(item, 'ProvinceCode') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">专业：</text> 
+              {{ displayListItem(item, 'MajorNo') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">学制：</text> 
+              {{ displayListItem(item, 'EduSystem') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">班级：</text> 
+              {{ displayListItem(item, 'ClassNo') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">联系电话：</text> 
+              {{ displayListItem(item, 'mobile') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">毕业去向：</text> 
+              {{ displayListItem(item, 'GraduateGo') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">升入高校名称：</text> 
+              {{ displayListItem(item, 'EnterUniversityName') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">大学层次：</text> 
+              {{ displayListItem(item, 'UniversityLevel') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">就业单位名称：</text> 
+              {{ displayListItem(item, 'EmployerName') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">就业单位所属省：</text> 
+              {{ displayListItem(item, 'EmployerProvince') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">就业单位所属市：</text> 
+              {{ displayListItem(item, 'EmployerCity') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">就业单位所属县（区）：</text> 
+              {{ displayListItem(item, 'EmployerCountry') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">备注：</text> 
+              {{ displayListItem(item, 'Remark') }} 
+            </view> 
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.Id)" showDelete @delete="action('delete', item.Id)" @view="action('view', item.Id)" /> 
+          </view> 
+        </l-customlist> 
+      </l-scroll-list> 
+    </view> 
+  
+    
+    <l-customlist-add @click="action('add')" /> 
+  
+  </view> 
+</template> 
+  
+  
+<script> 
+/* 
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2022-09-23 15:16 
+ * 描  述：毕业信息统计 
+ */
+  
+/** 
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/StuGraduateStatistic/list", "style": { "navigationBarTitleText": "表单列表页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+import moment from 'moment'
+import get from 'lodash/get'
+import set from 'lodash/set'
+import pickBy from 'lodash/pickBy'
+import mapValues from 'lodash/mapValues'
+  
+export default { 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        StuNo: { type: 'text', title: '学生编码' }, 
+        StuName: { type: 'text', title: '姓名' }, 
+        GenderNo: { type: 'select', title: '性别' }, 
+        IdentityCardNo: { type: 'text' , title: '身份证号'}, 
+        StuCode: { type: 'text', title: '学籍号' }, 
+        ProvinceCode: { type: 'text', title: '学号' }, 
+        MajorNo: { type: 'select', title: '专业', dataSource: '1', dataSourceId: 'CdMajorInfo,majorname,majorno' },
+		EduSystem: { type: 'select', title: '学制', itemCode: 'EduSystem', dataSource: '0' }, 
+        ClassNo: { type: 'select', title: '班级', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
+        mobile: { type: 'text', title: '联系电话' }, 
+		GraduateGo: { type: 'select', title: '毕业去向', itemCode: 'GraduateGo', dataSource: '0' }, 
+        EnterUniversityName: { type: 'text', title: '升入高校名称' }, 
+		UniversityLevel: { type: 'select', title: '大学层次', itemCode: 'UniversityLevel', dataSource: '0' }, 
+        EmployerName: { type: 'text', title: '就业单位名称' }, 
+        EmployerProvince: { type: 'select', title: '就业单位所属省', dataSource: '1', dataSourceId: 'DIC_PROVINCE,pname,pcode' }, 
+        EmployerCity: { type: 'select', title: '就业单位所属市', dataSource: '1', dataSourceId: 'DIC_CITY,cname,ccode' }, 
+        EmployerCountry: { type: 'select', title: '就业单位所属县（区）', dataSource: '1', dataSourceId: 'DIC_AREA,aname,acode' }, 
+        Remark: { type: 'textarea' , title: '备注'}, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+		
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+		GenderNo: [
+		    { text: '男', value: 'true' },
+		    { text: '女', value: 'false' }
+		],
+		MajorNo: [], 
+		EduSystem: Object.values(this.GET_GLOBAL('dataDictionary').EduSystem).map(t => ({ value: t.value, text: t.text })),
+		ClassNo: [], 
+		GraduateGo: Object.values(this.GET_GLOBAL('dataDictionary').GraduateGo).map(t => ({ value: t.value, text: t.text })),
+		UniversityLevel: Object.values(this.GET_GLOBAL('dataDictionary').GraduateLevel).map(t => ({ value: t.value, text: t.text })),
+		EmployerProvince: [], 
+		EmployerCity: [], 
+		EmployerCountry: [], 
+		
+      }, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('EducationalAdministrationStuGraduateStatistic-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('EducationalAdministrationStuGraduateStatistic-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
+			  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			}), 
+			this.FETCH_DATASOURCE('bjsj').then(result => { 
+			  this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			}),
+			this.FETCH_DATASOURCE('DIC_PROVINCE').then(result => {
+			  this.dataSource.EmployerProvince = result.data.map(t => ({ text: t.pname, value: t.pcode })) 
+			}),
+			this.FETCH_DATASOURCE('DIC_CITY').then(result => {
+			  this.dataSource.EmployerCity = result.data.map(t => ({ text: t.cname, value: t.ccode })) 
+			}),
+			this.FETCH_DATASOURCE('DIC_AREA').then(result => {
+			  this.dataSource.EmployerCountry = result.data.map(t => ({ text: t.aname, value: t.acode })) 
+			}),
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+	  
+	  const sobj = {
+		  StuNo:this.GET_GLOBAL('loginUser').account,
+	  };
+	  Object.assign(this.searchData,sobj);
+  
+      const result = await this.HTTP_GET( 
+        'learun/adms/EducationalAdministration/StuGraduateStatistic/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(result.rows) 
+  
+      this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页，共 ${result.records} 项` 
+      this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多'
+    }, 
+  
+    // 刷新清空列表 
+    async refreshList() { 
+      this.page = 1 
+      this.total = 2 
+      this.list = [] 
+  
+      await this.fetchList() 
+    }, 
+  
+    // 列表下拉 
+    pullDown() { 
+      this.refreshList().then(() => { 
+        this.$refs.list.stopPullDown() 
+      }) 
+    }, 
+  
+    // 设置搜索条件 
+    async searchChange() { 
+      const result = {} 
+  
+      // 将其他查询项添加到查询 JSON 中 
+      const queryObj = pickBy(this.queryData, t => (Array.isArray(t) ? t.length > 0 : t)) 
+      Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) 
+  
+      this.searchData = result 
+      await this.refreshList() 
+    }, 
+  
+    // 点击「清空查询条件」按钮 
+    reset() { 
+      this.queryData = this.COPY(this.defaultQueryData) 
+      this.searchChange() 
+    }, 
+  
+    // 点击「编辑」、「查看」、「添加」、「删除」按钮 
+    async action(type, id = '') { 
+      switch (type) { 
+        case 'view': 
+          this.NAV_TO(`./single?type=view&id=${id}`) 
+          return
+  
+        case 'add': 
+          this.NAV_TO('./single?type=create') 
+          return
+  
+        case 'edit': 
+          this.NAV_TO(`./single?type=edit&id=${id}`) 
+          return
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) { 
+            return
+          } 
+  
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuGraduateStatistic/delete', id, '删除失败').then(success => { 
+            if(!success) { return } 
+            this.TOAST('删除成功', 'success') 
+            this.refreshList() 
+          }) 
+          return
+  
+        default: 
+          return
+      } 
+    }, 
+  
+    // 显示列表中的标题项 
+    displayListItem(item, field) { 
+      const fieldItem = this.scheme[field] 
+      const value = item[field] 
+  
+      switch (fieldItem.type) { 
+        case 'currentInfo': 
+        case 'organize': 
+          return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType), `${value}.name`, '') 
+  
+        case 'radio': 
+        case 'select': 
+          const selectItem = this.dataSource[field].find(t => t.value === String(value)) 
+          return get(selectItem, 'text', '') 
+  
+        case 'checkbox': 
+          if (!value || value.split(',').length <= 0) { return '' } 
+          const checkboxItems = value.split(',') 
+          return this.dataSource[field].filter(t => checkboxItems.includes(t.value)).map(t => t.text).join('，') 
+  
+        case 'datetime': 
+          if (!value) { return '' } 
+          return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' : 'YYYY-MM-DD HH:mm') 
+  
+        default: return value === null || value === undefined ? '' : value 
+      } 
+    } 
+  
+  } 
+} 
+</script> 
+  
+  
+<style lang="less" scoped> 
+@import '~@/common/css/sidepage.less'; 
+@import '~@/common/css/customlist.less'; 
+</style> 
+<style lang="less" scoped>
+.customlist-banner-header {
+  position: fixed;
+  top: var(--window-top);
+  z-index: 1024;
+  border-bottom: 1rpx solid #ddd;
+  height: 80rpx;
+  width: 100%;
+  box-shadow: 0 0.5px 3px rgba(0, 0, 0, 0.1);
+  background: #f1f1f1;
+
+  .customlist-banner-content {
+    color: #8f8f94;
+    background: #ffffff;
+    padding: 20rpx 25rpx;
+    width: 100%;
+    vertical-align: middle;
+    border-bottom: 1rpx solid #ddd;
+
+    .customlist-banner-action {
+      position: absolute;
+      right: 20rpx;
+      top: 20rpx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuGraduateStatistic/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuGraduateStatistic/single.vue
new file mode 100644
index 000000000..ba1e4526d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuGraduateStatistic/single.vue	
@@ -0,0 +1,284 @@
+<template> 
+  <view class="page"> 
+    <view v-if="ready"> 
+		<l-select
+		  @input="setValue('StuGraduateStatistic.GraduateGo', $event)"
+		  :value="getValue('StuGraduateStatistic.GraduateGo')"
+		  :disabled="!edit"
+		  :range="dataSource.StuGraduateStatistic.GraduateGo"
+		  title="毕业去向"
+		  required
+		/> 
+      <l-input 
+        @input="setValue('StuGraduateStatistic.EnterUniversityName', $event)"
+        :value="getValue('StuGraduateStatistic.EnterUniversityName')"
+        :disabled="!edit"
+        title="升入高校名称"
+      /> 
+	  <l-select
+	    @input="setValue('StuGraduateStatistic.UniversityLevel', $event)"
+	    :value="getValue('StuGraduateStatistic.UniversityLevel')"
+	    :disabled="!edit"
+	    :range="dataSource.StuGraduateStatistic.UniversityLevel"
+	    title="大学层次"
+	  /> 
+      <l-input 
+        @input="setValue('StuGraduateStatistic.EmployerName', $event)"
+        :value="getValue('StuGraduateStatistic.EmployerName')"
+        :disabled="!edit"
+        title="就业单位名称"
+      /> 
+	  <l-select
+	    @input="setValue('StuGraduateStatistic.EmployerProvince', $event)"
+	    :value="getValue('StuGraduateStatistic.EmployerProvince')"
+	    :disabled="!edit"
+	    :range="dataSource.StuGraduateStatistic.EmployerProvince"
+		@change="EmployerProvinceChange"
+	    title="就业单位所属省"
+	  />
+	  <l-select
+	    @input="setValue('StuGraduateStatistic.EmployerCity', $event)"
+	    :value="getValue('StuGraduateStatistic.EmployerCity')"
+	    :disabled="!edit"
+	    :range="dataSource.StuGraduateStatistic.EmployerCity"
+		@change="EmployerCityChange"
+	    title="就业单位所属市"
+	  />
+	  <l-select
+	    @input="setValue('StuGraduateStatistic.EmployerCountry', $event)"
+	    :value="getValue('StuGraduateStatistic.EmployerCountry')"
+	    :disabled="!edit"
+	    :range="dataSource.StuGraduateStatistic.EmployerCountry"
+	    title="就业单位所属县"
+	  />
+	  
+      <l-textarea
+	  @input="setValue('StuGraduateStatistic.Remark', $event)"
+	  :value="getValue('StuGraduateStatistic.Remark')"
+	  :disabled="!edit"
+	  title="备注"
+	  >
+	  </l-textarea> 
+    </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('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+    </view> 
+  </view> 
+</template> 
+  
+  
+<script> 
+/* 
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2022-09-23 15:16 
+ * 描  述：毕业信息统计 
+ */
+  
+/** 
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/StuGraduateStatistic/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
+import get from 'lodash/get'
+import set from 'lodash/set'
+import moment from 'moment'
+import customPageMixins from '@/common/custompage.js'
+  
+export default { 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        StuGraduateStatistic: { 
+          GraduateGo: { type: 'select', title: '毕业去向', itemCode: 'GraduateGo', dataSource: '0', verify: 'NotNull' }, 
+          EnterUniversityName: { type: 'text', title: '升入高校名称' }, 
+          UniversityLevel: { type: 'select', title: '大学层次', itemCode: 'UniversityLevel', dataSource: '0' }, 
+          EmployerName: { type: 'text', title: '就业单位名称' }, 
+          EmployerProvince: { type: 'select', title: '就业单位所属省', dataSource: '1', dataSourceId: 'DIC_PROVINCE,pname,pcode' }, 
+          EmployerCity: { type: 'select', title: '就业单位所属市', dataSource: '1', dataSourceId: 'DIC_CITY,cname,ccode' }, 
+          EmployerCountry: { type: 'select', title: '就业单位所属县（区）', dataSource: '1', dataSourceId: 'DIC_AREA,aname,acode' }, 
+          Remark: { type: 'textarea' , title: '备注'}, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        StuGraduateStatistic: { 
+			GraduateGo: Object.values(this.GET_GLOBAL('dataDictionary').GraduateGo).map(t => ({ value: t.value, text: t.text })),
+			UniversityLevel: Object.values(this.GET_GLOBAL('dataDictionary').GraduateLevel).map(t => ({ value: t.value, text: t.text })),
+			EmployerProvince: [],
+			EmployerCity: [], 
+			EmployerCountry: [], 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+			this.FETCH_DATASOURCE('DIC_PROVINCE').then(result => {
+			  this.dataSource.StuGraduateStatistic.EmployerProvince = result.data.map(t => ({ text: t.pname, value: t.pcode })) 
+			}),
+			this.FETCH_DATASOURCE('DIC_CITY').then(result => {
+			  this.dataSource.StuGraduateStatistic.EmployerCity = result.data.map(t => ({ text: t.cname, value: t.ccode })) 
+			}),
+			this.FETCH_DATASOURCE('DIC_AREA').then(result => {
+			  this.dataSource.StuGraduateStatistic.EmployerCountry = result.data.map(t => ({ text: t.aname, value: t.acode })) 
+			}),
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/StuGraduateStatistic/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuGraduateStatistic/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationStuGraduateStatistic-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('learun/adms/EducationalAdministration/StuGraduateStatistic/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('EducationalAdministrationStuGraduateStatistic-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    },
+	
+	//多条件查询：省改变事件
+	async EmployerProvinceChange(){
+		if (this.getValue('StuGraduateStatistic.EmployerProvince') != null && this.getValue('StuGraduateStatistic.EmployerProvince') !=undefined && this.getValue('StuGraduateStatistic.EmployerProvince') != "") {
+			this.FETCH_DATASOURCE('DIC_CITY').then(result => {
+			  this.dataSource.StuGraduateStatistic.EmployerCity = result.data.filter(t=>t.cparent===this.getValue('StuGraduateStatistic.EmployerProvince') ).map(t => ({ text: t.cname, value: t.ccode })) 
+			})
+		}else{
+			this.FETCH_DATASOURCE('DIC_CITY').then(result => {
+			  this.dataSource.StuGraduateStatistic.EmployerCity = result.data.map(t => ({ text: t.cname, value: t.ccode })) 
+			})
+		}
+	},
+	//多条件查询：市改变事件
+	async EmployerCityChange(){
+		if (this.getValue('StuGraduateStatistic.EmployerCity') != null && this.getValue('StuGraduateStatistic.EmployerCity')!=undefined && this.getValue('StuGraduateStatistic.EmployerCity')!= "") {
+			this.FETCH_DATASOURCE('DIC_AREA').then(result => {
+			  this.dataSource.StuGraduateStatistic.EmployerCountry = result.data.filter(t=>t.aparent===this.getValue('StuGraduateStatistic.EmployerCity')).map(t => ({ text: t.aname, value: t.acode })) 
+			})
+		}else{
+			this.FETCH_DATASOURCE('DIC_AREA').then(result => {
+			  this.dataSource.StuGraduateStatistic.EmployerCountry = result.data.map(t => ({ text: t.aname, value: t.acode })) 
+			})
+		}
+	},
+	
+  } 
+} 
+</script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/list.vue
index c7b5a363c..791842034 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/list.vue	
@@ -264,25 +264,25 @@ export default {
       // 拉取加载列表和数据源 
       await Promise.all([ 
         this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+          this.dataSource.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
         }), 
 		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-		  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+		  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 		}),  
 		this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+          this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { 
-          this.dataSource.Dormitory = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_UnitData').then(result => { 
-          this.dataSource.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_FloorData').then(result => { 
-          this.dataSource.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_RoomData').then(result => { 
-          this.dataSource.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }), 
 		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
           this.dataSource.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
@@ -426,65 +426,74 @@ export default {
 	async DeptNoChange(){
 		if (this.queryData.DeptNo != null && this.queryData.DeptNo!=undefined && this.queryData.DeptNo != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.queryData.MajorNo='';
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	//多条件查询：宿舍楼改变事件
 	async DormitoryChange(){
 		if (this.queryData.Dormitory != null && this.queryData.Dormitory!=undefined && this.queryData.Dormitory != "") {
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Unit = result.data.filter(t=>t.parentid===this.queryData.Dormitory).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Unit = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.queryData.Dormitory).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.queryData.Unit='';
+		this.queryData.Floor='';
+		this.queryData.RId='';
 		this.searchChange()
 	},
 	//多条件查询：单元改变事件
 	async UnitChange(){
 		if (this.queryData.Unit != null && this.queryData.Unit!=undefined && this.queryData.Unit != "") {
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Floor = result.data.filter(t=>t.parentid===this.queryData.Unit).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Floor = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.queryData.Unit).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.queryData.Floor='';
+		this.queryData.RId='';
 		this.searchChange()
 	},
 	//多条件查询：楼层改变事件
 	async FloorChange(){
 		if (this.queryData.Floor != null && this.queryData.Floor!=undefined && this.queryData.Floor != "") {
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.RId = result.data.filter(t=>t.parentid===this.queryData.Floor).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.RId = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.queryData.Floor).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.queryData.RId='';
 		this.searchChange()
 	},
 	  
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue
index d5ad922cc..3b7afe0f2 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue	
@@ -59,7 +59,8 @@
 	    @input="setValue('Acc_DailyAssess.ClassNo', $event)"
 	    :value="getValue('Acc_DailyAssess.ClassNo')"
 	    :disabled="!edit"
-	    :range="dataSource.Acc_DailyAssess.ClassNo"
+	    :range="dataSource.Acc_DailyAssess.ClassNo" 
+		 @change="ClassNoChange"
 	    title="班级"
         required
 	  /> 
@@ -237,25 +238,25 @@ export default {
       // 拉取表单数据，同时拉取所有来自数据源的选单数据 
 	  await Promise.all([ 
 	    this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-	      this.dataSource.Acc_DailyAssess.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+	      this.dataSource.Acc_DailyAssess.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
 	    }), 
 	  		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-	  		  this.dataSource.Acc_DailyAssess.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+	  		  this.dataSource.Acc_DailyAssess.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 	  		}),  
 	  		this.FETCH_DATASOURCE('bjsj').then(result => { 
-	      this.dataSource.Acc_DailyAssess.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+	      this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { 
-	      this.dataSource.Acc_DailyAssess.Dormitory = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_DailyAssess.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_UnitData').then(result => { 
-	      this.dataSource.Acc_DailyAssess.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_DailyAssess.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_FloorData').then(result => { 
-	      this.dataSource.Acc_DailyAssess.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_DailyAssess.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_RoomData').then(result => { 
-	      this.dataSource.Acc_DailyAssess.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_DailyAssess.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }), 
 	  		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
 	      this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
@@ -373,60 +374,84 @@ export default {
 	async DormitoryChange(){
 		if (this.getValue('Acc_DailyAssess.Dormitory') != null && this.getValue('Acc_DailyAssess.Dormitory') !=undefined && this.getValue('Acc_DailyAssess.Dormitory') != "") {
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Acc_DailyAssess.Unit = result.data.filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Dormitory') ).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.Unit = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Dormitory') ).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Acc_DailyAssess.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_DailyAssess.Unit','');
+		this.setValue('Acc_DailyAssess.Floor','');
+		this.setValue('Acc_DailyAssess.RId','');
 	},//多条件查询：单元改变事件
 	async UnitChange(){
 		if (this.getValue('Acc_DailyAssess.Unit') != null && this.getValue('Acc_DailyAssess.Unit')!=undefined && this.getValue('Acc_DailyAssess.Unit')!= "") {
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Acc_DailyAssess.Floor = result.data.filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Unit')).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.Floor = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Unit')).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Acc_DailyAssess.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_DailyAssess.Floor','');
+		this.setValue('Acc_DailyAssess.RId','');
 	},
 	//多条件查询：楼层改变事件
 	async FloorChange(){
 		if (this.getValue('Acc_DailyAssess.Floor') != null && this.getValue('Acc_DailyAssess.Floor')!=undefined && this.getValue('Acc_DailyAssess.Floor') != "") {
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.Acc_DailyAssess.RId = result.data.filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Floor')).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.RId = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Floor')).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.Acc_DailyAssess.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_DailyAssess.RId','');
 	},
 	//多条件查询：专业部改变事件
 	async DeptNoChange(){
 		if (this.getValue('Acc_DailyAssess.DeptNo') != null && this.getValue('Acc_DailyAssess.DeptNo')!=undefined && this.getValue('Acc_DailyAssess.DeptNo') != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_DailyAssess.MajorNo = result.data.filter(t=>t.deptno===this.getValue('Acc_DailyAssess.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_DailyAssess.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.getValue('Acc_DailyAssess.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_DailyAssess.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_DailyAssess.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.setValue('Acc_DailyAssess.MajorNo','');
+		this.setValue('Acc_DailyAssess.ClassNo','');
+		this.setValue('Acc_DailyAssess.StuNo','');
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.getValue('Acc_DailyAssess.MajorNo') != null && this.getValue('Acc_DailyAssess.MajorNo')!=undefined && this.getValue('Acc_DailyAssess.MajorNo') != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_DailyAssess.ClassNo = result.data.filter(t=>t.majorno===this.getValue('Acc_DailyAssess.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_DailyAssess.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_DailyAssess.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.setValue('Acc_DailyAssess.ClassNo','');
+		this.setValue('Acc_DailyAssess.StuNo','');
+	},
+	//多条件查询：班级改变事件
+	async ClassNoChange(){
+		if (this.getValue('Acc_DailyAssess.ClassNo') != null && this.getValue('Acc_DailyAssess.ClassNo')!=undefined && this.getValue('Acc_DailyAssess.ClassNo') != "") {
+			this.FETCH_DATASOURCE('StuInfoBasic').then(result => {
+			  this.dataSource.Acc_DailyAssess.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_DailyAssess.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) 
+			})
+		}else{
+			this.FETCH_DATASOURCE('StuInfoBasic').then(result => {
+			  this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno }))
+			})
+		}
+		this.setValue('Acc_DailyAssess.StuNo','');
 	},
 	
 	
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue
index 1b9237e75..160e5fa6a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue	
@@ -40,7 +40,7 @@
               {{ displayListItem(item, 'RId') }} 
             </view> 
             <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">学生姓名：</text> 
+              <text class="customlist-item-field-title">姓名：</text> 
               {{ displayListItem(item, 'F_CreateAccount') }} 
             </view> 
   
@@ -102,7 +102,7 @@
         <l-input	 
           v-model="queryData.StuName"
           @change="searchChange"
-          title ="学生姓名"
+          title ="姓名"
         /> 
   
         <!-- 重置查询条件按钮 --> 
@@ -153,7 +153,7 @@ export default {
         Unit: { type: 'select', dataSource: '1', dataSourceId: 'Acc_UnitData,name,id' }, 
         Floor: { type: 'select', dataSource: '1', dataSourceId: 'Acc_FloorData,name,id' }, 
         RId: { type: 'select', dataSource: '1', dataSourceId: 'Acc_RoomData,name,id' }, 
-        F_CreateAccount: { type: 'select', dataSource: '1', dataSourceId: 'StuInfoBasic,stuname,stuno' }, 
+        F_CreateAccount: { type: 'select', dataSource: '1', dataSourceId: 'BaseUser,f_realname,f_account' }, 
         F_CreateDate: { type: 'datetime', dateformat: '0' }, 
         DamageDescribe: { type: 'textarea' }, 
       }, 
@@ -211,28 +211,28 @@ export default {
       // 拉取加载列表和数据源 
       await Promise.all([ 
         this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+          this.dataSource.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
         }), 
 		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-		  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+		  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 		}),  
 		this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+          this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { 
-          this.dataSource.Dormitory = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_UnitData').then(result => { 
-          this.dataSource.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_FloorData').then(result => { 
-          this.dataSource.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_RoomData').then(result => { 
-          this.dataSource.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }), 
-		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
-          this.dataSource.F_CreateAccount = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
+		this.FETCH_DATASOURCE('BaseUser').then(result => { 
+          this.dataSource.F_CreateAccount = result.data.map(t => ({ text: t.f_realname, value: t.f_account })) 
         }), 
   
   
@@ -373,26 +373,29 @@ export default {
 	async DeptNoChange(){
 		if (this.queryData.DeptNo != null && this.queryData.DeptNo!=undefined && this.queryData.DeptNo != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.queryData.MajorNo='';
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/single.vue
index 388c2531d..61fcf9dee 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/single.vue	
@@ -191,25 +191,25 @@ export default {
       // 拉取表单数据，同时拉取所有来自数据源的选单数据 
 	  await Promise.all([ 
 	    this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+	      this.dataSource.Acc_GoodsDemage.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno }))
 	    }), 
 	  		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-	  		  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+	  		  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 	  		}),  
 	  		this.FETCH_DATASOURCE('bjsj').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+	      this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.Dormitory = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_GoodsDemage.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_UnitData').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_GoodsDemage.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_FloorData').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
-	    }),  
+	      this.dataSource.Acc_GoodsDemage.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
+		}),  
 	  		this.FETCH_DATASOURCE('Acc_RoomData').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_GoodsDemage.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }), 
 	    
 	    
@@ -324,60 +324,69 @@ export default {
 	async DormitoryChange(){
 		if (this.getValue('Acc_GoodsDemage.Dormitory') != null && this.getValue('Acc_GoodsDemage.Dormitory') !=undefined && this.getValue('Acc_GoodsDemage.Dormitory') != "") {
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.Unit = result.data.filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Dormitory') ).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.Unit = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Dormitory') ).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_GoodsDemage.Unit','');
+		this.setValue('Acc_GoodsDemage.Floor','');
+		this.setValue('Acc_GoodsDemage.RId','');
 	},//多条件查询：单元改变事件
 	async UnitChange(){
 		if (this.getValue('Acc_GoodsDemage.Unit') != null && this.getValue('Acc_GoodsDemage.Unit')!=undefined && this.getValue('Acc_GoodsDemage.Unit')!= "") {
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.Floor = result.data.filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Unit')).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.Floor = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Unit')).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_GoodsDemage.Floor','');
+		this.setValue('Acc_GoodsDemage.RId','');
 	},
 	//多条件查询：楼层改变事件
 	async FloorChange(){
 		if (this.getValue('Acc_GoodsDemage.Floor') != null && this.getValue('Acc_GoodsDemage.Floor')!=undefined && this.getValue('Acc_GoodsDemage.Floor') != "") {
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.RId = result.data.filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Floor')).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.RId = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Floor')).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_GoodsDemage.RId','');
 	},
 	//多条件查询：专业部改变事件
 	async DeptNoChange(){
 		if (this.getValue('Acc_GoodsDemage.DeptNo') != null && this.getValue('Acc_GoodsDemage.DeptNo')!=undefined && this.getValue('Acc_GoodsDemage.DeptNo') != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.filter(t=>t.deptno===this.getValue('Acc_GoodsDemage.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.getValue('Acc_GoodsDemage.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.setValue('Acc_GoodsDemage.MajorNo','');
+		this.setValue('Acc_GoodsDemage.ClassNo','');
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.getValue('Acc_GoodsDemage.MajorNo') != null && this.getValue('Acc_GoodsDemage.MajorNo')!=undefined && this.getValue('Acc_GoodsDemage.MajorNo') != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_GoodsDemage.ClassNo = result.data.filter(t=>t.majorno===this.getValue('Acc_GoodsDemage.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_GoodsDemage.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_GoodsDemage.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.setValue('Acc_GoodsDemage.ClassNo','');
 	},
 	
 	
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/list.vue
index f2743956d..7f375811d 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/list.vue	
@@ -199,13 +199,13 @@ export default {
       // 拉取加载列表和数据源 
       await Promise.all([ 
         this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+          this.dataSource.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
         }), 
 		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-		  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+		  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 		}),  
 		this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+          this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
         }),  
 		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
           this.dataSource.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
@@ -349,26 +349,29 @@ export default {
 	async DeptNoChange(){
 		if (this.queryData.DeptNo != null && this.queryData.DeptNo!=undefined && this.queryData.DeptNo != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.queryData.MajorNo='';
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue
index a5c1aa8b5..2d25b07dd 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue	
@@ -24,6 +24,7 @@
 	    :value="getValue('Acc_PublicAreaHealth.ClassNo')"
 	    :disabled="!edit"
 	    :range="dataSource.Acc_PublicAreaHealth.ClassNo"
+		  @change="ClassNoChange"
 	    title="班级"
         required
 	  /> 
@@ -179,13 +180,13 @@ export default {
       // 拉取表单数据，同时拉取所有来自数据源的选单数据 
 	  await Promise.all([ 
 	    this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-	      this.dataSource.Acc_PublicAreaHealth.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+	      this.dataSource.Acc_PublicAreaHealth.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
 	    }), 
 	  		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-	  		  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+	  		  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 	  		}),  
 	  		this.FETCH_DATASOURCE('bjsj').then(result => { 
-	      this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+	      this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
 	      this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
@@ -304,26 +305,45 @@ export default {
 	async DeptNoChange(){
 		if (this.getValue('Acc_PublicAreaHealth.DeptNo') != null && this.getValue('Acc_PublicAreaHealth.DeptNo')!=undefined && this.getValue('Acc_PublicAreaHealth.DeptNo') != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.filter(t=>t.deptno===this.getValue('Acc_PublicAreaHealth.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.getValue('Acc_PublicAreaHealth.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.setValue('Acc_PublicAreaHealth.MajorNo','');
+		this.setValue('Acc_PublicAreaHealth.ClassNo','');
+		this.setValue('Acc_PublicAreaHealth.StuNo','');
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.getValue('Acc_PublicAreaHealth.MajorNo') != null && this.getValue('Acc_PublicAreaHealth.MajorNo')!=undefined && this.getValue('Acc_PublicAreaHealth.MajorNo') != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.filter(t=>t.majorno===this.getValue('Acc_PublicAreaHealth.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_PublicAreaHealth.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.setValue('Acc_PublicAreaHealth.ClassNo','');
+		this.setValue('Acc_PublicAreaHealth.StuNo','');
 	},
+	//多条件查询：班级改变事件
+	async ClassNoChange(){
+		if (this.getValue('Acc_PublicAreaHealth.ClassNo') != null && this.getValue('Acc_PublicAreaHealth.ClassNo')!=undefined && this.getValue('Acc_PublicAreaHealth.ClassNo') != "") {
+			this.FETCH_DATASOURCE('StuInfoBasic').then(result => {
+			  this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_PublicAreaHealth.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) 
+			})
+		}else{
+			this.FETCH_DATASOURCE('StuInfoBasic').then(result => {
+			  this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno }))
+			})
+		}
+		this.setValue('Acc_PublicAreaHealth.StuNo','');
+	},
+	
 	
 	
   } 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue
index 42cbea6bc..1d01c22da 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue	
@@ -198,18 +198,18 @@ export default {
   
       // 拉取加载列表和数据源 
       await Promise.all([ 
-        this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
-        }), 
+		this.FETCH_DATASOURCE('CdDeptInfo').then(result => {
+		  this.dataSource.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
+		}), 
 		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-		  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+		  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 		}),  
 		this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
-        }),  
+		  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
+		}),  
 		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
-          this.dataSource.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
-        }), 
+		  this.dataSource.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
+		}), 
   
   
         () => {} 
@@ -349,26 +349,29 @@ export default {
 	async DeptNoChange(){
 		if (this.queryData.DeptNo != null && this.queryData.DeptNo!=undefined && this.queryData.DeptNo != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.queryData.MajorNo='';
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue
index 0b4b5d4b8..9f97d5eaa 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue	
@@ -24,6 +24,7 @@
 	    :value="getValue('Acc_StuDayRoutine.ClassNo')"
 	    :disabled="!edit"
 	    :range="dataSource.Acc_StuDayRoutine.ClassNo"
+		  @change="ClassNoChange"
 	    title="班级"
         required
 	  /> 
@@ -179,13 +180,13 @@ export default {
       // 拉取表单数据，同时拉取所有来自数据源的选单数据 
 	  await Promise.all([ 
 	    this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-	      this.dataSource.Acc_StuDayRoutine.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+	      this.dataSource.Acc_StuDayRoutine.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
 	    }), 
 	  		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-	  		  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+	  		  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 	  		}),  
 	  		this.FETCH_DATASOURCE('bjsj').then(result => { 
-	      this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+	      this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
 	      this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
@@ -304,25 +305,43 @@ export default {
 	async DeptNoChange(){
 		if (this.getValue('Acc_StuDayRoutine.DeptNo') != null && this.getValue('Acc_StuDayRoutine.DeptNo')!=undefined && this.getValue('Acc_StuDayRoutine.DeptNo') != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.filter(t=>t.deptno===this.getValue('Acc_StuDayRoutine.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.getValue('Acc_StuDayRoutine.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.setValue('Acc_StuDayRoutine.MajorNo','');
+		this.setValue('Acc_StuDayRoutine.ClassNo','');
+		this.setValue('Acc_StuDayRoutine.StuNo','');
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.getValue('Acc_StuDayRoutine.MajorNo') != null && this.getValue('Acc_StuDayRoutine.MajorNo')!=undefined && this.getValue('Acc_StuDayRoutine.MajorNo') != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.filter(t=>t.majorno===this.getValue('Acc_StuDayRoutine.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_StuDayRoutine.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.setValue('Acc_StuDayRoutine.ClassNo','');
+		this.setValue('Acc_StuDayRoutine.StuNo','');
+	},
+	//多条件查询：班级改变事件
+	async ClassNoChange(){
+		if (this.getValue('Acc_StuDayRoutine.ClassNo') != null && this.getValue('Acc_StuDayRoutine')!=undefined && this.getValue('Acc_StuDayRoutine.ClassNo') != "") {
+			this.FETCH_DATASOURCE('StuInfoBasic').then(result => {
+			  this.dataSource.Acc_StuDayRoutine.StuNo = result.data.filter(t=>t.classno===this.getValue('Acc_StuDayRoutine.ClassNo')).map(t => ({ text: t.stuname, value: t.stuno })) 
+			})
+		}else{
+			this.FETCH_DATASOURCE('StuInfoBasic').then(result => {
+			  this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno }))
+			})
+		}
+		this.setValue('Acc_StuDayRoutine.StuNo','');
 	},
 	
 	
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue
index 11d74ab92..3b9b61efb 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue	
@@ -33,7 +33,7 @@
       </view>
     </template>
 
-    <l-textarea v-model="remark" :placeholder="`输入${typeText}备注`" title="备注：" />
+    <l-textarea v-model="remark" :placeholder="`输入${typeText}意见`" title="审核意见：" />
 	
 	<!-- 弹层 -->
 	<l-modal v-model="modal" @close="reviewer = ''" title="指派审核人">