Merge branch '塔里木分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -0,0 +1,158 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using Learun.Application.TwoDevelopment.LR_CodeDemo;
+using System.Collections.Generic;
+using Learun.Application.Base.SystemModule;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-11 14:34
+    /// 描 述：宿舍调换申请
+    /// </summary>
+    public class Acc_DormitoryChangeController : MvcControllerBase
+    {
+        private Acc_DormitoryChangeIBLL acc_DormitoryChangeIBLL = new Acc_DormitoryChangeBLL();
+        private CodeRuleIBLL codeRuleIBLL = new CodeRuleBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = acc_DormitoryChangeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var Acc_DormitoryChangeData = acc_DormitoryChangeIBLL.GetAcc_DormitoryChangeEntity(keyValue);
+            var jsonData = new
+            {
+                Acc_DormitoryChange = Acc_DormitoryChangeData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="processId">流程实例主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDataByProcessId(string processId)
+        {
+            var Acc_DormitoryChangeData = acc_DormitoryChangeIBLL.GetEntityByProcessId(processId);
+            var jsonData = new
+            {
+                Acc_DormitoryChange = Acc_DormitoryChangeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            acc_DormitoryChangeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            Acc_DormitoryChangeEntity entity = strEntity.ToObject<Acc_DormitoryChangeEntity>();
+            if (entity.HisDormitory == entity.Dormitory && entity.HisUnit == entity.Unit && entity.HisFloor == entity.Floor
+                && entity.HisRId == entity.RId)
+            {
+                return Fail("新宿舍请勿选择与旧宿舍一致");
+            }
+            acc_DormitoryChangeIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SubmitForm(string status, string processId, string keyValue)
+        {
+            acc_DormitoryChangeIBLL.SubmitEntity(status, processId, keyValue);
+            return Success("提交成功！");
+        }
+
+        #endregion
+
+    }
+}

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

@@ -3,6 +3,7 @@ using System.Data;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System.Collections;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 {
@@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +36,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ScheduleIndex()
+        {
+            return View();
         }
         #endregion
 
@@ -62,6 +73,29 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取日程数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult GetListForSchedule()
+        {
+            var userInfo = LoginUserInfo.Get();
+            List<Hashtable> data = new List<Hashtable>();
+            foreach (SchoolCalendarEntity entity in schoolCalendarIBLL.GetList())
+            {
+                Hashtable ht = new Hashtable();
+                ht["id"] = entity.ID;
+                ht["academicYearNo"] = "【" + entity.AcademicYearNo + "】";
+                ht["title"] = entity.Content;
+                ht["end"] = (entity.EndTime.ToDate().ToString("yyyy-MM-dd") + " " + entity.EndTime.ToString().Substring(0, 2) + ":" + entity.EndTime.ToString().Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm:ss");
+                ht["start"] = (entity.StartTime.ToDate().ToString("yyyy-MM-dd") + " " + entity.StartTime.ToString().Substring(0, 2) + ":" + entity.StartTime.ToString().Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm:ss");
+                ht["allDay"] = false;
+                data.Add(ht);
+            }
+            return ToJsonResult(data);
+        }
         /// <summary>
         /// 获取页面显示列表数据
         /// <summary>
@@ -82,8 +116,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var SchoolCalendarData = schoolCalendarIBLL.GetSchoolCalendarEntity( keyValue );
-            var jsonData = new {
+            var SchoolCalendarData = schoolCalendarIBLL.GetSchoolCalendarEntity(keyValue);
+            var jsonData = new
+            {
                 SchoolCalendar = SchoolCalendarData,
             };
             return Success(jsonData);
@@ -114,11 +149,48 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
-            UserInfo userInfo = LoginUserInfo.Get();            SchoolCalendarEntity entity = strEntity.ToObject<SchoolCalendarEntity>();
-            schoolCalendarIBLL.SaveEntity(userInfo,keyValue,entity);
+            UserInfo userInfo = LoginUserInfo.Get();
+            SchoolCalendarEntity entity = strEntity.ToObject<SchoolCalendarEntity>();
+            //根据学年和学期查询
+            var model = schoolCalendarIBLL.GetSchoolCalendarEntityByNo(entity.AcademicYearNo, entity.Semester);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                if (model != null)
+                {
+                    return Fail("当前学期已存在！");
+                }
+            }
+            else
+            {
+                if (model != null && model.ID != keyValue)
+                {
+                    return Fail("当前学期已存在！");
+                }
+            }
+            schoolCalendarIBLL.SaveEntity(userInfo, keyValue, entity);
             return Success("保存成功！");
         }
         #endregion
 
+        #region 扩展数据
+        /// <summary>
+        /// 学年
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult GenerateNearByAcademic()
+        {
+            return Success(Learun.Util.WebHelper.GenerateNearByAcademic());
+        }
+        /// <summary>
+        /// 学期
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult GenerateNearBySemeter()
+        {
+            return Success(Learun.Util.WebHelper.GenerateNearBySemeter());
+        }
+        #endregion
     }
 }

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

@@ -282,6 +282,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             ViewBag.Grade = academic.AcademicYearShort.Substring(0, 2);
             return View();
         }
+        /// <summary>
+        /// 生源地信息统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticsProvince()
+        {
+            return View();
+        }
         #endregion
 
         #region  获取数据
@@ -577,6 +586,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success("操作成功");
         }
         /// <summary>
+        ///领取军训服装
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult IsGetMiliClothes(string keyValue, string status)
+        {
+            stuInfoFreshIBLL.IsGetMiliClothes(keyValue, status);
+            return Success("操作成功");
+        }
+        /// <summary>
+        ///领取床上用品
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult IsGetBedding(string keyValue, string status)
+        {
+            stuInfoFreshIBLL.IsGetBedding(keyValue, status);
+            return Success("操作成功");
+        }
+        /// <summary>
         ///缴费
         /// </summary>
         /// <returns></returns>
@@ -1077,7 +1108,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 GetKeyNum = x.Count(y => y.GetKeyStatus == "1"),
                 GetCardNum = x.Count(y => y.GetCardStatus == "1"),
                 CollectFileNum = x.Count(y => y.CollectFileStatus == "1"),
-                LoanNum = x.Count(y => y.StudentLoanStatus == "1")
+                LoanNum = x.Count(y => y.StudentLoanStatus == "1"),
+                GetMiliClothesNum = x.Count(y => y.GetMiliClothesStatus == "1"),
+                GetBeddingNum = x.Count(y => y.GetBeddingStatus == "1")
             }).OrderBy(x => x.MajorNo);
 
             //var aa = new StatisticModel
@@ -1121,7 +1154,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 GetKeyNum = x.Count(y => y.GetKeyStatus == "1"),
                 GetCardNum = x.Count(y => y.GetCardStatus == "1"),
                 CollectFileNum = x.Count(y => y.CollectFileStatus == "1"),
-                LoanNum = x.Count(y => y.StudentLoanStatus == "1")
+                LoanNum = x.Count(y => y.StudentLoanStatus == "1"),
+                GetMiliClothesNum = x.Count(y => y.GetMiliClothesStatus == "1"),
+                GetBeddingNum = x.Count(y => y.GetBeddingStatus == "1")
             }).OrderBy(x => x.MajorNo).ThenBy(x => x.ClassNo);
             return Success(list);
         }
@@ -1164,6 +1199,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             /// 贷款人数
             /// </summary>
             public int LoanNum { get; set; }
+            /// <summary>
+            /// 已领取军训服装人数
+            /// </summary>
+            public int GetMiliClothesNum { get; set; }
+            /// <summary>
+            /// 已领取床上用品人数
+            /// </summary>
+            public int GetBeddingNum { get; set; }
+            /// <summary>
+            /// 生源地
+            /// </summary>
+            public string Province { get; set; }
+            /// <summary>
+            /// 疆内
+            /// </summary>
+            public string City { get; set; }
         }
         /// <summary>
         /// 获取列表数据
@@ -1226,6 +1277,33 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
         }
 
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetStatisticProvince(string queryJson)
+        {
+            var data = stuInfoFreshIBLL.GetList2(queryJson);
+            var list = data.Where(x => !string.IsNullOrEmpty(x.Province) && !string.IsNullOrEmpty(x.City)).GroupBy(x => new { x.Province, x.City }).Select(x => new StatisticModel
+            {
+                Province = x.Key.Province,
+                City = x.Key.City,
+                TotalNum = x.Count(),
+                InfoNum = x.Count(y => y.IsStudentEdit == true),
+                RegisterNum = x.Count(y => y.RegisterStatus == "1"),
+                PayFeeNum = x.Count(y => y.PayFeeStatus == "1" || y.OnsitePayFeeStatus == "1"),
+                GetKeyNum = x.Count(y => y.GetKeyStatus == "1"),
+                GetCardNum = x.Count(y => y.GetCardStatus == "1"),
+                CollectFileNum = x.Count(y => y.CollectFileStatus == "1"),
+                LoanNum = x.Count(y => y.StudentLoanStatus == "1"),
+                GetMiliClothesNum = x.Count(y => y.GetMiliClothesStatus == "1"),
+                GetBeddingNum = x.Count(y => y.GetBeddingStatus == "1")
+            }).OrderBy(x => x.Province).ThenBy(x => x.City);
+            return Success(list);
+        }
+
         #endregion
 
         #region 上传图片

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

@@ -26,6 +26,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
         private CdMajorIBLL cdMajorIBLL = new CdMajorBLL();
         private UserIBLL userIBLL = new UserBLL();
+        private EADateArrangeIBLL eADateArrangeIBLL = new EADateArrangeBLL();
 
         #region  视图功能
 
@@ -115,6 +116,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult InputScoreIndex()
         {
+            //获取“教学工作安排”中“成绩录入”的记录
+            var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("成绩录入");
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                ViewBag.CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                ViewBag.CanInputFlag = false;
+            }
+
             return View();
         }
         /// <summary>
@@ -124,6 +136,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult InputScoreIndexInTeacher()
         {
+            //获取“教学工作安排”中“成绩录入”的记录
+            var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("成绩录入");
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                ViewBag.CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                ViewBag.CanInputFlag = false;
+            }
+
             return View();
         }
         /// <summary>
@@ -133,6 +156,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult InputScoreIndexOfElective()
         {
+            //获取“教学工作安排”中“成绩录入”的记录
+            var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("选修成绩录入");
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                ViewBag.CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                ViewBag.CanInputFlag = false;
+            }
+
             return View();
         }
         /// <summary>
@@ -142,6 +176,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult InputScoreIndexOfElectiveInTeacher()
         {
+
+            //获取“教学工作安排”中“成绩录入”的记录
+            var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("选修成绩录入");
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                ViewBag.CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                ViewBag.CanInputFlag = false;
+            }
+
             return View();
         }
         /// <summary>

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

@@ -22,6 +22,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     {
         private StuScoreNotPassIBLL stuScoreNotPassIBLL = new StuScoreNotPassBLL();
         private UserIBLL userIBLL = new UserBLL();
+        private EADateArrangeIBLL eADateArrangeIBLL = new EADateArrangeBLL();
 
         #region  视图功能
 
@@ -51,6 +52,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult InputScoreIndex()
         {
+            //获取“教学工作安排”中“补考成绩录入”的记录
+            var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("补考成绩录入");
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                ViewBag.CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                ViewBag.CanInputFlag = false;
+            }
+
             return View();
         }
         /// <summary>
@@ -60,6 +72,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult InputScoreIndexInTeacher()
         {
+            //获取“教学工作安排”中“补考成绩录入”的记录
+            var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("补考成绩录入");
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                ViewBag.CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                ViewBag.CanInputFlag = false;
+            }
+
             return View();
         }
         /// <summary>

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

@@ -22,6 +22,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     {
         private StuScoreNotPassTwoIBLL stuScoreNotPassTwoIBLL = new StuScoreNotPassTwoBLL();
         private UserIBLL userIBLL = new UserBLL();
+        private EADateArrangeIBLL eADateArrangeIBLL = new EADateArrangeBLL();
 
         #region  视图功能
 
@@ -50,6 +51,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult InputScoreIndex()
         {
+            //获取“教学工作安排”中“重考成绩录入”的记录
+            var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("重考成绩录入");
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                ViewBag.CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                ViewBag.CanInputFlag = false;
+            }
+
             return View();
         }
         /// <summary>
@@ -59,6 +71,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult InputScoreIndexInTeacher()
         {
+            //获取“教学工作安排”中“重考成绩录入”的记录
+            var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("重考成绩录入");
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                ViewBag.CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                ViewBag.CanInputFlag = false;
+            }
+
             return View();
         }
         /// <summary>

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

@@ -0,0 +1,47 @@
+@{
+    ViewBag.Title = "宿舍调换申请";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">宿舍楼<font face="宋体">*</font></div>
+        <div id="HisDormitory" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新宿舍楼<font face="宋体">*</font></div>
+        <div id="Dormitory" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">单元<font face="宋体">*</font></div>
+        <div id="HisUnit" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新单元<font face="宋体">*</font></div>
+        <div id="Unit" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">楼层<font face="宋体">*</font></div>
+        <div id="HisFloor" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新楼层<font face="宋体">*</font></div>
+        <div id="Floor" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">宿舍<font face="宋体">*</font></div>
+        <div id="HisRId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">新宿舍<font face="宋体">*</font></div>
+        <div id="RId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">原因<font face="宋体">*</font></div>
+        <textarea id="Reason" class="form-control" style="height:50px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryChange">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Acc_DormitoryChange/Form.js")

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

@@ -0,0 +1,191 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-07-11 14:34
+ * 描  述：宿舍调换申请
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#HisDormitory').lrDataSourceSelect({
+                code: 'Acc_DormitoryData', value: 'id', text: 'name', select: function (item) {
+                    if (item) {
+                        $('#HisUnit').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_UnitData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#HisUnit').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#HisFloor').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_FloorData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#HisFloor').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#HisRId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_RoomData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+
+            $('#HisRId').lrselect({
+                text: 'name',
+                value: 'id',
+                allowSearch: true
+            })
+            $('#Dormitory').lrDataSourceSelect({
+                code: 'Acc_DormitoryData', value: 'id', text: 'name', select: function (item) {
+                    if (item) {
+                        $('#Unit').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_UnitData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#Unit').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#Floor').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_FloorData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+            $('#Floor').lrselect({
+                text: 'name',
+                value: 'id',
+                select: function (item) {
+                    if (item) {
+                        $('#RId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: 'Acc_RoomData', strWhere: "ParentID='" + item.id + "' order by name" }
+                        });
+                    }
+                }
+            });
+
+            $('#RId').lrselect({
+                text: 'name',
+                value: 'id',
+                allowSearch: true
+            })
+
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/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]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Acc_DormitoryChange' && data[id]) {
+                            keyValue = data[id].ID;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        //判断是否是学生
+        var IdentityName = learun.clientdata.get(['userinfo']).Description;
+        if (IdentityName != "学生") {
+            learun.alert.warning("当前提交者非学生!!!");
+            return false;
+        }
+        var formData = $('#form').lrGetFormData();
+        if (!!processId) {
+            formData.ProcessId = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,54 @@
+@{
+    ViewBag.Title = "宿舍调换申请";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="StuNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Acc_DormitoryChange/Index.js")

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

@@ -0,0 +1,389 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-07-11 14:34
+ * 描  述：宿舍调换申请
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#DeptNo').lrselect({
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
+                        });
+                    }
+                    else {
+                        $('#MajorNo').lrselectRefresh({
+                            url: "",
+                            data: []
+                        });
+                    }
+                    $('#ClassNo').lrselectRefresh({
+                        url: "",
+                        data: []
+                    });
+                }
+            });
+            $('#MajorNo').lrselect({
+                value: "majorno",
+                text: "majorname",
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
+                        });
+                    }
+
+                }
+            });
+
+
+            $('#MajorNo').on("click",
+                function () {
+                    var data = $('#DeptNo').lrselectGet();
+                    if (!data) {
+                        learun.alert.error('请先选择系');
+                    }
+                });
+            $('#ClassNo').on("click",
+                function () {
+                    var data1 = $('#DeptNo').lrselectGet();
+                    var data2 = $('#MajorNo').lrselectGet();
+                    if (!data1 || !data2) {
+                        learun.alert.error('请先选择系和专业');
+                    }
+                });
+
+            $('#ClassNo').lrselect({
+                value: "classno",
+                text: "classname"
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/Form',
+                    width: 600,
+                    height: 450,
+                    callBack: function (id) {
+                        var res = false;
+                        // 验证数据
+                        res = top[id].validForm();
+                        // 保存数据
+                        if (res) {
+                            res = top[id].save('', function () {
+                                page.search();
+                            });
+                        }
+                        return res;
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('Status');
+                    if (CheckStatus != "0") {
+                        learun.alert.warning("当前项已提交！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 450,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('Status');
+                    if (CheckStatus != "0") {
+                        learun.alert.warning("当前项已提交！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //  查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+            //  提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('Status');
+                    if (CheckStatus != "0") {
+                        learun.alert.warning("当前项已提交！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            processId = learun.newGuid();
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/SubmitForm', { keyValue: keyValue, status: "1", processId: processId }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/Acc_DormitoryChange/GetPageList',
+                headData: [
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "系所", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "原因", name: "Reason", width: 100, align: "left" },
+                    {
+                        label: "性别", name: "Sex", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    {
+                        label: "原宿舍楼", name: "HisDormitory", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_DormitoryData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "原单元", name: "Unit", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_UnitData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "原楼层", name: "Floor", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_FloorData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "原宿舍", name: "RId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "新宿舍楼", name: "Dormitory", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_DormitoryData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "新单元", name: "Unit", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_UnitData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "新楼层", name: "Floor", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_FloorData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "新宿舍", name: "RId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "审批状态", name: "Status", width: 100, align: "center",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-default\">草稿</span>';
+                            } if (cellvalue == 1) {
+                                return '<span class=\"label label-warning\">审批中</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-success\">同意</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-primary\">不同意</span>';
+                            }
+                        }
+                    },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                sidx: 'CreateTime',
+                sord: 'desc',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function (res, postData) {
+        if (!!res) {
+            if (res.code == 200) {
+                // 发起流程
+                var postData = {
+                    schemeCode: 'DorChange',// 填写流程对应模板编号
+                    processId: processId,
+                    level: '1',
+                };
+                learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                    learun.loading(false);
+                });
+            }
+            page.search();
+        }
+    };
+    page.init();
+}

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

@@ -3,13 +3,21 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-6 lr-form-item" data-table="SchoolCalendar">
+    @*<div class="col-xs-6 lr-form-item" data-table="SchoolCalendar">
         <div class="lr-form-item-title">学年</div>
         <input id="AcademicYearNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SchoolCalendar">
         <div class="lr-form-item-title">学期</div>
         <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
+    </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="SchoolCalendar">
+        <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="SchoolCalendar">
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SchoolCalendar">
         <div class="lr-form-item-title">开始日期</div>

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

@@ -15,8 +15,22 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $("#Semester").lrDataItemSelect({ code: 'Semester' });
-
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/SchoolCalendar/GenerateNearByAcademic',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/SchoolCalendar/GenerateNearBySemeter',
+                value: 'value',
+                text: 'text'
+            });
         },
         initData: function () {
             if (!!keyValue) {
@@ -46,6 +60,7 @@ var bootstrap = function ($, learun) {
             if (!!callBack) {
                 callBack();
             }
+            learun.frameTab.currentIframe().location.reload();
         });
     };
     page.init();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml

@@ -0,0 +1,166 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <title>日程管理</title>
+    <script src="~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js"></script>
+    <script src="~/Content/jquery/plugin/jquery-ui/jquery-ui.min.js"></script>
+    <script src="~/Content/jquery/plugin/fullcalendar/js/fullcalendar.min.js"></script>
+    <link href="~/Content/jquery/plugin/fullcalendar/css/fullcalendar.css" rel="stylesheet" />
+    @Html.AppendCssFile(
+    "/Views/LR_Content/style/lr-common.css",
+    "/Views/LR_Content/style/lr-iframe-index.css"
+    )
+
+    <script type='text/javascript'>
+        var search = (window.location.search).split('?')[1];
+        var type = search.split('=')[1];
+        //type=1  校历查看；type=2  校历管理（日历模式）
+        $(document).ready(function () {
+            resize();
+            $('.calendar').fullCalendar({
+                header: {
+                    left: 'prev,next',
+                    center: 'title',
+                    right: 'agendaDay,agendaWeek,month'
+                },
+                monthNamesShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+                dayNamesShort: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
+                buttonText: {
+                    prev: '上一页',
+                    next: '下一页',
+                    month: '月视图',
+                    week: '周视图',
+                    day: '日视图'
+                },
+                titleFormat: "yyyy年MM月",
+                columnFormat: {
+                    month: 'ddd',
+                    week: 'MM月dd日 ddd',
+                    day: 'MM月dd日 ddd'
+                },
+                allDayText: '今天',
+                axisFormat: "HH:00",
+                height: $(window).height() - 55,
+                dayClick: function (date, allDay, jsEvent, view) {
+                    if (type == 2) {
+                        btn_add();
+                    }
+                },
+                editable: true,
+                eventLimit: true,
+                eventAfterRender: function (event, element, view) {//数据绑定上去后添加相应信息在页面上
+                    //var fstart = $.fullCalendar.formatDate(event.start, "HH:mm");
+                    //var fend = $.fullCalendar.formatDate(event.end, "HH:mm");
+
+                    if (view.name == "month") {//按月份
+                        var evtcontent = '<div class="fc-event-inner fc-event-skin" data-id="' + event.id + '">';
+                        //evtcontent += '<span class="fc-event-time">' + fstart + " - " + fend + '</span>';
+                        evtcontent += '<span class="fc-event-time">' + event.academicYearNo + '</span>';
+                        evtcontent += '<span class="fc-event-title">: ' + event.title + '</span>';
+                        evtcontent += '</div><div class="ui-resizable-handle ui-resizable-e">&nbsp;&nbsp;&nbsp;</div>';
+                        if (type == 2) {
+                            evtcontent += '<div class="fc-event-delete" style="width:100%;height:100%;background-color:#000;" data-id="' + event.id + '">删除</div>';
+                        }
+                        element.html(evtcontent);
+                    } else {
+                        var evtcontent = '<div class="fc-event-inner fc-event-skin" data-id="' + event.id + '" style="height:98%">';
+                        evtcontent += '<div class="fc-event-head fc-event-skin">';
+                        evtcontent += '<span class="fc-event-time">' + event.academicYearNo + '</span>';
+                        //evtcontent += '<div class="fc-event-time">' + fstart + " - " + fend + event.title + '</div>';
+                        evtcontent += '<div class="fc-event-title">' + event.title + '</div>';
+                        evtcontent += '</div>';
+                        evtcontent += '<div class="fc-event-content"></div>';
+                        evtcontent += '<div class="fc-event-bg"></div>';
+                        evtcontent += '</div>';
+                        if (type == 2) {
+                            evtcontent += '<div class="fc-event-delete" style="width:100%;height:2%;background-color:#000;" data-id="' + event.id + '">删除</div>';
+                        }
+                        element.html(evtcontent);
+                    }
+                },
+                events: (function () {
+                    var _data = [];
+                    $.ajax({
+                        url: top.$.rootUrl + '/EducationalAdministration/SchoolCalendar/GetListForSchedule',
+                        type: "get",
+                        dataType: "json",
+                        async: false,
+                        success: function (data) {
+                            _data = data;
+                        }
+                    });
+                    return _data;
+                })()
+            });
+        });
+        function resize() {
+            $('#pageayout').height($(window).height() - 20);
+            $(window).resize(function (e) {
+                window.setTimeout(function () {
+                    $('#pageayout').height($(window).height() - 20);
+                }, 200);
+                e.stopPropagation();
+            });
+        }
+        //添加校历
+        function btn_add() {
+            if (type == 2) {
+                top.learun.layerForm({
+                    id: 'form',
+                    title: '添加校历',
+                    url: '/EducationalAdministration/SchoolCalendar/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick();
+                    }
+                });
+            }
+        };
+        //编辑校历
+        $(document).on('click', '.fc-event-inner', function () {
+            if (type == 2) {
+                var keyValue = $(this).attr('data-id');
+                top.learun.layerForm({
+                    id: 'form',
+                    title: '编辑校历',
+                    url: '/EducationalAdministration/SchoolCalendar/Form?keyValue=' + keyValue,
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick();
+                    }
+                });
+            }
+        });
+        //删除日程
+        $(document).on('click', '.fc-event-delete', function () {
+            if (type == 2) {
+                var keyValue = $(this).attr('data-id');
+                if (!keyValue) {
+                    learun.alert.warning("请选择日程！");
+                    return false;
+                }
+                top.learun.layerConfirm('是否确认删除该项！', function (res) {
+                    if (res) {
+                        top.learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/SchoolCalendar/DeleteForm', { keyValue: keyValue }, function () {
+                            callback();
+                        });
+                    }
+                });
+            }
+        });
+
+        function callback() {
+            location.reload();
+        }
+    </script>
+</head>
+<body>
+    <div id="pageayout" class="border" style="overflow: auto; padding: 0px;">
+        <div id='calendar' class="calendar" style="margin: 10px;background: #fff; "></div>
+    </div>
+</body>
+</html>

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

@@ -113,7 +113,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">是否单亲</div>
-        <div id="IsSingle" isvalid="yes" checkexpession="NotNull"></div>
+        <div id="IsSingle"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">父亲姓名</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.cshtml

@@ -37,10 +37,19 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
-                        <a id="lr_get" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;领取钥匙</a>
-                        <a id="lr_cancelGet" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置未领取钥匙</a>
-                        <a id="lr_getCard" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;领取校园卡</a>
-                        <a id="lr_cancelGetCard" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;设置未领取校园卡</a>
+                        <a id="lr_more" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            <i class="fa fa-reorder"></i>&nbsp;<span class="lrlt">更多</span><span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu pull-right">
+                            <li id="lr_get"><a><i></i>&nbsp;<span class="lrlt">领取钥匙</span></a></li>
+                            <li id="lr_cancelGet"><a><i></i>&nbsp;<span class="lrlt">设置未领取钥匙</span></a></li>
+                            <li id="lr_getCard"><a><i></i>&nbsp;<span class="lrlt">领取校园卡</span></a></li>
+                            <li id="lr_cancelGetCard"><a><i></i>&nbsp;<span class="lrlt">设置未领取校园卡</span></a></li>
+                            <li id="lr_getMiliClothes"><a><i></i>&nbsp;<span class="lrlt">领军训服装</span></a></li>
+                            <li id="lr_cancelGetMiliClothes"><a><i></i>&nbsp;<span class="lrlt">设置未领军训服装</span></a></li>
+                            <li id="lr_getBedding"><a><i></i>&nbsp;<span class="lrlt">领床上用品</span></a></li>
+                            <li id="lr_cancelGetBedding"><a><i></i>&nbsp;<span class="lrlt">设置未领床上用品</span></a></li>
+                        </ul>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_deleteBed" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除宿舍信息</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js

@@ -153,6 +153,79 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+            // 领军训服装
+            $('#lr_getMiliClothes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.GetMiliClothesStatus == "1") {
+                        learun.alert.warning("当前新生已领取军训服装！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认领取军训服装！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetMiliClothes', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 设置未领军训服装
+            $('#lr_cancelGetMiliClothes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.GetMiliClothesStatus != "1") {
+                        learun.alert.warning("当前新生暂未领取军训服装！");
+                        return;
+                    }
+                    learun.layerConfirm('是否设置新生未领取军训服装！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetMiliClothes', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 领床上用品
+            $('#lr_getBedding').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.GetBeddingStatus == "1") {
+                        learun.alert.warning("当前新生已领取床上用品！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认领取床上用品！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetBedding', { keyValue: keyValue, status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 设置未领床上用品
+            $('#lr_cancelGetBedding').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.GetBeddingStatus != "1") {
+                        learun.alert.warning("当前新生暂未领取床上用品！");
+                        return;
+                    }
+                    learun.layerConfirm('是否设置新生未领取床上用品！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/IsGetBedding', { keyValue: keyValue, status: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
@@ -209,6 +282,20 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '领取校园卡时间', name: 'GetCardDate', width: 130, align: "left" },
+
+                    {
+                        label: '领军训服装状态', name: 'GetMiliClothesStatus', width: 100, align: "left", formatter: function (value) {
+                            return value == 1 ? "<span class=\"label label-success\">已领取</span>" : "<span class=\"label label-warning\">未领取</span>";
+                        }
+                    },
+                    { label: '领军训服装时间', name: 'GetMiliClothesDate', width: 130, align: "left" },
+
+                    {
+                        label: '领床上用品状态', name: 'GetBeddingStatus', width: 100, align: "left", formatter: function (value) {
+                            return value == 1 ? "<span class=\"label label-success\">已领取</span>" : "<span class=\"label label-warning\">未领取</span>";
+                        }
+                    },
+                    { label: '领床上用品时间', name: 'GetBeddingDate', width: 130, align: "left" },
                     {
                         label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.cshtml

@@ -20,6 +20,9 @@
                     <div class="lr-layout-tool-item">
                         <div id="Grade" type="lrselect" class="lr-select"></div>
                     </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="ClassNo" type="lrselect" class="lr-select"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticClassIndex.js

@@ -8,6 +8,7 @@ var selectedRow;
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var ClassNo = "";
     var page = {
         init: function () {
             page.initGird();
@@ -22,7 +23,9 @@ var bootstrap = function ($, learun) {
                     learun.alert.warning("请选择年级！");
                     return;
                 }
-                page.search({ Grade: Grade });
+                ClassNo = $('#ClassNo').lrselectGet();
+
+                page.search({ Grade: Grade, ClassNo: ClassNo });
             });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -41,9 +44,11 @@ var bootstrap = function ($, learun) {
                 text: 'text'
             });
             $('#Grade').lrselectSet(Grade);
+            //班级
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
         },
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetStatisticListOfClass',
                 headData: [
                     { label: '年级', name: 'Grade', width: 80, align: "left" },
@@ -58,14 +63,16 @@ var bootstrap = function ($, learun) {
                     { label: '贷款人数', name: 'LoanNum', width: 100, align: "left", statistics: true },
                     { label: '已领取钥匙人数', name: 'GetKeyNum', width: 100, align: "left", statistics: true },
                     { label: '已领取校园卡人数', name: 'GetCardNum', width: 120, align: "left", statistics: true },
-                    { label: '已收取档案人数', name: 'CollectFileNum', width: 100, align: "left", statistics: true },
+                    { label: '已收取档案人数', name: 'CollectFileNum', width: 100, align: "left", statistics: true }, 
+                    { label: '已领取军训服装人数', name: 'GetMiliClothesNum', width: 120, align: "left", statistics: true  },
+                    { label: '已领取床上用品人数', name: 'GetBeddingNum', width: 120, align: "left", statistics: true  },
                 ],
                 mainId: 'MajorNo',
                 isPage: false,
                 sidx: 'MajorNo,ClassNo',
                 sord: 'asc',
             });
-            page.search({ Grade: Grade });
+            page.search({ Grade: Grade, ClassNo: ClassNo });
         },
         search: function (param) {
             param = param || {};

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticIndex.js

@@ -43,7 +43,7 @@ var bootstrap = function ($, learun) {
             $('#Grade').lrselectSet(Grade);
         },
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetStatisticList',
                 headData: [
                     { label: '年级', name: 'Grade', width: 80, align: "left" },
@@ -57,6 +57,8 @@ var bootstrap = function ($, learun) {
                     { label: '已领取钥匙人数', name: 'GetKeyNum', width: 100, align: "left", statistics: true },
                     { label: '已领取校园卡人数', name: 'GetCardNum', width: 120, align: "left", statistics: true },
                     { label: '已收取档案人数', name: 'CollectFileNum', width: 100, align: "left", statistics: true },
+                    { label: '已领取军训服装人数', name: 'GetMiliClothesNum', width: 120, align: "left", statistics: true },
+                    { label: '已领取床上用品人数', name: 'GetBeddingNum', width: 120, align: "left", statistics: true },
                 ],
                 mainId: 'MajorNo',
                 isPage: false,
@@ -78,6 +80,8 @@ var bootstrap = function ($, learun) {
                             { label: '已领取钥匙人数', name: 'GetKeyNum', width: 100, align: "left" },
                             { label: '已领取校园卡人数', name: 'GetCardNum', width: 120, align: "left" },
                             { label: '已收取档案人数', name: 'CollectFileNum', width: 100, align: "left" },
+                            { label: '已领取军训服装人数', name: 'GetMiliClothesNum', width: 120, align: "left" },
+                            { label: '已领取床上用品人数', name: 'GetBeddingNum', width: 120, align: "left" },
                         ],
                         mainId: 'ClassNo',
                         isPage: false,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsProvince.cshtml

@@ -0,0 +1,36 @@
+@{
+    ViewBag.Title = "新生信息统计";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-select {
+        width: 150px;
+    }
+</style>
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+
+                    @*<div class="lr-layout-tool-item">
+                        <div id="Grade" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>*@
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsProvince.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsProvince.js

@@ -0,0 +1,89 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-08-08 17:21
+ * 描  述：新生信息统计
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var Grade = $('#Grade').lrselectGet();
+                if (Grade == null || Grade == "") {
+                    learun.alert.warning("请选择年级！");
+                    return;
+                }
+                page.search({ Grade: Grade });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+
+
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetStatisticProvince',
+                headData: [
+                    {
+                        label: '生源地', name: 'Province', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
+                                key: value,
+                                keyId: 'pcode',
+                                callback: function (_data) {
+                                    callback(_data['pname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '疆内', name: 'City', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                key: value,
+                                keyId: 'ccode',
+                                callback: function (_data) {
+                                    callback(_data['cname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '总人数', name: 'TotalNum', width: 100, align: "left", statistics: true },
+                    { label: '已完善个人信息人数', name: 'InfoNum', width: 130, align: "left", statistics: true },
+                    { label: '已报到人数', name: 'RegisterNum', width: 100, align: "left", statistics: true },
+                    { label: '已缴费人数', name: 'PayFeeNum', width: 100, align: "left", statistics: true },
+                    { label: '贷款人数', name: 'LoanNum', width: 100, align: "left", statistics: true },
+                    { label: '已领取钥匙人数', name: 'GetKeyNum', width: 100, align: "left", statistics: true },
+                    { label: '已领取校园卡人数', name: 'GetCardNum', width: 120, align: "left", statistics: true },
+                    { label: '已收取档案人数', name: 'CollectFileNum', width: 100, align: "left", statistics: true },
+                    { label: '已领取军训服装人数', name: 'GetMiliClothesNum', width: 120, align: "left", statistics: true },
+                    { label: '已领取床上用品人数', name: 'GetBeddingNum', width: 120, align: "left", statistics: true },
+                ],
+                mainId: 'City',
+                isPage: false,
+                sidx: 'Province,City',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.cshtml

@@ -38,10 +38,11 @@
             float: right;
             padding-right: 30px;
         }
-        .scaleRow .tipBox{
-            display:inline-block;
-            color:#ff0000;
-            margin-left:10px;
+
+        .scaleRow .tipBox {
+            display: inline-block;
+            color: #ff0000;
+            margin-left: 10px;
         }
 
     #addMinutesBtn {
@@ -83,7 +84,7 @@
                         <div class="btn-group btn-group-sm">
                             <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                         </div>
-                        <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <div class=" btn-group btn-group-sm" learun-authorize="yes" id="btnBox">
                             <a id="lr_input" class="btn btn-default"><i class="fa fa-edit">&nbsp;开始录入</i></a>
                             <a id="lr_save" class="btn btn-default" style="display:none;"><i class="fa fa-edit">&nbsp;提交成绩</i></a>
                             <a id="lr_check" class="btn btn-default"><i class="fa fa-lock">&nbsp;提交教务处</i></a>
@@ -112,3 +113,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js

@@ -600,6 +600,11 @@ var bootstrap = function ($, learun) {
         }
     };
     judgeSelect = function () {
+        if (CanInputFlag != "True") {
+            top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) { });
+            return false;
+        }
+
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
         if (query.F_SchoolId == null || query.F_SchoolId == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.cshtml

@@ -113,3 +113,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js

@@ -604,6 +604,11 @@ var bootstrap = function ($, learun) {
         }
     };
     judgeSelect = function () {
+        if (CanInputFlag != "True") {
+            top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) { });
+            return false;
+        }
+
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
         if (query.F_SchoolId == null || query.F_SchoolId == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.cshtml

@@ -115,3 +115,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是选修成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js

@@ -618,6 +618,11 @@ var bootstrap = function ($, learun) {
         }
     };
     judgeSelect = function () {
+        if (CanInputFlag != "True") {
+            top.learun.layerConfirm('当前时间不是选修成绩录入时间！', function (res) { });
+            return false;
+        }
+
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
         if (query.F_SchoolId == null || query.F_SchoolId == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml

@@ -115,3 +115,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是选修成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js

@@ -621,6 +621,11 @@ var bootstrap = function ($, learun) {
         }
     };
     judgeSelect = function () {
+        if (CanInputFlag != "True") {
+            top.learun.layerConfirm('当前时间不是选修成绩录入时间！', function (res) { });
+            return false;
+        }
+
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
         if (query.F_SchoolId == null || query.F_SchoolId == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml

@@ -108,3 +108,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js

@@ -520,6 +520,11 @@ var bootstrap = function ($, learun) {
         }
     };
     judgeSelect = function () {
+        if (CanInputFlag != "True") {
+            top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) { });
+            return false;
+        }
+
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
         if (query.F_SchoolId == null || query.F_SchoolId == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.cshtml

@@ -108,3 +108,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js

@@ -483,6 +483,11 @@ var bootstrap = function ($, learun) {
         }
     };
     judgeSelect = function () {
+        if (CanInputFlag != "True") {
+            top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) { });
+            return false;
+        }
+
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
         if (query.F_SchoolId == null || query.F_SchoolId == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.cshtml

@@ -110,3 +110,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js

@@ -483,6 +483,11 @@ var bootstrap = function ($, learun) {
         }
     };
     judgeSelect = function () {
+        if (CanInputFlag != "True") {
+            top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) { });
+            return false;
+        }
+
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
         if (query.F_SchoolId == null || query.F_SchoolId == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.cshtml

@@ -108,3 +108,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js

@@ -483,6 +483,11 @@ var bootstrap = function ($, learun) {
         }
     };
     judgeSelect = function () {
+        if (CanInputFlag != "True") {
+            top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) { });
+            return false;
+        }
+
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
         if (query.F_SchoolId == null || query.F_SchoolId == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs

@@ -208,7 +208,17 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             return View();
         }
 
+        /// <summary>
+        /// 分类管理
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ClearForm()
+        {
+            return View();
+        }
 
+        
         #endregion
 
         #region  获取数据
@@ -521,6 +531,16 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             return Success("同步成功");
         }
 
+        /// <summary>
+        /// 按条件清空
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult StudentClear(string Grade)
+        {
+            accommodationIBLL.ClearEntity(Grade);
+            return Success("清空成功");
+        }
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml

@@ -11,17 +11,25 @@
         <div class="lr-form-item-title">推送人<font face="宋体">*</font></div>
         <div id="PushUser" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryRule">
         <div class="lr-form-item-title">推送班主任<font face="宋体">*</font></div>
-        <div id="ClassDiredctor"></div>
+        <div id="ClassDiredctor" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryRule">
+        <div class="lr-form-item-title">推送辅导员<font face="宋体">*</font></div>
+        <div id="CoachTeach" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryRule">
+        <div class="lr-form-item-title">推送保卫处<font face="宋体">*</font></div>
+        <div id="Defend" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="Acc_DormitoryRule">
+        <div class="lr-form-item-title">启用<font face="宋体">*</font></div>
+        <div id="IsEnable" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
         <div class="lr-form-item-title">推送时间点<font face="宋体">*</font></div>
         <input id="PushHour" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写0-23数字" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
-        <div class="lr-form-item-title">启用<font face="宋体">*</font></div>
-        <div id="IsEnable"></div>
-    </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js

@@ -27,6 +27,15 @@ var bootstrap = function ($, learun) {
                 type: 'radio',
                 code: 'YesOrNoInt',
             });
+            $('#CoachTeach').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Defend').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js

@@ -71,7 +71,7 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "晚归时间", name: "LateReturnTime", width: 100, align: "left" },
                     {
-                        label: "推送人", name: "PushUser", width: 200, align: "left",
+                        label: "推送人", name: "PushUser", width: 400, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             if (value.indexOf(',') != -1) {
                                 var content = '';
@@ -83,7 +83,7 @@ var bootstrap = function ($, learun) {
                                             key: timearr[i],
                                             keyId: 'f_userid',
                                             callback: function (_data) {
-                                                content += _data['f_realname'];
+                                                content += _data['f_realname'] + ",";
                                             }
                                         });
                                 }
@@ -113,6 +113,30 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "推送辅导员", name: "CoachTeach", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "推送保卫处", name: "Defend", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "推送时间点", name: "PushHour", width: 100, align: "left" },
                     {
                         label: "启用", name: "IsEnable", width: 100, align: "left",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/ClearForm.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "开课计划";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="ClassPlanTeach">
+        <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
+        <div id="Grade" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Accommodation/ClearForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/ClearForm.js

@@ -0,0 +1,36 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-11-29 11:43
+ * 描  述：开课计划
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+        },
+        bind: function () {
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text'
+            });
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        var Grade = postData.Grade;
+        learun.postForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/StudentClear', { Grade: Grade }, function () {
+            learun.frameTab.currentIframe().refreshGirdData()
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.cshtml

@@ -80,6 +80,7 @@
                         <a id="lr_Dept" class="btn btn-default"><i class="fa fa-pencil-square"></i>&nbsp;分配系</a>
                         <a id="lr_Class" class="btn btn-default"><i class="fa fa-pencil-square"></i>&nbsp;分配专业班级</a>
                         <a id="lr_Bed" class="btn btn-default"><i class="fa fa-pencil-square"></i>&nbsp;分配宿舍</a>
+                        <a id="lr_Clear" class="btn btn-default"><i class="fa fa-pencil-square"></i>&nbsp;按年级清空</a>
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js

@@ -315,7 +315,19 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
-
+            //清空
+            $("#lr_Clear").on("click", function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '按年级清空',
+                    url: top.$.rootUrl + '/LogisticsManagement/Accommodation/ClearForm',
+                    width: 400,
+                    height: 300,
+                    callBack: function (id) {
+                        return top[id].acceptClick();
+                    }
+                });
+            });
         },
         //初始化左侧树
         initTree: function () {

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

@@ -839,6 +839,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ExamTeacherTimeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\HealthPunchTimeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\HealthPunchStuController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\Acc_DormitoryChangeController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -1100,6 +1101,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\Print.css" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticClassIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticsProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatusView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\OnsitePayForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\LoanForm.js" />
@@ -1335,6 +1337,7 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexClassify.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\ClearForm.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
@@ -6585,6 +6588,10 @@
     <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />
@@ -7910,6 +7917,9 @@
     <Content Include="Areas\EducationalAdministration\Views\StuLeaveManagement\FormView.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\FormView.cshtml" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Acceptance\FormView.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\SchoolCalendar\ScheduleIndex.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Accommodation\ClearForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticsProvince.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

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

@@ -460,6 +460,9 @@
         if (!op.code) {
             return $(this);
         }
+        if (!!op.type) {
+            dfop.type = op.type;
+        }
         var $select = $(this).lrselect(dfop);
 
         learun.clientdata.getAllAsync('sourceData', {

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config

@@ -6,7 +6,7 @@
     <typeAlias alias="MySql" type="Learun.DataBase.MySqlEx.Database,Learun.DataBase.MySqlEx" />
     <typeAlias alias="Oracle" type="Learun.DataBase.Oracle.Database,Learun.DataBase.Oracle" />
 
-    <!--工作流接口--> 
+    <!--工作流接口-->
     <typeAlias alias="INodeMethod" type="Learun.Application.WorkFlow.INodeMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="NodeMethod" type="Learun.Application.WorkFlow.NodeMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="Ass_AssetsInfoApplyMethod" type="Learun.Application.WorkFlow.Ass_AssetsInfoApplyMethod,Learun.Application.WorkFlow" />
@@ -37,6 +37,7 @@
     <typeAlias alias="ArrangeLessonTermAttemperMethod" type="Learun.Application.WorkFlow.ArrangeLessonTermAttemperMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StuLeaveManagementMethod" type="Learun.Application.WorkFlow.StuLeaveManagementMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StuCancelLeaveManageMethod" type="Learun.Application.WorkFlow.StuCancelLeaveManageMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="Acc_DormitoryChangeMethod" type="Learun.Application.WorkFlow.Acc_DormitoryChangeMethod,Learun.Application.WorkFlow" />
 
 
     <!--任务调度器-->
@@ -85,7 +86,8 @@
       <type type="IWorkFlowMethod" mapTo="ArrangeLessonTermAttemperMethod" name="ArrangeLessonTermAttemperMethod"></type>
       <type type="IWorkFlowMethod" mapTo="StuLeaveManagementMethod" name="StuLeaveManagementMethod"></type>
       <type type="IWorkFlowMethod" mapTo="StuCancelLeaveManageMethod" name="StuCancelLeaveManageMethod"></type>
-      
+      <type type="IWorkFlowMethod" mapTo="Acc_DormitoryChangeMethod" name="Acc_DormitoryChangeMethod"></type>
+
     </container>
 
     <container name="TsIOCcontainer">

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

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-11 14:34
+    /// 描 述：宿舍调换申请
+    /// </summary>
+    public class Acc_DormitoryChangeMap : EntityTypeConfiguration<Acc_DormitoryChangeEntity>
+    {
+        public Acc_DormitoryChangeMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("ACC_DORMITORYCHANGE");
+            //主键
+            this.HasKey(t => t.ID);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

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

@@ -593,6 +593,7 @@
     <Compile Include="EducationalAdministration\Exam_ExamTeacherTimeMap.cs" />
     <Compile Include="EducationalAdministration\HealthPunchTimeMap.cs" />
     <Compile Include="EducationalAdministration\HealthPunchStuMap.cs" />
+    <Compile Include="EducationalAdministration\Acc_DormitoryChangeMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Acc_DormitoryChange/Acc_DormitoryChangeBLL.cs

@@ -0,0 +1,193 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-11 14:34
+    /// 描 述：宿舍调换申请
+    /// </summary>
+    public class Acc_DormitoryChangeBLL : Acc_DormitoryChangeIBLL
+    {
+        private Acc_DormitoryChangeService acc_DormitoryChangeService = new Acc_DormitoryChangeService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<Acc_DormitoryChangeEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return acc_DormitoryChangeService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取Acc_DormitoryChange表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public Acc_DormitoryChangeEntity GetAcc_DormitoryChangeEntity(string keyValue)
+        {
+            try
+            {
+                return acc_DormitoryChangeService.GetAcc_DormitoryChangeEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        public Acc_DormitoryChangeEntity GetEntityByProcessId(string processId)
+        {
+            try
+            {
+                return acc_DormitoryChangeService.GetEntityByProcessId(processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                acc_DormitoryChangeService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, Acc_DormitoryChangeEntity entity)
+        {
+            try
+            {
+                acc_DormitoryChangeService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SubmitEntity(string status, string processId, string keyValue)
+        {
+            try
+            {
+                acc_DormitoryChangeService.SubmitEntity(status, processId, keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 审核实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void ChangeStatusByProcessId(string status, string processId)
+        {
+            try
+            {
+                acc_DormitoryChangeService.ChangeStatusByProcessId(status, processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Acc_DormitoryChange/Acc_DormitoryChangeEntity.cs

@@ -0,0 +1,156 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-11 14:34
+    /// 描 述：宿舍调换申请
+    /// </summary>
+    public class Acc_DormitoryChangeEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// StuNo
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// StuName
+        /// </summary>
+        [Column("STUNAME")]
+        public string StuName { get; set; }
+        /// <summary>
+        /// Sex
+        /// </summary>
+        [Column("SEX")]
+        public bool? Sex { get; set; }
+        /// <summary>
+        /// Grade
+        /// </summary>
+        [Column("GRADE")]
+        public string Grade { get; set; }
+        /// <summary>
+        /// ClassNo
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// MajorNo
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// DeptNo
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// F_School
+        /// </summary>
+        [Column("F_SCHOOL")]
+        public string F_School { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// ProcessId
+        /// </summary>
+        [Column("PROCESSID")]
+        public string ProcessId { get; set; }
+        /// <summary>
+        /// 宿舍楼
+        /// </summary>
+        [Column("DORMITORY")]
+        public string Dormitory { get; set; }
+        /// <summary>
+        /// 单元
+        /// </summary>
+        [Column("UNIT")]
+        public string Unit { get; set; }
+        /// <summary>
+        /// Floor
+        /// </summary>
+        [Column("FLOOR")]
+        public string Floor { get; set; }
+        /// <summary>
+        /// RId
+        /// </summary>
+        [Column("RID")]
+        public string RId { get; set; }
+        /// <summary>
+        /// Reason
+        /// </summary>
+        [Column("REASON")]
+        public string Reason { get; set; }
+        /// <summary>
+        /// HisDormitory
+        /// </summary>
+        [Column("HISDORMITORY")]
+        public string HisDormitory { get; set; }
+        /// <summary>
+        /// HisUnit
+        /// </summary>
+        [Column("HISUNIT")]
+        public string HisUnit { get; set; }
+        /// <summary>
+        /// HisFloor
+        /// </summary>
+        [Column("HISFLOOR")]
+        public string HisFloor { get; set; }
+        /// <summary>
+        /// HisRId
+        /// </summary>
+        [Column("HISRID")]
+        public string HisRId { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Column("STATUS")]
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// CheckTime
+        /// </summary>
+        [Column("CHECKTIME")]
+        public DateTime? CheckTime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Acc_DormitoryChange/Acc_DormitoryChangeIBLL.cs

@@ -0,0 +1,64 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-11 14:34
+    /// 描 述：宿舍调换申请
+    /// </summary>
+    public interface Acc_DormitoryChangeIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<Acc_DormitoryChangeEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取Acc_DormitoryChange表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        Acc_DormitoryChangeEntity GetAcc_DormitoryChangeEntity(string keyValue);
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        Acc_DormitoryChangeEntity GetEntityByProcessId(string processId);
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, Acc_DormitoryChangeEntity entity);
+
+        void SubmitEntity(string status, string processId, string keyValue);
+
+        /// <summary>
+        /// 审核实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void ChangeStatusByProcessId(string status, string processId);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Acc_DormitoryChange/Acc_DormitoryChangeService.cs

@@ -0,0 +1,272 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-07-11 14:34
+    /// 描 述：宿舍调换申请
+    /// </summary>
+    public class Acc_DormitoryChangeService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<Acc_DormitoryChangeEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" *   ");
+                strSql.Append("  FROM Acc_DormitoryChange t ");
+                strSql.Append("  WHERE 1=1 ");
+                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 like @StuNo ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo", "" + queryParam["DeptNo"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.DeptNo=@DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo", "" + queryParam["MajorNo"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.MajorNo=@MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", "" + queryParam["ClassNo"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.ClassNo=@ClassNo ");
+                }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    dp.Add("Grade", "" + queryParam["Grade"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.Grade=@Grade ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryChangeEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取Acc_DormitoryChange表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public Acc_DormitoryChangeEntity GetAcc_DormitoryChangeEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<Acc_DormitoryChangeEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        public Acc_DormitoryChangeEntity GetEntityByProcessId(string processId)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<Acc_DormitoryChangeEntity>(t => t.ProcessId == processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<Acc_DormitoryChangeEntity>(t => t.ID == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, Acc_DormitoryChangeEntity entity)
+        {
+            entity.Status = 0;
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    var UserList = LoginUserInfo.Get();
+                    if (UserList.Description == "学生")
+                    {
+                        var StuList = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>().FirstOrDefault(x => x.StuNo == UserList.account);
+                        entity.F_School = StuList.F_SchoolId;
+                        entity.DeptNo = StuList.DeptNo;
+                        entity.MajorNo = StuList.MajorNo;
+                        entity.ClassNo = StuList.ClassNo;
+                        entity.Grade = StuList.Grade;
+                        entity.Sex = StuList.GenderNo;
+                        entity.StuName = StuList.StuName; entity.CreateTime = DateTime.Now;
+                        entity.StuNo = StuList.StuNo;
+                    }
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SubmitEntity(string status, string processId, string keyValue)
+        {
+            try
+            {
+                try
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update Acc_DormitoryChange set Status='" + status + "',ProcessId='" + processId + "' where Id='" + keyValue + "' ");
+                }
+                catch (Exception ex)
+                {
+                    if (ex is ExceptionEx)
+                    {
+                        throw;
+                    }
+                    else
+                    {
+                        throw ExceptionEx.ThrowServiceException(ex);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 审核实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void ChangeStatusByProcessId(string status, string processId)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").ExecuteBySql("update Acc_DormitoryChange set Status='" + status + "',CheckTime='" + DateTime.Now + "' where ProcessId='" + processId + "' ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeBLL.cs

@@ -66,6 +66,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取EADateArrange表实体数据
+        /// <param name="name">工作名称</param>
+        /// <summary>
+        /// <returns></returns>
+        public EADateArrangeEntity GetEADateArrangeEntityByName(string name)
+        {
+            try
+            {
+                return eADateArrangeService.GetEADateArrangeEntityByName(name);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeIBLL.cs

@@ -27,6 +27,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         EADateArrangeEntity GetEADateArrangeEntity(string keyValue);
+
+        /// <summary>
+        /// 获取EADateArrange表实体数据
+        /// <param name="name">工作名称</param>
+        /// <summary>
+        /// <returns></returns>
+        EADateArrangeEntity GetEADateArrangeEntityByName(string name);
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs

@@ -107,6 +107,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取EADateArrange表实体数据
+        /// <param name="name">工作名称</param>
+        /// <summary>
+        /// <returns></returns>
+        public EADateArrangeEntity GetEADateArrangeEntityByName(string name)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<EADateArrangeEntity>(x => x.WorkName == name);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据
@@ -339,7 +363,7 @@ where s.lessonsortno='1'
 ) as bb
 where bb.EmpNo not in 
 (select a.EmpNo from EmpReportCard a where a.AcademicYearNo=bb.AcademicYearNo and a.Semester=bb.Semester and a.LessonNo=bb.LessonNo and a.ClassNo=bb.ClassNo and a.LessonSortNo=bb.LessonSortNo and a.LessonSortNo='1'  and a.F_SchoolId=bb.F_SchoolId 
-and a.Academicyearno='" + entity.AcademicYearNo + "' and a.Semester='" + entity.Semester + "') and bb.AcademicYearNo='" + entity.AcademicYearNo + "' and bb.Semester='" + entity.Semester + "' and bb.F_SchoolId='"+entity.F_SchoolId+"' order by bb.EmpNo";
+and a.Academicyearno='" + entity.AcademicYearNo + "' and a.Semester='" + entity.Semester + "') and bb.AcademicYearNo='" + entity.AcademicYearNo + "' and bb.Semester='" + entity.Semester + "' and bb.F_SchoolId='" + entity.F_SchoolId + "' order by bb.EmpNo";
                     BaseRepository("CollegeMIS").ExecuteBySql(sql3);
                 }
                 //选修课
@@ -374,7 +398,7 @@ where s.lessonsortno='2'
 ) as bb
 where bb.EmpNo not in 
 (select a.EmpNo from EmpReportCard a where a.AcademicYearNo=bb.AcademicYearNo and a.Semester=bb.Semester and a.LessonNo=bb.LessonNo and a.LessonSection=bb.LessonSection and a.ClassRoomNo=bb.ClassRoomNo and a.LessonSortNo=bb.LessonSortNo and a.LessonSortNo='2' and a.F_SchoolId=bb.F_SchoolId  
-and a.Academicyearno='" + entity.AcademicYearNo + "' and a.Semester='" + entity.Semester + "') and bb.AcademicYearNo='" + entity.AcademicYearNo + "' and bb.Semester='" + entity.Semester + "' and bb.F_SchoolId='"+entity.F_SchoolId+"' order by bb.EmpNo";
+and a.Academicyearno='" + entity.AcademicYearNo + "' and a.Semester='" + entity.Semester + "') and bb.AcademicYearNo='" + entity.AcademicYearNo + "' and bb.Semester='" + entity.Semester + "' and bb.F_SchoolId='" + entity.F_SchoolId + "' order by bb.EmpNo";
                     BaseRepository("CollegeMIS").ExecuteBySql(sql3OfElective);
                 }
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarBLL.cs

@@ -90,6 +90,48 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns>返回列表</returns>
+        public IEnumerable<SchoolCalendarEntity> GetList()
+        {
+            try
+            {
+                return schoolCalendarService.GetList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+
+        public SchoolCalendarEntity GetSchoolCalendarEntityByNo(string academicYearNo, string semester)
+        {
+            try
+            {
+                return schoolCalendarService.GetSchoolCalendarEntityByNo(academicYearNo, semester);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
 
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarIBLL.cs

@@ -34,6 +34,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         SchoolCalendarEntity GetSchoolCalendarEntity(string keyValue);
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns>返回列表</returns>
+        IEnumerable<SchoolCalendarEntity> GetList();
+
+        /// <summary>
+        /// 根据学年获取SchoolCalendar表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        SchoolCalendarEntity GetSchoolCalendarEntityByNo(string academicYearNo, string semester);
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarService.cs

@@ -142,6 +142,48 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns>返回列表</returns>
+        public IEnumerable<SchoolCalendarEntity> GetList()
+        {
+            try
+            {
+                return this.BaseRepository().FindList<SchoolCalendarEntity>();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                    throw;
+                else
+                    throw ExceptionEx.ThrowServiceException(ex);
+            }
+        }
+        /// <summary>
+        /// 获取SchoolCalendar表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public SchoolCalendarEntity GetSchoolCalendarEntityByNo(string academicYearNo, string semester)
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<SchoolCalendarEntity>(x => x.AcademicYearNo == academicYearNo && x.Semester == semester);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据
@@ -204,6 +246,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
         #endregion
-
+        
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -459,7 +459,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUDYMODALITY")]
         public string StudyModality { get; set; }
         /// <summary>
-        /// 学籍异动状态
+        /// 学籍异动状态（异动类型为退学、休学时值为1）
         /// </summary>
         /// <returns></returns>
         [Column("CHANGESTATUS")]

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

@@ -210,13 +210,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.ClassNo);
                         if (classInfoEntity != null)
                         {
-                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}',MoveType =null,MoveStatus=null where StuNo='{entity.StuNo}' ");
                         }
                     }
                     else if (entity.StuChangeType == "04" || entity.StuChangeType == "05")  //退学、休学
                     {
                         //改信息；显示成绩；
-                        db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null where StuNo='{entity.StuNo}' ");
+                        db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null,MoveType =null,MoveStatus=null where StuNo='{entity.StuNo}' ");
                     }
 
                     //修改状态

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs

@@ -600,6 +600,54 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary> 
+        /// 领取军训服装
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public void IsGetMiliClothes(string keyValue, string status)
+        {
+            try
+            {
+                stuInfoFreshService.IsGetMiliClothes(keyValue, status);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+        /// 领取床上用品
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public void IsGetBedding(string keyValue, string status)
+        {
+            try
+            {
+                stuInfoFreshService.IsGetBedding(keyValue, status);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary> 
         /// 缴费
         /// <param name="keyValue">主键</param> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs

@@ -644,6 +644,32 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("BANKNO")]
         public string BankNo { get; set; }
+
+        /// <summary> 
+        /// 领军训服装时间
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("GETMILICLOTHESDATE")]
+        public DateTime? GetMiliClothesDate { get; set; }
+        /// <summary> 
+        /// 领军训服装状态
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("GETMILICLOTHESSTATUS")]
+        public string GetMiliClothesStatus { get; set; }
+
+        /// <summary> 
+        /// 领床上用品时间
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("GETBEDDINGDATE")]
+        public DateTime? GetBeddingDate { get; set; }
+        /// <summary> 
+        /// 领床上用品状态
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("GETBEDDINGSTATUS")]
+        public string GetBeddingStatus { get; set; }
         #endregion
 
         #region  扩展操作 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs

@@ -166,6 +166,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns> 
         void IsGetCard(string keyValue, string status);
 
+        /// <summary> 
+        /// 领取军训服装
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        void IsGetMiliClothes(string keyValue, string status);
+
+        /// <summary> 
+        /// 领取床上用品
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        void IsGetBedding(string keyValue, string status);
+
         /// <summary> 
         /// 缴费
         /// <param name="keyValue">主键</param> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -1104,6 +1104,66 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary> 
+        /// 领取军训服装
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public void IsGetMiliClothes(string keyValue, string status)
+        {
+            try
+            {
+                if (status == "1")//领取
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set GetMiliClothesStatus='1',GetMiliClothesDate='" + DateTime.Now + "' where ID='" + keyValue + "' ");
+                }
+                else
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set GetMiliClothesStatus='0',GetMiliClothesDate=null where ID='" + keyValue + "' ");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary> 
+        /// 领取床上用品
+        /// <param name="keyValue">主键</param> 
+        /// <summary> 
+        /// <returns></returns> 
+        public void IsGetBedding(string keyValue, string status)
+        {
+            try
+            {
+                if (status == "1")//领取
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set GetBeddingStatus='1',GetBeddingDate='" + DateTime.Now + "' where ID='" + keyValue + "' ");
+                }
+                else
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set GetBeddingStatus='0',GetBeddingDate=null where ID='" + keyValue + "' ");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary> 
         /// 缴费
         /// <param name="keyValue">主键</param> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs

@@ -72,7 +72,7 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
                 var queryParam = queryJson.ToJObject();
                 var strSql = new StringBuilder();
                 strSql.Append("select aa.*,bb.UID,cc.EmpName,dd.LessonName from (select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo from " + misdbname + ".dbo.StuSelectLessonList a ");
-                strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and a.StuNo='" + queryParam["StuNo"] + "') aa ");
+                strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and a.StuNo='" + queryParam["StuNo"] + "' and a.StuNo not in (select StuNo from " + misdbname + ".dbo.StuInfoBasic where ChangeStatus=1) ) aa ");
                 strSql.Append("left join  (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b  on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID ");
                 strSql.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo ");
                 if (pagination != null)
@@ -365,6 +365,7 @@ from " + misdbname + @".dbo.StuSelectLessonList a
 left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester 
 where b.Status=1 and b.VID='" + queryParam["VID"] + @"' 
 and a.StuNo is not null and a.StuNo <> ''
+and a.StuNo not in (select StuNo from " + misdbname + @".dbo.StuInfoBasic where ChangeStatus=1)
 ) aa
 left join 
 (
@@ -524,6 +525,7 @@ from " + misdbname + @".dbo.StuSelectLessonList a
 left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester 
 where b.Status=1 and b.VID='" + queryParam["VID"] + @"' 
 and a.StuNo is not null and a.StuNo <> ''
+and a.StuNo not in (select StuNo from " + misdbname + @".dbo.StuInfoBasic where ChangeStatus=1) 
 group by a.LessonNo,a.EmpNo,a.LessonName
 ) ss
 left join 

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

@@ -1802,6 +1802,10 @@
     <Compile Include="EducationalAdministration\HealthPunchStu\HealthPunchStuService.cs" />
     <Compile Include="EducationalAdministration\HealthPunchStu\HealthPunchStuBLL.cs" />
     <Compile Include="EducationalAdministration\HealthPunchStu\HealthPunchStuIBLL.cs" />
+    <Compile Include="EducationalAdministration\Acc_DormitoryChange\Acc_DormitoryChangeEntity.cs" />
+    <Compile Include="EducationalAdministration\Acc_DormitoryChange\Acc_DormitoryChangeService.cs" />
+    <Compile Include="EducationalAdministration\Acc_DormitoryChange\Acc_DormitoryChangeBLL.cs" />
+    <Compile Include="EducationalAdministration\Acc_DormitoryChange\Acc_DormitoryChangeIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
     /// 日 期：2022-03-14 12:05
     /// 描 述：宿舍晚归规则
     /// </summary>
-    public class Acc_DormitoryRuleEntity 
+    public class Acc_DormitoryRuleEntity
     {
         #region 实体成员
         /// <summary>
@@ -64,6 +64,22 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         [Column("UPDATEUSERID")]
         public string UpdateUserId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [Column("COACHTEACH")]
+        public int? CoachTeach { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [Column("DEFEND")]
+        public int? Defend { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [Column("DEFENDID")]
+        public string DefendId { get; set; }
+
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs

@@ -1,4 +1,5 @@
 using Dapper;
+using Learun.Application.Organization;
 using Learun.DataBase.Repository;
 using Learun.Util;
 using System;
@@ -138,14 +139,24 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
+                var loInfo = LoginUserInfo.Get();
                 if (!string.IsNullOrEmpty(keyValue))
                 {
+                    entity.UpdateTime = DateTime.Now;
+                    entity.UpdateUserId = loInfo.account;
                     entity.Modify(keyValue);
                     this.BaseRepository("CollegeMIS").Update(entity);
                 }
                 else
                 {
                     entity.Create();
+                    entity.CreateTime = DateTime.Now;
+                    entity.CreateUserId = loInfo.account;
+                    var NewID = this.BaseRepository().FindEntity<DepartmentEntity>(x => x.F_FullName == "保卫处").F_DepartmentId;
+                    if (NewID != null && entity.Defend == 1)
+                    {
+                        entity.DefendId = NewID;
+                    }
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs

@@ -311,11 +311,66 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        //public List<Acc_DormitoryBuildEntity> GetDept()
+        //{
+        //    try
+        //    {
+        //        return accommodationService.GetSelectData("").Select(x => new Acc_DormitoryBuildEntity { Dept = x.Dept, DeptName = x.DeptName }).Distinct().ToList();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        if (ex is ExceptionEx)
+        //        {
+        //            throw;
+        //        }
+        //        else
+        //        {
+        //            throw ExceptionEx.ThrowBusinessException(ex);
+        //        }
+        //    }
+        //}
+        //public List<Acc_DormitoryBuildEntity> GetMajor(string strWhere)
+        //{
+        //    try
+        //    {
+        //        return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Major = x.Major, MajorName = x.MajorName }).Distinct().ToList();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        if (ex is ExceptionEx)
+        //        {
+        //            throw;
+        //        }
+        //        else
+        //        {
+        //            throw ExceptionEx.ThrowBusinessException(ex);
+        //        }
+        //    }
+        //}
+        //public List<Acc_DormitoryBuildEntity> GetClass(string strWhere)
+        //{
+        //    try
+        //    {
+        //        return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Class = x.Class, ClassName = x.ClassName }).Distinct().ToList();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        if (ex is ExceptionEx)
+        //        {
+        //            throw;
+        //        }
+        //        else
+        //        {
+        //            throw ExceptionEx.ThrowBusinessException(ex);
+        //        }
+        //    }
+        //}
+
         public List<Acc_DormitoryBuildEntity> GetDept()
         {
             try
             {
-                return accommodationService.GetSelectData("").Select(x => new Acc_DormitoryBuildEntity { Dept = x.Dept, DeptName = x.DeptName }).Distinct().ToList();
+                return accommodationService.GetDeptOrMajorOrClass("").Select(x => new Acc_DormitoryBuildEntity { Dept = x.Dept, DeptName = x.DeptName }).Distinct().ToList();
             }
             catch (Exception ex)
             {
@@ -333,7 +388,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
-                return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Major = x.Major, MajorName = x.MajorName }).Distinct().ToList();
+                return accommodationService.GetDeptOrMajorOrClass(strWhere).Select(x => new Acc_DormitoryBuildEntity { Major = x.Major, MajorName = x.MajorName }).Distinct().ToList();
             }
             catch (Exception ex)
             {
@@ -351,7 +406,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
-                return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Class = x.Class, ClassName = x.ClassName }).Distinct().ToList();
+                return accommodationService.GetDeptOrMajorOrClass(strWhere).Select(x => new Acc_DormitoryBuildEntity { Class = x.Class, ClassName = x.ClassName }).Distinct().ToList();
             }
             catch (Exception ex)
             {
@@ -365,7 +420,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 }
             }
         }
-
         /// <summary>
         /// 获取左侧树形数据
         /// <summary>
@@ -830,6 +884,31 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
 
             }
         }
+
+
+        /// <summary>
+        /// 清空实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void ClearEntity(string Grade)
+        {
+            try
+            {
+                accommodationService.ClearEntity(Grade);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs

@@ -106,6 +106,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         object GetFloorList(string parentID);
         object GetRoomList(string parentID);
         object GetBedList(string parentID);
+
+        void ClearEntity(string Grade);
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs

@@ -1866,6 +1866,67 @@ where ID='{ParentID}'
             }
         }
 
+        /// <summary>
+        /// 按年级清空
+        /// </summary>
+        public void ClearEntity(string Grade)
+        {
+            try
+            {
+                BaseRepository("CollegeMIS").ExecuteBySql($"delete from Acc_DormitoryBuild where StudentID in(select StuNo from StuInfoBasic where Grade ='{Grade}')");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
+        public List<Acc_DormitoryBuildEntity> GetDeptOrMajorOrClass(string strWhere)
+        {
+            try
+            {
+                string sql1 = " select distinct dept,d.DeptName from Acc_DormitoryBuild t join CdDept d on t.dept=d.deptno";
+                string sql2 = " select distinct major,m.MajorName from Acc_DormitoryBuild t join CdMajor m on t.major=m.majorno";
+                string sql3 = " select distinct class,c.ClassName from Acc_DormitoryBuild t join ClassInfo c on t.class=c.classno";
+                string sql = @" where t.ID in (
+                select parentid from[dbo].[Acc_DormitoryBuild] where BuildType = '5' and(studentid is not null and len(studentid) > 0)
+                    )";
+                if (string.IsNullOrEmpty(strWhere))
+                {
+                    sql = sql1 + sql;
+                }
+                else if (strWhere.Contains("deptno"))
+                {
+                    sql = sql2 + sql + " and " + strWhere;
+                }
+                else if (strWhere.Contains("majorno"))
+                {
+                    sql = sql3 + sql + " and " + strWhere;
+                }
+                return this.BaseRepository("CollegeMIS").FindList<Acc_DormitoryBuildEntity>(sql).ToList();
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion 提交数据
     }
 }

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

@@ -101,6 +101,7 @@
     <Compile Include="NodeMethod\TeacherCancelLeaveManageMethod.cs" />
     <Compile Include="NodeMethod\StuDisciplineManageMethod.cs" />
     <Compile Include="NodeMethod\StuLeaveManagementMethod.cs" />
+    <Compile Include="NodeMethod\Acc_DormitoryChangeMethod.cs" />
     <Compile Include="NodeMethod\TeacherOvertimeManageMethod.cs" />
     <Compile Include="NodeMethod\TeacherLeaveManagementMethod.cs" />
     <Compile Include="NodeMethod\ArrangeLessonTermAttemperMethod.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Acc_DormitoryChangeMethod.cs

@@ -0,0 +1,28 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.WorkFlow
+{
+    public class Acc_DormitoryChangeMethod : IWorkFlowMethod
+    {
+        Acc_DormitoryChangeIBLL acc_DormitoryChangeIBLL = new Acc_DormitoryChangeBLL();
+
+
+        public void Execute(WfMethodParameter parameter)
+        {
+            if (parameter.code == "agree")
+            {
+                acc_DormitoryChangeIBLL.ChangeStatusByProcessId("2", parameter.processId);
+            }
+            else
+            {
+                acc_DormitoryChangeIBLL.ChangeStatusByProcessId("3", parameter.processId);
+            }
+        }
+    }
+}