Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNew.html

@@ -0,0 +1,8 @@
+<div class="lr-page lr-ArrangeExamTermNew-page"> 
+    <div class="lr-page-tool"> 
+        <div class="lr-tool-left"> 
+            总共<span class="lr-badge lr-badge-primary">0</span>条 
+        </div> 
+    </div> 
+    <div class="lr-page-content" id="lr_ArrangeExamTerm_list"></div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNew.js

@@ -0,0 +1,53 @@
+(function () {
+    var multipleData = null;
+    var page = {
+        grid: null,
+        init: function ($page) {
+            page.grid = $page.find('#lr_ArrangeExamTerm_list').lrpagination({
+                lclass: page.lclass,
+                rows: 10,                            // 每页行数 
+                getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调 
+                    param.multipleData = multipleData;
+                    page.loadData(param, callback, $page);
+                },
+                renderData: function (_index, _item, _$item) {// 渲染数据模板 
+                    return page.rowRender(_index, _item, _$item, $page);
+                },
+            });
+        },
+        lclass: 'lr-list',
+        loadData: function (param, callback, $page) {// 列表加载后台数据 
+            var _postParam = {
+                pagination: {
+                    rows: param.rows,
+                    page: param.page
+                },
+                queryJson: '{}'
+            };
+            if (param.multipleData) {
+                _postParam.queryJson = JSON.stringify(multipleData);
+            }
+            learun.httpget(config.webapi + '/learun/ask/testlist', _postParam, (data) => {
+                $page.find('.lr-badge').text('0');
+                if (data) {
+                    $page.find('.lr-badge').text(data.records);
+                    callback(data.rows, parseInt(data.records));
+                }
+                else {
+                    callback([], 2);
+                }
+            });
+        },
+        rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 
+            _$item.addClass('lr-list-item lr-list-item-multi');
+            _$item.append($('<p class="lr-ellipsis"><span>考试日期:</span></p>').dataFormatter({ value: _item.ExamDate }));
+            _$item.append($('<p class="lr-ellipsis"><span>考试时间:</span></p>').dataFormatter({ value: _item.ExamTime }));
+            _$item.append($('<p class="lr-ellipsis"><span>课程编码:</span></p>').dataFormatter({ value: _item.LessonNo }));
+            _$item.append($('<p class="lr-ellipsis"><span>课程名称:</span></p>').dataFormatter({ value: _item.LessonName }));
+            _$item.append($('<p class="lr-ellipsis"><span>教室编码:</span></p>').dataFormatter({ value: _item.ClassRoomNo }));
+            _$item.append($('<p class="lr-ellipsis"><span>教室名称:</span></p>').dataFormatter({ value: _item.ClassRoomName }));
+            return '';
+        },
+    };
+    return page;
+})(); 

Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs

@@ -39,7 +39,6 @@ namespace Learun.Application.Organization
                 if (list == null)
                 {
                     list = (List<DepartmentEntity>)departmentService.GetList(companyId);
-                    cache.Write<List<DepartmentEntity>>(cacheKey + companyId, list, CacheId.department);
                 }
                 return list;
             }

Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentService.cs

@@ -63,7 +63,7 @@ namespace Learun.Application.Organization
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(fieldSql);
-                strSql.Append(" FROM LR_Base_Department t WHERE t.F_EnabledMark = 1 AND t.F_DeleteMark = 0 ");
+                strSql.Append(" FROM LR_Base_Department t WHERE t.F_EnabledMark = 1 AND t.F_DeleteMark = 0 order by F_Order");
                 return this.BaseRepository().FindList<DepartmentEntity>(strSql.ToString());
             }
             catch (Exception ex)

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

@@ -233,6 +233,8 @@ namespace Learun.Application.Organization
         [Column("PERSIGNATURE")]
         public string PerSignature { get; set; }
 
+        [Column("F_ORDER")]
+        public int? F_Order { get; set; }
         #endregion
 
         #region  扩展操作

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

@@ -148,6 +148,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// 排考数据同步
         /// </summary>
         /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public async Task<ActionResult> AsyncArrangeExamDataNew(ArrangeLessonTermEntity entity)
+        {
+            var data = await arrangeExamTermIBLL.AsyncArrangeExamDataNew(entity);
+            return Success(data);
+        }
+
         [HttpGet]
         [AjaxOnly]
         public async Task<ActionResult> AsyncArrangeExamData()

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

@@ -0,0 +1,173 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Util;
+using System.Data;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-08 12:19
+    /// 描 述：排考2021新
+    /// </summary>
+    public class ArrangeExamTermNewController : MvcControllerBase
+    {
+        private ArrangeExamTermNewIBLL arrangeExamTermNewIBLL = new ArrangeExamTermNewBLL();
+        private ArrangeExamTermBLL arrangeExamTermIBLL = new ArrangeExamTermBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        [HttpGet]
+        public ActionResult IndexItem()
+        {
+            return View();
+        }
+        [HttpGet]
+        public ActionResult SyncByConditionForm()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = arrangeExamTermNewIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = arrangeExamTermNewIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetItemPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = arrangeExamTermNewIBLL.GetItemPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = arrangeExamTermNewIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            arrangeExamTermNewIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,ArrangeExamTermNewEntity entity)
+        {
+            arrangeExamTermNewIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 排考数据同步
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public async Task<ActionResult> AsyncArrangeExamDataNew(ArrangeLessonTermEntity entity)
+        {
+            var data = await arrangeExamTermIBLL.AsyncArrangeExamDataNew(entity);
+            return Success(data);
+        }
+
+
+        [HttpGet]
+        public ActionResult GetClassTree()
+        {
+            return Success(arrangeExamTermNewIBLL.GetClassTree());
+        }
+
+        public ActionResult GetLessonData()
+        {
+            return Success(arrangeExamTermNewIBLL.GetClassTree());
+        }
+        #endregion
+
+    }
+}

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

@@ -4,6 +4,8 @@ using Learun.Application.TwoDevelopment.EducationalAdministration;
 using System.Web.Mvc;
 using System.Collections.Generic;
 using System;
+using System.Linq;
+using DocumentFormat.OpenXml.Office.CustomUI;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 {
@@ -17,6 +19,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     public class ClassPlanController : MvcControllerBase
     {
         private ClassPlanIBLL classPlanIBLL = new ClassPlanBLL();
+        private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
+        private TeachClassIBLL teachClassIBLL = new TeachClassBLL();
 
         #region 视图功能
 
@@ -38,6 +42,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+
         #endregion
 
         #region 获取数据
@@ -111,12 +116,69 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             {
                 entity.AmendDate = DateTime.Now;
             }
+            entity.State = 0;
+            entity.IsAllowEdit = true;
             entity.MakeDate = DateTime.Now;
+            var model = classPlanIBLL.GetRepetitions(entity.F_SchoolId, entity.AcademicYearNo, entity.Semester, entity.DeptNo, entity.MajorNo, entity.Grade, entity.LessonNo);
+            if (model != null)
+            {
+                if (keyValue != model.ID.ToString())
+                {
+                    return Fail("此课程已重复!不可再次添加此课程");
+                }
+            }
             classPlanIBLL.SaveEntity(keyValue, entity);
 
             return Success("保存成功！");
         }
         #endregion
 
+        #region 扩展数据
+        /// <summary>
+        /// 排课
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult CourseArranging(string keyValue)
+        {
+            var entity = classPlanIBLL.GetListById(keyValue);
+
+            List<TeachClassEntity> TeachList = new List<TeachClassEntity>();
+            for (int i = 0; i < entity.Count; i++)
+            {
+                var lessonList = classInfoIBLL.GetAllClass().
+                    Where(x => x.DeptNo == entity[i].DeptNo && x.MajorNo == entity[i].MajorNo && x.Grade == entity[i].Grade)
+                    .OrderBy(x => x.ClassNo).Select(x => x.ClassNo).ToList();
+                if (lessonList.Count > 0)
+                {
+                    for (int j = 0; j < lessonList.Count; j++)
+                    {
+                        TeachClassEntity TeachEntity = new TeachClassEntity();
+                        TeachEntity.TeachClassNo = lessonList[j];
+                        TeachEntity.AcademicYearNo = entity[i].AcademicYearNo;
+                        TeachEntity.DeptNo = entity[i].DeptNo;
+                        TeachEntity.MajorNo = entity[i].MajorNo;
+                        TeachEntity.Grade = entity[i].Grade;
+                        TeachEntity.Semester = entity[i].Semester;
+                        TeachEntity.LessonNo = entity[i].LessonNo;
+                        TeachEntity.StuNum = entity[i].StuNum;
+                        TeachEntity.LessonSortNo = entity[i].LessonSortNo;
+                        TeachEntity.F_SchoolId = entity[i].F_SchoolId;
+                        TeachList.Add(TeachEntity);
+                    }
+                }
+                else
+                {
+                    return Fail("排课失败!暂无排课班级");
+                }
+            }
+            teachClassIBLL.SaveEntityList(TeachList);
+            classPlanIBLL.SaveEntityList(keyValue, entity);
+            return Success("排课成功");
+        }
+
+        #endregion
     }
 }

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

@@ -0,0 +1,282 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+using System.Linq;
+using DocumentFormat.OpenXml.Office.CustomUI;
+using List = DocumentFormat.OpenXml.Office2010.ExcelAc.List;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-08-21 17:28
+    /// 描 述：设置教师
+    /// </summary>
+    public class ClassPlanTeachController : MvcControllerBase
+    {
+        private TeachClassIBLL teachClassIBLL = new TeachClassBLL();
+        private StuSelectLessonListIBLL StuSelectLesson = new StuSelectLessonListBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult TeachForm()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult TeachFormQZ()
+        {
+            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 = teachClassIBLL.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 ClassPlanData = teachClassIBLL.GetTeachClassEntity(keyValue);
+            var jsonData = new
+            {
+                ClassPlan = ClassPlanData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teachClassIBLL.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)
+        {
+            TeachClassEntity entity = strEntity.ToObject<TeachClassEntity>();
+            teachClassIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        #endregion
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 设置教师
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+
+        public ActionResult SetTeach(string keyValue, string EmpNo)
+        {
+            var entityList = teachClassIBLL.GetTeachListById(keyValue);
+            List<StuSelectLessonListEntity> TeachList = new List<StuSelectLessonListEntity>();
+            for (int i = 0; i < entityList.Count; i++)
+            {
+                var stuDataList = stuInfoBasicIBLL.GetAllList().Where(s => s.DeptNo == entityList[i].DeptNo
+                                 && s.MajorNo == entityList[i].MajorNo && s.F_SchoolId == entityList[i].F_SchoolId
+                                 && s.ClassNo == entityList[i].TeachClassNo
+                                 ).ToList();
+                if (stuDataList.Count > 0)
+                {
+                    for (int j = 0; j < stuDataList.Count; j++)
+                    {
+                        StuSelectLessonListEntity TeachEntity = new StuSelectLessonListEntity();
+                        TeachEntity.StuNo = stuDataList[j].StuNo;
+                        TeachEntity.DeptNo = entityList[i].DeptNo;
+                        TeachEntity.MajorNo = entityList[i].MajorNo;
+                        TeachEntity.ClassNo = stuDataList[j].ClassNo;
+                        TeachEntity.MajorDetailNo = entityList[i].MajorDetailNo;
+                        TeachEntity.MajorDetailName = entityList[i].MajorDetailName;
+                        TeachEntity.StuName = stuDataList[j].StuName;
+                        TeachEntity.AcademicYearNo = entityList[i].AcademicYearNo;
+                        TeachEntity.Semester = entityList[i].Semester;
+                        TeachEntity.OpenLessonDeptNo = entityList[i].DeptNo;
+                        TeachEntity.OpenLessonMajorNo = entityList[i].MajorNo;
+                        TeachEntity.LessonNo = entityList[i].LessonNo;
+                        TeachEntity.PartCode = entityList[i].PartCode;
+                        TeachEntity.OrdinaryScoreScale = 0;
+                        TeachEntity.TermInScoreScale = 0;
+                        TeachEntity.TermEndScoreScale = 0;
+                        TeachEntity.OtherScoreScale = 0;
+                        TeachEntity.TeachClassNo = entityList[i].TeachClassNo;
+                        TeachEntity.LessonSortNo = entityList[i].LessonSortNo;
+                        TeachEntity.StuSortNo = entityList[i].LessonSortNo;
+                        TeachEntity.Grade = entityList[i].Grade;
+                        TeachEntity.StudyScore = 2;
+                        TeachEntity.TotalStudyHour = 2;
+                        TeachEntity.IsInEffect = "1";
+                        TeachEntity.IsPitchOn = "1";
+                        TeachEntity.IsPitchOn = "1";
+                        TeachEntity.F_SchoolId = entityList[i].F_SchoolId;
+                        TeachEntity.CheckMark = "1";
+                        TeachEntity.InsertTime = DateTime.Now;
+                        TeachList.Add(TeachEntity);
+                    }
+                }
+                else
+                {
+                    return Fail("设置失败,未发现相关学生!");
+                }
+            }
+            StuSelectLesson.SaveEntityList(TeachList);
+
+            teachClassIBLL.UpEmpNo(keyValue, EmpNo); //更改当前教师
+
+            return Success("设置成功!");
+
+        }
+        public ActionResult QzSetTeach(string keyValue, string EmpNo)
+        {
+            var entityList = teachClassIBLL.GetTeachListById(keyValue);
+            string Nid = "";
+            if (entityList.Count > 0)
+            {
+                for (int i = 0; i < entityList.Count; i++)
+                {
+                    List<string> ssList = StuSelectLesson.GetAllList().Where(
+                                    y => y.DeptNo == entityList[i].DeptNo
+                                 && y.MajorNo == entityList[i].MajorNo
+                                 && y.F_SchoolId == entityList[i].F_SchoolId
+                                 && y.ClassNo == entityList[i].TeachClassNo
+                                 && y.LessonNo == entityList[i].LessonNo
+                                 && y.CheckMark == "1"
+                                ).Select(x => x.SelectId.ToString()).ToList();
+                    Nid += string.Join(",", ssList) + ",";
+                }
+            }
+
+            Nid = Nid.TrimEnd(',');
+            StuSelectLesson.DeleteEntity(Nid);
+
+            List<StuSelectLessonListEntity> TeachList = new List<StuSelectLessonListEntity>();
+            for (int i = 0; i < entityList.Count; i++)
+            {
+                var stuDataList = stuInfoBasicIBLL.GetAllList().Where(s => s.DeptNo == entityList[i].DeptNo
+                                 && s.MajorNo == entityList[i].MajorNo && s.F_SchoolId == entityList[i].F_SchoolId
+                                 && s.ClassNo == entityList[i].TeachClassNo
+                                 ).ToList();
+                if (stuDataList.Count > 0)
+                {
+                    for (int j = 0; j < stuDataList.Count; j++)
+                    {
+                        StuSelectLessonListEntity TeachEntity = new StuSelectLessonListEntity();
+                        TeachEntity.StuNo = stuDataList[j].StuNo;
+                        TeachEntity.DeptNo = entityList[i].DeptNo;
+                        TeachEntity.MajorNo = entityList[i].MajorNo;
+                        TeachEntity.ClassNo = stuDataList[j].ClassNo;
+                        TeachEntity.MajorDetailNo = entityList[i].MajorDetailNo;
+                        TeachEntity.MajorDetailName = entityList[i].MajorDetailName;
+                        TeachEntity.StuName = stuDataList[j].StuName;
+                        TeachEntity.GenderNo = stuDataList[j].GenderNo == true ? "0" : "1";
+                        TeachEntity.AcademicYearNo = entityList[i].AcademicYearNo;
+                        TeachEntity.Semester = entityList[i].Semester;
+                        TeachEntity.OpenLessonDeptNo = entityList[i].DeptNo;
+                        TeachEntity.OpenLessonMajorNo = entityList[i].MajorNo;
+                        TeachEntity.LessonNo = entityList[i].LessonNo;
+                        TeachEntity.PartCode = entityList[i].PartCode;
+                        TeachEntity.OrdinaryScoreScale = 0;
+                        TeachEntity.TermInScoreScale = 0;
+                        TeachEntity.TermEndScoreScale = 0;
+                        TeachEntity.OtherScoreScale = 0;
+                        TeachEntity.TeachClassNo = entityList[i].TeachClassNo;
+                        TeachEntity.LessonSortNo = entityList[i].LessonSortNo;
+                        TeachEntity.StuSortNo = entityList[i].LessonSortNo;
+                        TeachEntity.Grade = entityList[i].Grade;
+                        TeachEntity.StudyScore = 2;
+                        TeachEntity.TotalStudyHour = 2;
+                        TeachEntity.IsInEffect = "1";
+                        TeachEntity.IsPitchOn = "1";
+                        TeachEntity.IsPitchOn = "1";
+                        TeachEntity.F_SchoolId = entityList[i].F_SchoolId;
+                        TeachEntity.InsertTime = DateTime.Now;
+                        TeachList.Add(TeachEntity);
+                    }
+                }
+                else
+                {
+                    return Fail("设置失败,未发现相关学生!");
+                }
+            }
+
+            StuSelectLesson.SaveEntityList(TeachList);
+
+            teachClassIBLL.UpEmpNo(keyValue, EmpNo); //更改当前教师
+
+            return Success("设置成功!");
+        }
+        #endregion
+    }
+}

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

@@ -0,0 +1,63 @@
+@{
+    ViewBag.Title = "排考2021新";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">AETId<font face="宋体">*</font></div>
+        <input id="AETId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">AcademicYearNo<font face="宋体">*</font></div>
+        <input id="AcademicYearNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">Semester<font face="宋体">*</font></div>
+        <input id="Semester" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">ExamDate<font face="宋体">*</font></div>
+        <input id="ExamDate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">ExamTime<font face="宋体">*</font></div>
+        <input id="ExamTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">ClassNo<font face="宋体">*</font></div>
+        <input id="ClassNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">ClassName<font face="宋体">*</font></div>
+        <input id="ClassName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">LessonNo<font face="宋体">*</font></div>
+        <input id="LessonNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">LessonName<font face="宋体">*</font></div>
+        <input id="LessonName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">EmpNo<font face="宋体">*</font></div>
+        <input id="EmpNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">EmpName<font face="宋体">*</font></div>
+        <input id="EmpName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">ClassRoomNo<font face="宋体">*</font></div>
+        <input id="ClassRoomNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">ClassRoomName<font face="宋体">*</font></div>
+        <input id="ClassRoomName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">F_SchoolId<font face="宋体">*</font></div>
+        <input id="F_SchoolId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Form.js")

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

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

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

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "排考2021新";
+    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="AcademicYearNo" type="lrselect" class="lr-select lr-selectLittle" style="width: 80px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="Semester" type="lrselect" class="lr-select lr-selectLittle"  style="width: 80px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="LessonNo" type="lrselect" class="lr-select"  style="width: 200px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch" class="datetime"></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">
+                        <a id="lr_arrange" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;排考数据同步</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeExamTermNew/Index.js")

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

@@ -0,0 +1,121 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-12-08 12:19
+ * 描  述：排考2021新
+ */
+var selectedRow;
+var refreshGirdData;
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var datebegin = '';
+    var dateend = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('.datetime').each(function () {
+                $(this).lrdate({
+                    dfdata: [
+                        { name: '清空', begin: function () { return '' }, end: function () { return '' } },
+                        { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    ],
+                    // 月
+                    mShow: false,
+                    premShow: false,
+                    // 季度
+                    jShow: false,
+                    prejShow: false,
+                    // 年
+                    ysShow: false,
+                    yxShow: false,
+                    preyShow: false,
+                    yShow: false,
+                    // 默认
+                    dfvalue: '0',
+                    selectfn: function (begin, end) {
+                        datebegin = begin;
+                        dateend = end;
+                    }
+                });
+            });
+            // 查询
+            $('#btn_Search').on('click', function () {
+                page.search({ AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet()});
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //排考数据同步
+            $('#lr_arrange').on('click', function () {
+                learun.layerForm({
+                    id: 'SyncByConditionForm',
+                    title: '按条件同步排考数据',
+                    url: top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/SyncByConditionForm',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
+            //课程
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname', placeholder:'请选择课程' });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/GetPageList',
+                headData: [
+                    { label: '学年', name: 'AcademicYearNo', width: 80, align: "left" },
+                    { label: '学期', name: 'Semester', width: 80, align: "left" },
+                    { label: '考试日期', name: 'ExamDate', width: 100, align: "left" },
+                    { label: '考试时间', name: 'ExamTime', width: 100, align: "left" },
+                    //{ label: '班级编号', name: 'ClassNo', width: 200, align: "left" },
+                    //{ label: '班级名称', name: 'ClassName', width: 200, align: "left" },
+                    { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
+                    { label: '课程名称', name: 'LessonName', width: 200, align: "left" },
+                    { label: '教师编号', name: 'EmpNo', width: 100, align: "left" },
+                    { label: '教师姓名', name: 'EmpName', width: 100, align: "left" },
+                    { label: '教室编号', name: 'ClassRoomNo', width: 100, align: "left" },
+                    { label: '教室名称', name: 'ClassRoomName', width: 100, align: "left" }
+                ],
+                mainId: 'AETId',
+                sidx: 'ExamTime asc, LessonNo asc,ClassRoomNo asc',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = datebegin;
+            param.EndTime = dateend;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.cshtml

@@ -0,0 +1,51 @@
+@{
+    ViewBag.Title = "排考2021新";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title lrlt ">班级信息</div>
+            <div id="dataTree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">
+                <span id="titleinfo" class="lrlt">班级信息</span>
+            </div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="AcademicYearNo" type="lrselect" class="lr-select lr-selectLittle" style="width: 80px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="Semester" type="lrselect" class="lr-select lr-selectLittle" style="width: 80px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="LessonNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="ClassRoomNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="EmpNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch" class="datetime"></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>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexItem.js

@@ -0,0 +1,130 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-12-08 12:19
+ * 描  述：排考2021新
+ */
+var selectedRow;
+var refreshGirdData;
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var datebegin = '';
+    var dateend = '';
+    var ClassNo = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 初始化左侧树形数据 
+            $('#dataTree').lrtree({
+                url: top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/GetClassTree',
+                nodeClick: function (item) {
+                    ClassNo = item.id;
+                    page.search({ ClassNo: item.id });
+                }
+            });
+            $('.datetime').each(function () {
+                $(this).lrdate({
+                    dfdata: [
+                        { name: '清空', begin: function () { return '' }, end: function () { return '' } },
+                        { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    ],
+                    // 月
+                    mShow: false,
+                    premShow: false,
+                    // 季度
+                    jShow: false,
+                    prejShow: false,
+                    // 年
+                    ysShow: false,
+                    yxShow: false,
+                    preyShow: false,
+                    yShow: false,
+                    // 默认
+                    dfvalue: '0',
+                    selectfn: function (begin, end) {
+                        datebegin = begin;
+                        dateend = end;
+                    }
+                });
+            });
+            // 查询
+            $('#btn_Search').on('click', function () {
+                page.search({ ClassNo: ClassNo, AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet(), ClassRoomNo: $('#ClassRoomNo').lrselectGet(), EmpNo: $('#EmpNo').lrselectGet() });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
+            //课程
+            //$('#LessonNo').lrselect({
+            //    placeholder: "请选择课程",
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataOfAllWithNo',
+            //    value: 'value',
+            //    text: 'text'
+            //});
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname', placeholder: '请选择课程' });
+            $('#ClassRoomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname', placeholder: '请选择教室' });
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname', placeholder: '请选择教师' });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/GetItemPageList',
+                headData: [
+                    { label: '学年', name: 'AcademicYearNo', width: 70, align: "left" },
+                    { label: '学期', name: 'Semester', width: 60, align: "left" },
+                    { label: '考试日期', name: 'ExamDate', width: 120, align: "left" },
+                    { label: '考试时间', name: 'ExamTime', width: 120, align: "left" },
+                    { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
+                    { label: '课程名称', name: 'LessonName', width: 200, align: "left" },
+                    { label: '监考教师编号', name: 'EmpNo', width: 150, align: "left" },
+                    { label: '监考教师姓名', name: 'EmpName', width: 150, align: "left" },
+                    { label: '教室编号', name: 'ClassRoomNo', width: 100, align: "left" },
+                    { label: '教室名称', name: 'ClassRoomName', width: 100, align: "left" },
+                    { label: '班级名称', name: 'ClassName', width: 100, align: "left" },
+                    { label: '学生编号', name: 'StuNo', width: 100, align: "left" },
+                    { label: '学生姓名', name: 'StuName', width: 200, align: "left" },
+                    { label: '座位编号', name: 'SitNumber', width: 100, aligndd: "left" }
+                ],
+                mainId: 'AETId',
+                sidx: 'ExamTime asc, LessonNo asc,ClassRoomNo asc,ClassNo asc,SitNumber asc',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = datebegin;
+            param.EndTime = dateend;
+            console.log(param);
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/SyncByConditionForm.cshtml

@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "按条件同步排考数据";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">校区<font face="宋体">*</font></div>
+        <div id="F_SchoolId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <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">
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeExamTermNew/SyncByConditionForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/SyncByConditionForm.js

@@ -0,0 +1,55 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-02-27 11:05
+ * 描  述：按条件同步排考数据
+ */
+var acceptClick;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.bind();
+            //page.initData();
+        },
+        bind: function () {
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        initData: function () {
+            //if (!!selectedRow) {
+            //    $('#form').lrSetFormData(selectedRow);
+            //}
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/AsyncArrangeExamDataNew', postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+
+    };
+    page.init();
+}

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

@@ -15,15 +15,15 @@
         <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="ClassPlan">
+    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
         <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ClassPlan">
+    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ClassPlan">
+    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
         <div id="Grade" isvalid="yes" checkexpession="NotNull"></div>
     </div>
@@ -32,15 +32,15 @@
         <div id="LessonNo" isvalid="yes" checkexpession="NotNull"></div>
         <input id="LessonName" type="hidden" />
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="ClassPlan" style="display: none; ">
+    @*<div class="col-xs-4 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">课程类别码</div>
-        <input id="LessonSortNo" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="ClassPlan" style="display: none; ">
+        <div id="LessonSortNo"></div>
+    </div>*@
+    <div class="col-xs-6 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">课程细类码</div>
-        <input id="LessonSortDetailNo" type="text" class="form-control" />
+        <div id="LessonSortDetailNo"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="ClassPlan" style="display: none; ">
+    <div class="col-xs-6 lr-form-item" data-table="ClassPlan" style="display: none; ">
         <div class="lr-form-item-title">开合课</div>
         <input id="StuSortNo" type="text" class="form-control" />
     </div>
@@ -77,7 +77,7 @@
         <div id="TeachDeptNo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ClassPlan">
-        <div class="lr-form-item-title">学分<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">学分</div>
         <input id="StudyScore" type="text" class="form-control" checkexpession="NumOrNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ClassPlan">

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

@@ -23,6 +23,7 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            $('#LessonSortDetailNo').lrDataSourceSelect({ code: 'CdLessonSortDetail', value: 'lessonsortdetailno', text: 'lessonsortdetailname' });
             //年级
             $('#Grade').lrselect({
                 placeholder: "请选择年级",
@@ -82,7 +83,7 @@ var bootstrap = function ($, learun) {
                 });
             }
             $('#StuSortNo').val('02');
-            //$('#StudyScore').val('2.0');
+            $('#LessonSortNo').val('2');           
             $('#CheckStyleNo').val('1');
             $('#ScoreRecordStyleNo').val('1');
             $('#CheckMark').val('1');

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

@@ -36,9 +36,9 @@
                                     <div id="Semester"></div>
                                 </div>
                                 @*<div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">系部</div>
-            <div id="DeptNo"></div>
-        </div>*@
+                                <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="Grade"></div>
@@ -59,6 +59,7 @@
                         <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_courses" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;排课</a>
                     </div>
                 </div>
             </div>

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

@@ -18,7 +18,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 400);
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_shortname' });
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#AcademicYearNo').lrselect({
                 placeholder: "请选择学年",
                 allowSearch: true,
@@ -35,32 +35,6 @@ var bootstrap = function ($, learun) {
                 text: 'text'
             });
             $('#Semester').lrDataItemSelect({ code: 'Semester' });
-            //$('#DeptNo').lrselect({
-            //    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-            //    value: 'deptno',
-            //    text: 'deptname',
-            //    maxHeight: 200,
-            //    select: function(item) {
-            //        var NDeptNo = $("#DeptNo").lrselectGet();
-            //        if (NDeptNo != null && NDeptNo != "" && NDeptNo != undefined) {
-            //            $('#MajorNo').lrselectRefresh({
-            //                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-            //                param: { strWhere: " 1=1 and CheckMark=1 and deptno in (" + NDeptNo + ")" },
-            //                value: "majorno",
-            //                text: "majorname",
-            //                maxHeight: 200
-            //            });
-            //        } else {
-            //            $('#MajorNo').lrselectRefresh({
-            //                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
-            //                param: { strWhere: " 1=1 and CheckMark=1 and deptno ='' " },
-            //                value: "majorno",
-            //                text: "majorname",
-            //                maxHeight: 200
-            //            });
-            //        }
-            //    }
-            //});
             $("#MajorNo").lrselect();
             $('#LessonNo').lrselect({
                 placeholder: "请选择课程",
@@ -81,7 +55,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/ClassPlan/Form',
                     width: 800,
-                    height: 400,
+                    height: 450,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -91,29 +65,100 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'form',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/EducationalAdministration/ClassPlan/Form?keyValue=' + keyValue,
-                        width: 800,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行编辑！");
+                        return;
+                    }
+                    var state = $('#gridtable').jfGridValue('State');
+                    if (state == 0) {
+                        learun.layerForm({
+                            id: 'form',
+                            title: '编辑',
+                            url: top.$.rootUrl + '/EducationalAdministration/ClassPlan/Form?keyValue=' + keyValue,
+                            width: 800,
+                            height: 450,
+                            callBack: function (id) {
+                                return top[id].acceptClick(refreshGirdData);
+                            }
+                        });
+                    } else {
+                        learun.layerConfirm('是否确认修改,修改后可能会造成不可弥补的错误!!！', function (res) {
+                            if (res) {
+                                learun.layerForm({
+                                    id: 'form',
+                                    title: '编辑',
+                                    url: top.$.rootUrl + '/EducationalAdministration/ClassPlan/Form?keyValue=' + keyValue,
+                                    width: 800,
+                                    height: 450,
+                                    callBack: function (id) {
+                                        return top[id].acceptClick(refreshGirdData);
+                                    }
+                                });
+                            }
+                        });
+                    }
                 }
             });
             // 删除
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/ClassPlan/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
+                    var state = $('#gridtable').jfGridValue('State').split(',');
+                    var allEmpty = true;
+                    for (var i = 0; i < state.length; i++) {
+                        if (state[i] != 0) {
+                            allEmpty = false;
+                        }
+                    }
+                    if (allEmpty) {
+                        learun.layerConfirm('是否确认删除该项！',
+                            function (res) {
+                                if (res) {
+                                    learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/ClassPlan/DeleteForm',
+                                        { keyValue: keyValue },
+                                        function () {
+                                            refreshGirdData();
+                                        });
+                                }
+
                             });
+                    } else {
+                        learun.layerConfirm('是否确认删除该项,删除数据后不可恢复！！！', function (item) {
+                            if (item) {
+                                learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/ClassPlan/DeleteForm', { keyValue: keyValue }, function () {
+                                    refreshGirdData();
+                                });
+                            }
+                        });
+                    }
+                }
+            });
+            //排课
+            $('#lr_courses').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var state = $('#gridtable').jfGridValue('State').split(',');
+                    var allEmpty = true;
+                    for (var i = 0; i < state.length; i++) {
+                        if (state[i] != 0) {
+                            allEmpty = false;
                         }
-                    });
+                    }
+                    if (allEmpty) {
+                        learun.layerConfirm('确定要进行排课么！',
+                            function (res) {
+                                if (res) {
+                                    learun.postForm(
+                                        top.$.rootUrl + '/EducationalAdministration/ClassPlan/CourseArranging',
+                                        { keyValue: keyValue },
+                                        function () {
+                                            refreshGirdData();
+                                        });
+                                }
+                            });
+                    } else {
+                        learun.alert.warning("不嫩选择已排课的课程计划");
+                    }
                 }
             });
         },
@@ -206,7 +251,18 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "年级", name: "Grade", width: 50, align: "left" },
+                    { label: "课程编码", name: "LessonNo", width: 200, align: "left" },
                     { label: "课程名称", name: "LessonName", width: 200, align: "left" },
+                    {
+                        label: "状态", name: "State", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-warning\">未排课</span>';
+                            } if (cellvalue == 1) {
+                                return '<span class=\"label label-success\">已排课</span>';
+                            }
+                        }
+                    },
                     { label: "拟开教学班数", name: "TeachClassNum", width: 100, align: "left" },
                     { label: "人数", name: "StuNum", width: 80, align: "left" },
                     { label: "周课时", name: "WeekLessonHour", width: 80, align: "left" },
@@ -231,7 +287,8 @@ var bootstrap = function ($, learun) {
                     { label: "备注", name: "Remark", width: 100, align: "left" },
                 ],
                 mainId: 'ID',
-                sidx: 'ID desc',
+                sidx: 'MakeDate desc',
+                isMultiselect: true,
                 isPage: true
             });
             page.search();

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

@@ -0,0 +1,68 @@
+@{
+    ViewBag.Title = "开课计划";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title lrlt ">学校信息</div>
+            <div id="cddeptTree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">
+                <span id="titleinfo" class="lrlt">未选择学校</span> - <span class="lrlt">专业信息</span>
+            </div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学校</div>
+                                    <div id="F_SchoolId"></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-6 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                @*<div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                    </div>*@
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">年级</div>
+                                    <div id="Grade"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">课程</div>
+                                    <div id="LessonNo"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_teach" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;设置教师</a>
+                        <a id="lr_qzteach" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;强制设置教师</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js")

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

@@ -0,0 +1,250 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-11-29 11:43
+ * 描  述：开课计划
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var cddeptname = '';
+    var page = {
+        init: function () {
+            page.inittree();
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 250, 400);
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //年级
+            $('#Grade').lrselect({
+                placeholder: "请选择年级",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetGradeData',
+                value: 'value',
+                text: 'text'
+            });
+            $('#Semester').lrDataItemSelect({ code: 'Semester' });
+            $("#MajorNo").lrselect();
+            $('#LessonNo').lrselect({
+                placeholder: "请选择课程",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataOfAllWithNo',
+                value: 'value',
+                text: 'text',
+                maxHeight: 200
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/ClassPlanTeach/TeachForm',
+                    width: 800,
+                    height: 450,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 设置教师
+            $('#lr_teach').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var empno = $('#gridtable').jfGridValue('EmpNo').split(',');
+                    var allEmpty = true;
+                    for (var i = 0; i < empno.length; i++) {
+                        if (empno[i] != '') {
+                            allEmpty = false;
+                        }
+                    }
+                    if (allEmpty) {
+                        learun.layerForm({
+                            id: 'form',
+                            title: '设置教师',
+                            url: top.$.rootUrl + '/EducationalAdministration/ClassPlanTeach/TeachForm?keyValue=' + keyValue,
+                            width: 400,
+                            height: 300,
+                            callBack: function (id) {
+                                return top[id].acceptClick();
+                            }
+                        });
+                    } else {
+                        learun.alert.warning("所选班级已设置教师,不可重复设置!!!");
+                    }
+                }
+            });
+            // 强制设置教师
+            $('#lr_qzteach').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '强制设置教师',
+                        url: top.$.rootUrl +
+                            '/EducationalAdministration/ClassPlanTeach/TeachFormQZ?keyValue=' +
+                            keyValue,
+                        width: 400,
+                        height: 300,
+                        callBack: function (id) {
+                            return top[id].acceptClick();
+                        }
+                    });
+                }
+            });
+        },
+        inittree: function () {
+            $('#cddeptTree').lrtree({
+                url: top.$.rootUrl + '/EducationalAdministration/CdDept/GetTree',
+                param: { parentId: '0' },
+                nodeClick: page.treeNodeClick
+            });
+            //$('#cddeptTree').lrtreeSet('setValue', '53298b7a-404c-4337-aa7f-80b2a4ca6681');
+        },
+        treeNodeClick: function (item) {
+            cddeptname = item.id;
+            $('#titleinfo').text(item.text);
+            page.search();
+            var NDeptNo = item.id;
+            if (NDeptNo != null && NDeptNo != "" && NDeptNo != undefined) {
+                $('#MajorNo').lrselectRefresh({
+                    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                    param: { strWhere: " 1=1 and CheckMark=1 and deptno in (" + NDeptNo + ")" },
+                    value: "majorno",
+                    text: "majorname",
+                    maxHeight: 200
+                });
+            } else {
+                $('#MajorNo').lrselectRefresh({
+                    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                    param: { strWhere: " 1=1 and CheckMark=1 and deptno ='' " },
+                    value: "majorno",
+                    text: "majorname",
+                    maxHeight: 200
+                });
+            }
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassPlanTeach/GetPageList',
+                headData: [
+                    {
+                        label: "校区", name: "F_SchoolId", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "学年", name: "AcademicYearNo", width: 80, align: "left" },
+                    {
+                        label: "学期", name: "Semester", width: 50, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'Semester',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        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: 'id',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "年级", name: "Grade", width: 50, align: "left" },
+                    {
+                        label: "课程", name: "LessonNo", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                                key: value,
+                                keyId: 'lessonno',
+                                callback: function (_data) {
+                                    callback(_data['lessonname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "人数", name: "StuNum", width: 80, align: "left" },
+                    { label: "上机课时", name: "PracticeHour", width: 80, align: "left" },
+                    { label: "课程区别码", name: "PartCode", width: 80, align: "left" },
+                    { label: "班级", name: "TeachClassNo", width: 80, align: "left" },
+                    {
+                        label: "教师", name: "EmpNo", width: 80, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_encode',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "合上班", name: "RelatedClassNo", width: 80, align: "left" },
+                    { label: "拟开教学班数", name: "LessonSortNo", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                sidx: 'ID desc',
+                isMultiselect: true,
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.DeptNo = cddeptname;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachForm.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="EmpNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachForm.js

@@ -0,0 +1,32 @@
+/* * 版 本 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 () {
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        var EmpNo = postData.EmpNo;
+        console.log(EmpNo);
+        learun.postForm(top.$.rootUrl + '/EducationalAdministration/ClassPlanTeach/SetTeach', { keyValue: keyValue, EmpNo: EmpNo}, function () {
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachFormQZ.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="EmpNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachFormQZ.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachFormQZ.js

@@ -0,0 +1,32 @@
+/* * 版 本 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 () {
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        var EmpNo = postData.EmpNo;
+        console.log(EmpNo);
+        learun.postForm(top.$.rootUrl + '/EducationalAdministration/ClassPlanTeach/QZSetTeach', { keyValue: keyValue, EmpNo: EmpNo}, function () {
+        });
+    };
+    page.init();
+}

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

@@ -58,15 +58,19 @@
             <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
             <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="IDCard" />
         </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        <div class="col-xs-3 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">出生日期</div>
             <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Birthday').trigger('change'); } })" />
         </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        <div class="col-xs-3 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">民族</div>
             <div id="NationalityNo"></div>
         </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        <div class="col-xs-3 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
+            <input id="F_Order" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        </div>
+        <div class="col-xs-3 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">政治面貌</div>
             <div id="PartyFaceNo"></div>
         </div>

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

@@ -172,6 +172,7 @@ var bootstrap = function ($, learun) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
                             $('#' + id).jfGridSet('refreshdata', data[id]);
+                            console.log(2);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);

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

@@ -380,9 +380,9 @@ var bootstrap = function ($, learun) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
                                 key: value,
-                                keyId: 'f_departmentid',
+                                keyId: 'id',
                                 callback: function (_data) {
-                                    callback(_data['f_fullname']);
+                                    callback(_data['name']);
                                 }
                             });
                         }
@@ -460,7 +460,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
-
+                    { label: "排序", name: "F_Order", width: 100, align: "left" },
                     {
                         label: "最高学历", name: "HighestRecord", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -615,6 +615,7 @@ var bootstrap = function ($, learun) {
 
                 ],
                 mainId: 'EmpId',
+                sidx: 'F_Order asc',
                 isPage: true,
                 isMultiselect: true
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.cshtml

@@ -199,6 +199,7 @@
                         <a id="lr_node_auditor" class="btn btn-warning"><i class="fa fa-user"></i>&nbsp;添加节点执行人</a>
                         <a id="lr_form_auditor" class="btn btn-success"><i class="fa fa-user"></i>&nbsp;添加表字段</a>
                         <a id="lr_form_schoolmaster" class="btn btn-success"><i class="fa fa-user"></i>&nbsp;添加分管校长</a>
+                        <a id="lr_form_deptmaster" class="btn btn-warning"><i class="fa fa-user"></i>&nbsp;添加部门负责人</a>
                         <a id="lr_delete_auditor" class="btn btn-danger"><i class="fa fa-trash-o"></i>&nbsp;移除</a>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/NodeForm.js

@@ -185,6 +185,9 @@ var bootstrap = function ($, learun) {
                                 case '7':
                                     return '分管校长';
                                     break;
+                                case '8':
+                                    return '部门负责人';
+                                    break;
                             }
                         }
                     },
@@ -350,7 +353,19 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
-
+            //添加部门负责人
+            $('#lr_form_deptmaster').on('click', function () {
+                learun.layerConfirm('是否确认增加部门负责人？', function (res) {
+                    if (res) {
+                        var data = { auditorId: 'bmfzrid', type: '8', auditorName: '部门负责人' };
+                        if (!isRepeat(data.auditorId)) {
+                            data.id = learun.newGuid();
+                            auditors.push(data);
+                            $('#auditor_girdtable').jfGridSet('refreshdata', auditors);
+                        }
+                    }
+                });
+            });
             /*表单添加*/
             $('#workform_girdtable').jfGrid({
                 headData: [

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NewsController.cs

@@ -113,7 +113,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
             {
                 { "X-SS-API-KEY", ApiKey }
             };
-                string responses = Util.HttpMethods.HttpPosts("http://localhost:8005/api/v1/contents/" + siteId + "/" + channelId, SendNew.ToJson(), ApiId);
+                string responses = Util.HttpMethods.HttpPosts("http://localhost:8007/api/v1/contents/" + siteId + "/" + channelId, SendNew.ToJson(), ApiId);
 
                 #endregion
                 #region 修改审核状态
@@ -132,7 +132,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
                     listCon.Add(con);
                     AList.contents = listCon;
                     AList.reasons = "终审通过";
-                    Util.HttpMethods.HttpPosts("http://localhost:8005/api/v1/contents/actions/check", AList.ToJson(), ApiId);
+                    Util.HttpMethods.HttpPosts("http://localhost:8007/api/v1/contents/actions/check", AList.ToJson(), ApiId);
                 }
                 #endregion
                 return Success("发布成功！");

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml

@@ -29,8 +29,8 @@
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">负责人</div>
-        <input id="F_Manager" type="text" class="form-control" />
-    </div>       
+        <div id="F_Manager"></div>
+        </div>       
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">分管校长</div>
         <div id="F_SchoolMasterId" ></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js

@@ -37,6 +37,13 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
+            //部门负责人
+            $("#F_Manager").lrformselect({
+                layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
+                layerUrlW: 400,
+                layerUrlH: 300,
+                dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
+            });
 
             $('#NoticeCategory').lrDataItemSelect({ code: 'NoticeCategory', type: 'multiple', allowSearch:true }); 
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js

@@ -112,10 +112,22 @@ var bootstrap = function ($, learun) {
                     { label: "部门编号", name: "F_EnCode", width: 100, align: "left" },
                     { label: "部门简称", name: "F_ShortName", width: 100, align: "left" },
                     { label: "部门性质", name: "F_Nature", width: 100, align: "left" },
-                    { label: "负责人", name: "F_Manager", width: 100, align: "left" },
+                    {
+                        label: "负责人", name: "F_Manager", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: "分管校长", name: "F_SchoolMaster", width: 100, align: "left" },
                     {
-                        label: "公告类别", name: "NoticeCategory", width: 200, align: "left" ,
+                        label: "公告类别", name: "NoticeCategory", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getsAsync('dataItem', {
                                 key: value,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/User/Index.js

@@ -357,6 +357,7 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    { label: "排序", name: "F_Order", index: "F_Order", width: 50, align: "center"},
                     {
                         label: "最后登录时间", name: "F_UserId_Log", width: 200, align: "left", formatterAsync: function (callback, value, row) {
                             learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetLastLoginTime?userId=' + value, function (res) {
@@ -372,6 +373,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 reloadSelected: true,
                 mainId: 'F_UserId',
+                sidx: 'F_Order asc',
                 isMultiselect: true
             });
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js

@@ -160,7 +160,7 @@
         }
         d.write("<title></title><style>@page{size: auto;margin: 0mm;}html{background-color: #FFFFFF;margin: 0px;}body{border: solid 1px blue;margin: 100mm;}</style >");
         d.write("<link type='text/css' rel='stylesheet' href='" + top.$.rootUrl + "/Content/jquery/plugin/jqprint/jqprint.css' />");
-        d.write("<h2 style='margin-bottom:5mm;text-align:center;'>西昌民族幼儿师范高等专科学校 收文 （办件）处理笺</h2>");
+        //d.write("<h2 style='margin-bottom:5mm;text-align:center;'>西昌民族幼儿师范高等专科学校 收文 （办件）处理笺</h2>");
         var $table = a('<table></table>');
         var num = 24;
         var $tr = a('<tr></tr>');

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -319,6 +319,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeLessonTermAttemperController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\CertificateManageController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\CertificateResultController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\ClassPlanTeachController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ClassPlanController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\DispatchController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\EvaCodeOfContuctController.cs" />
@@ -819,6 +820,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuCancelLeaveManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuDisciplineManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuCancelDisciplineManagementController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeExamTermNewController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -928,6 +930,8 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_UserChangeInfo\Index.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexItem.js" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\SyncByConditionForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeLessonSync\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeLessonSync\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeLessonTermAttemper\Form.js" />
@@ -943,6 +947,8 @@
     <Content Include="Areas\EducationalAdministration\Views\CertificateResult\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\CertificateResult\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\ClassInfo\FormType.js" />
+    <Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\TeachFormQZ.js" />
+    <Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\TeachForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\ClassPlan\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\ClassPlan\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\Dispatch\Form.js" />
@@ -1076,6 +1082,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\PrintView.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListParty.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListDocument.js" />
+    <Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\IndexResult.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\StatisticIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\SubmitIndex.js" />
@@ -6263,6 +6270,10 @@
     <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuCancelDisciplineManagement\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\HomeStatistics\" />
@@ -7461,6 +7472,11 @@
     <Content Include="Areas\LR_Desktop\Views\QualityReport\FormView.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\QualityReport\Index.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\QualityReport\IndexReport.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\TeachForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\SyncByConditionForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexItem.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\TeachFormQZ.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
@@ -7585,10 +7601,10 @@
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>20472</DevelopmentServerPort>
+		  <AutoAssignPort>True</AutoAssignPort>
+		  <DevelopmentServerPort>20472</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:20873/</IISUrl>
+		  <IISUrl>http://localhost:20873/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

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

@@ -1,37 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
-  <!--本机-->
-  <!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
+	<!--本机-->
+	<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-  <!--126-->
-  <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
+	<!--126-->
+	<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-  <!--西昌-->
-  <!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
+	<!--西昌-->
+	<!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />-->
-  <!--demo.quanjiang.com-->
-  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+	<!--demo.quanjiang.com-->
+	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <!--获取网上缴费数据-->
-  <add name="IsPay" connectionString="Server=192.168.53.19;Initial Catalog=u8gx;User ID=jfcx;Password=xcyz1234567." providerName="System.Data.SqlClient" />
+	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+	<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+	<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+	--><!--获取网上缴费数据--><!--
+	<add name="IsPay" connectionString="Server=192.168.53.19;Initial Catalog=u8gx;User ID=jfcx;Password=xcyz1234567." providerName="System.Data.SqlClient" />-->
 
-  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-  <!--金隅-->
-  <!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+	<!--金隅-->
+	<!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
-  <!--126西昌测试-->
-  <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
+	<!--126西昌测试-->
+	<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-  <!--测试公共提交-->
+	<!--测试公共提交-->
+	<!--塔里木测试-->
+	<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
 </connectionStrings>

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

@@ -1,175 +1,178 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appSettings>
-  <!-- ================== 1：开发系统相关配置 ================== -->
-  <!-- 启用系统日志-->
-  <add key="IsLog" value="true" />
-  <!-- 是否启用js、css压缩-->
-  <add key="JsCompressor" value="false" />
-  <!-- 是否启用js、css缓存-->
-  <add key="JsCompressorCache" value="false" />
-  <!-- 代码生成器路径-->
-  <add key="BackProject" value="Learun.Application.TwoDevelopment" />
-  <add key="MappingDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping" />
-  <add key="ServiceDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment" />
-  <add key="WebDirectory" value="\Learun.Application.Web" />
-  <add key="ApiDirectory" value="\Learun.Application.WebApi" />
-  <add key="AppDirectory" value="\Learun.Application.Mobile" />
-  <add key="WxDirectory" value="\LearunApp-2.2.0" />
+	<!-- ================== 1：开发系统相关配置 ================== -->
+	<!-- 启用系统日志-->
+	<add key="IsLog" value="true" />
+	<!-- 是否启用js、css压缩-->
+	<add key="JsCompressor" value="false" />
+	<!-- 是否启用js、css缓存-->
+	<add key="JsCompressorCache" value="false" />
+	<!-- 代码生成器路径-->
+	<add key="BackProject" value="Learun.Application.TwoDevelopment" />
+	<add key="MappingDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.Mapping" />
+	<add key="ServiceDirectory" value="\Learun.Framework.Module\Learun.Application.Module\Learun.Application.TwoDevelopment" />
+	<add key="WebDirectory" value="\Learun.Application.Web" />
+	<add key="ApiDirectory" value="\Learun.Application.WebApi" />
+	<add key="AppDirectory" value="\Learun.Application.Mobile" />
+	<add key="WxDirectory" value="\LearunApp-2.2.0" />
 
-  <!-- ================== 2：这里主要是微信配置项内容部分 ================== -->
-  <!--企业号CorpId -->
-  <add key="CorpId" value="" />
-  <!--企业号凭证密钥 -->
-  <add key="CorpSecret" value="" />
-  <!--开放平台AppId -->
-  <add key="AppId" value="" />
-  <!--开放平台凭证密钥 -->
-  <add key="AppSecret" value="" />
-  <!-- ================== 3：访问过滤配置 ================== -->
-  <!--设置IP过滤 -->
-  <add key="FilterIP" value="false" />
-  <!--设置时段过滤 -->
-  <add key="FilterTime" value="false" />
-  <!-- ================== 4：系统软件参数配置 ================== -->
-  <!-- 联系我们 -->
-  <add key="Contact" value="www.xx.cn" />
-  <!-- 公司名称 -->
-  <add key="CustomerCompanyName" value="数字化智慧校园" />
-  <!-- 系统名称 -->
-  <add key="SystemName" value="数字化智慧校园" />
-  <!-- 软件名称 -->
-  <add key="SoftName" value="数字化智慧校园" />
-  <!-- 软件版本 -->
-  <add key="Version" value="3.0.1" />
-  <!-- 软件注册码，备用 -->
-  <add key="RegisterKey" value="NO:LR20180307002" />
-  <!-- ================== 5：外部邮件参数 ================== -->
-  <!-- 系统错误自动发送邮件 -->
-  <add key="ErrorToMail" value="false" />
-  <!-- 接收错误信息的邮箱 -->
-  <add key="RereceiveErrorMail" value="" />
-  <!-- 发出邮箱的名称 -->
-  <add key="MailName" value="" />
-  <!-- 发出邮箱的地址 -->
-  <add key="MailUserName" value="" />
-  <!-- 发出邮箱的密码 -->
-  <add key="MailPassword" value="" />
-  <!-- 发出邮箱设置邮箱主机 -->
-  <add key="MailHost" value="" />
-  <!--内控材料上传角色名-->
-  <add key="MPRoleName" value="内控材料上传员" />
-  <!-- ================== 6：即时通信参数 ================== -->
-  <!-- SignalR服务接口-->
-  <add key="IMUrl" value="http://localhost:8012/signalr" />
-  <add key="IMOpen" value="false" />
+	<!-- ================== 2：这里主要是微信配置项内容部分 ================== -->
+	<!--企业号CorpId -->
+	<add key="CorpId" value="" />
+	<!--企业号凭证密钥 -->
+	<add key="CorpSecret" value="" />
+	<!--开放平台AppId -->
+	<add key="AppId" value="" />
+	<!--开放平台凭证密钥 -->
+	<add key="AppSecret" value="" />
+	<!-- ================== 3：访问过滤配置 ================== -->
+	<!--设置IP过滤 -->
+	<add key="FilterIP" value="false" />
+	<!--设置时段过滤 -->
+	<add key="FilterTime" value="false" />
+	<!-- ================== 4：系统软件参数配置 ================== -->
+	<!-- 联系我们 -->
+	<add key="Contact" value="www.xx.cn" />
+	<!-- 公司名称 -->
+	<add key="CustomerCompanyName" value="数字化智慧校园" />
+	<!-- 系统名称 -->
+	<add key="SystemName" value="数字化智慧校园" />
+	<!-- 软件名称 -->
+	<add key="SoftName" value="数字化智慧校园" />
+	<!-- 软件版本 -->
+	<add key="Version" value="3.0.1" />
+	<!-- 软件注册码，备用 -->
+	<add key="RegisterKey" value="NO:LR20180307002" />
+	<!-- ================== 5：外部邮件参数 ================== -->
+	<!-- 系统错误自动发送邮件 -->
+	<add key="ErrorToMail" value="false" />
+	<!-- 接收错误信息的邮箱 -->
+	<add key="RereceiveErrorMail" value="" />
+	<!-- 发出邮箱的名称 -->
+	<add key="MailName" value="" />
+	<!-- 发出邮箱的地址 -->
+	<add key="MailUserName" value="" />
+	<!-- 发出邮箱的密码 -->
+	<add key="MailPassword" value="" />
+	<!-- 发出邮箱设置邮箱主机 -->
+	<add key="MailHost" value="" />
+	<!--内控材料上传角色名-->
+	<add key="MPRoleName" value="内控材料上传员" />
+	<!-- ================== 6：即时通信参数 ================== -->
+	<!-- SignalR服务接口-->
+	<add key="IMUrl" value="http://localhost:8012/signalr" />
+	<add key="IMOpen" value="false" />
 
-  <add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
-  <!-- ==================注意附件上传地址  修改到部署目录下的Resource要不然飞星会报错================== -->
-  <add key="AnnexesFile" value="D:\gitLocalRepositories\DigitalScholl\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
-  <!-- ================== 8：流程服务地址 ================== -->
-  <add key="workflowapi" value="http://localhost:8013" />
-  <!--Redis 缓存前缀 -->
+	<add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
+	<!-- ==================注意附件上传地址  修改到部署目录下的Resource要不然飞星会报错================== -->
+	<add key="AnnexesFile" value="D:\gitLocalRepositories\DigitalScholl\Learun.Framework.Ultimate V7\Learun.Application.Web\Resource" />
+	<!-- ================== 8：流程服务地址 ================== -->
+	<add key="workflowapi" value="http://localhost:8013" />
+	<!--Redis 缓存前缀 -->
 
-  <add key="RedisPrev" value="LRADMS" />
-  <!--Redis 缓存前缀 -->
-  <!--<add key="RedisPrev" value="adms706" />-->
-  <!--缓存链接配置-->
-  <add key="RedisExchangeHosts" value="127.0.0.1:6379,allowadmin=true"/>
+	<add key="RedisPrev" value="LRADMS" />
+	<!--Redis 缓存前缀 -->
+	<!--<add key="RedisPrev" value="adms706" />-->
+	<!--缓存链接配置-->
+	<add key="RedisExchangeHosts" value="127.0.0.1:6379,allowadmin=true"/>
 
-  <!--head 头像存储地址 -->
-  <add key="fileHeadImg" value="E:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\bin\Release\Publish\Content\images\head" />
-  <add key="fileAppDTImg" value="C:/fileAppDTImg" />
-  <add key="fileLogoImg" value="C:/fileLogoImg" />
-  <!--印章管理存储图片路径 -->
-  <add key="Stamp" value="E:\授权版706\Learun.Application.Web\Resource/StampImg" />
-  <add key="Intervals" value="1"/>
+	<!--head 头像存储地址 -->
+	<add key="fileHeadImg" value="E:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\bin\Release\Publish\Content\images\head" />
+	<add key="fileAppDTImg" value="C:/fileAppDTImg" />
+	<add key="fileLogoImg" value="C:/fileLogoImg" />
+	<!--印章管理存储图片路径 -->
+	<add key="Stamp" value="E:\授权版706\Learun.Application.Web\Resource/StampImg" />
+	<add key="Intervals" value="1"/>
 
 
-  <add key="webpages:Version" value="3.0.0.0"/>
-  <add key="webpages:Enabled" value="false"/>
-  <add key="ClientValidationEnabled" value="true"/>
-  <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
-  <add key="owin:AutomaticAppStartup" value="false"/>
-  <!-- ================== 9：禁用BrowserLink，解决进度条卡在99%问题 ================== -->
-  <add key="vs:EnableBrowserLink" value="false"/>
-  <!--获取高职版跳转地址url -->
-  <!--<add key="DigitalschoolMisLoginurl" value="http://192.168.2.126:9000/LoginHandler.ashx"/>-->
-  <!--<add key="DigitalschoolMisLoginurl" value="http://192.168.100.225:9000/LoginHandler.ashx"/>-->
-  <add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>
-  <!--<add key="DigitalschoolMisLoginurl" value="http://112.45.152.8:8082/LoginHandler.ashx"/>-->
-  <!-- ================== 默认密码 ================== -->
-  <add key="defaultpwd" value="123456" />
-  <add key="defaultpwdeight" value="abc123**" />
-  <!-- ================== 统一身份认证公钥密钥 ================== -->
-  <add key="SSOPublicSecret" value="bjquanjiang" />
-  <add key="SSOUserSecret" value="123456789" />
-  <!-- ================== 飞星通讯地址 下发新闻用 ================== -->
-  <!--<add key="CommunicationServeraddress" value="http://127.0.0.1:8866/ChatConnection" />-->
-  <add key="CommunicationServeraddress" value="http://123.57.209.16:8866/ChatConnection" />
-  <!-- ================== 默认头像 ================== -->
-  <add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
-  <!--排课接口-->
-  <add key="ArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/paike" />
-  <!--初始化排课接口-->
-  <add key="ModifyArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/updatePaike" />
-  <!--开课计划接口-->
-  <add key="OpenLessonPlanAPI" value="http://112.45.152.8:9002/interface/paike/majorInterface" />
+	<add key="webpages:Version" value="3.0.0.0"/>
+	<add key="webpages:Enabled" value="false"/>
+	<add key="ClientValidationEnabled" value="true"/>
+	<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
+	<add key="owin:AutomaticAppStartup" value="false"/>
+	<!-- ================== 9：禁用BrowserLink，解决进度条卡在99%问题 ================== -->
+	<add key="vs:EnableBrowserLink" value="false"/>
+	<!--获取高职版跳转地址url -->
+	<!--<add key="DigitalschoolMisLoginurl" value="http://192.168.2.126:9000/LoginHandler.ashx"/>-->
+	<!--<add key="DigitalschoolMisLoginurl" value="http://192.168.100.225:9000/LoginHandler.ashx"/>-->
+	<add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>
+	<!--<add key="DigitalschoolMisLoginurl" value="http://112.45.152.8:8082/LoginHandler.ashx"/>-->
+	<!-- ================== 默认密码 ================== -->
+	<add key="defaultpwd" value="123456" />
+	<add key="defaultpwdeight" value="abc123**" />
+	<!-- ================== 统一身份认证公钥密钥 ================== -->
+	<add key="SSOPublicSecret" value="bjquanjiang" />
+	<add key="SSOUserSecret" value="123456789" />
+	<!-- ================== 飞星通讯地址 下发新闻用 ================== -->
+	<!--<add key="CommunicationServeraddress" value="http://127.0.0.1:8866/ChatConnection" />-->
+	<add key="CommunicationServeraddress" value="http://123.57.209.16:8866/ChatConnection" />
+	<!-- ================== 默认头像 ================== -->
+	<add key="defaultheadimg" value="/Content/images/head/on-boy.jpg" />
+	<!--排课接口-->
+	<add key="ArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/paike" />
+	<!--初始化排课接口-->
+	<add key="ModifyArrangeLessonAPI" value="http://112.45.152.8:9002/interface/paike/updatePaike" />
+	<!--开课计划接口-->
+	<add key="OpenLessonPlanAPI" value="http://112.45.152.8:9002/interface/paike/majorInterface" />
 
-  <!--选修排课接口-->
-  <add key="ArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/xuanxiupaike" />
-  <!--初始化选修排课接口-->
-  <add key="ModifyArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/updateXuanXiuPaike" />
+	<!--选修排课接口-->
+	<add key="ArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/xuanxiupaike" />
+	<!--初始化选修排课接口-->
+	<add key="ModifyArrangeLessonOfElectiveAPI" value="http://112.45.152.8:9002/interface/paike/updateXuanXiuPaike" />
 
-  <!--排考接口-->
-  <add key="ArrangeExamAPI" value="http://112.45.152.8:9002/interface/paikao/paikao" />
-  <!--选修排考接口-->
-  <add key="ArrangeExamOfElectiveAPI" value="http://112.45.152.8:9002/interface/paikao/xuanxiupaikao" />
-  <!--排考结构接口-->
-  <add key="ArrangeExamStructureAPI" value="http://112.45.152.8:9002/interface/paikao/geitime" />
-  <!--考试成绩接口-->
-  <add key="ExamScoreAPI" value="http://123.57.209.16:12203/jeeplus/app/stuScore" />
+	<!--排考接口-->
+	<add key="ArrangeExamAPI" value="http://112.45.152.8:9002/interface/paikao/paikao" />
+	<!--选修排考接口-->
+	<add key="ArrangeExamOfElectiveAPI" value="http://112.45.152.8:9002/interface/paikao/xuanxiupaikao" />
+	<!--排考结构接口-->
+	<add key="ArrangeExamStructureAPI" value="http://112.45.152.8:9002/interface/paikao/geitime" />
+	<!--考试成绩接口-->
+	<add key="ExamScoreAPI" value="http://123.57.209.16:12203/jeeplus/app/stuScore" />
+	<!--排考接口2021新-->
+	<add key="ArrangeExamAPINew" value="http://pk.bjquanjiang.com/app/paikao/obligatory" />
+	<!--排考明细接口2021新-->
+	<add key="ArrangeExamItemAPINew" value="http://pk.bjquanjiang.com/app/paikao/getpaikao" />
+	<!--考试系统学生端-->
+	<add key="kaoshisystemurl" value="http://ks.bjquanjiang.com/RereClientConnector" />
+	<!--批量生成学生帐号时默认的角色Id-->
+	<add key="GenerateStudentsRoleId" value="0cfc388c-80e6-4cf0-b53b-02201827490a" />
+	<!--批量生成教师帐号时默认的角色Id-->
+	<add key="GenerateTeachersRoleId" value="e1702746-185a-4480-8f19-3892066555cf" />
+	<add key="QingJuurl" value="http://xy.bjquanjiang.com/Student/LoginForSSOHandler.ashx" />
+	<add key="QingJuRegisterurl" value="http://xy.bjquanjiang.com/Service/ServiceStudent.ashx" />
+	<add key="dbbackuppath" value="D:\数字化校园\lr7test\Publish\Resource\DataBaseBackup"/>
 
-  <!--考试系统学生端-->
-  <add key="kaoshisystemurl" value="http://ks.bjquanjiang.com/RereClientConnector" />
-  <!--批量生成学生帐号时默认的角色Id-->
-  <add key="GenerateStudentsRoleId" value="0cfc388c-80e6-4cf0-b53b-02201827490a" />
-  <!--批量生成教师帐号时默认的角色Id-->
-  <add key="GenerateTeachersRoleId" value="e1702746-185a-4480-8f19-3892066555cf" />
-  <add key="QingJuurl" value="http://xy.bjquanjiang.com/Student/LoginForSSOHandler.ashx" />
-  <add key="QingJuRegisterurl" value="http://xy.bjquanjiang.com/Service/ServiceStudent.ashx" />
-  <add key="dbbackuppath" value="D:\数字化校园\lr7test\Publish\Resource\DataBaseBackup"/>
+	<!-- 报名选修课排队需要调用的WebApi -->
+	<add key="WebApi" value="http://localhost:8081/" />
+	<!-- 报名选修课的最大课程数 -->
+	<add key="ElectiveLessonApplyMax" value="2" />
+	<!-- 河南对接登录 -->
+	<add key="appid" value="TZ6RW1DUNIN6C5M88I" />
+	<add key="secret" value="55848ef07e0f4e0c991bc8b4426100b2" />
+	<add key="redirecturl" value="http://123.6.9.199:6060/Login/SSOLogin" />
+	<!-- 深信服ACIp -->
+	<add key="ACIp" value="192.168.90.2"/>
+	<add key="ACIp2" value="192.168.200.252"/>
+	<!-- 是否强制验证强密码 -->
+	<add key="verifypwd" value="false"/>
+	<!--疫情防控组角色Id-->
+	<add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
+	<!--注册教师生成编号 金隅:jy;西昌：xc；大厂：dc-->
+	<add key="EmpNoRule" value="jy"/>
+	<!--考勤明细统计时查询的职工编号前缀 大厂：DCZZ-->
+	<add key="ADR_RecordUserNoPrev" value="DCZZ"/>
+	<!--第三方登录跳转地址（最后不加/）-->
+	<add key="redirect_url" value="http://localhost:20472"/>
+	<add key="QJUrl" value="www.qj.com"/>
+	<!--系主任角色Id-->
+	<add key="DeptDirectorRoleId" value="cccde0ce-ebfe-41f2-9a78-e49aaa21cd5a" />
+	<!-- 登录次数限制：登录连续错误要禁止登录 -->
+	<add key="ForbidLoginNum" value="5"/>
+	<!-- 禁止登录时间（分钟） -->
+	<add key="ForbidLoginMinutes" value="10"/>
 
-  <!-- 报名选修课排队需要调用的WebApi -->
-  <add key="WebApi" value="http://localhost:8081/" />
-  <!-- 报名选修课的最大课程数 -->
-  <add key="ElectiveLessonApplyMax" value="2" />
-  <!-- 河南对接登录 -->
-  <add key="appid" value="TZ6RW1DUNIN6C5M88I" />
-  <add key="secret" value="55848ef07e0f4e0c991bc8b4426100b2" />
-  <add key="redirecturl" value="http://123.6.9.199:6060/Login/SSOLogin" />
-  <!-- 深信服ACIp -->
-  <add key="ACIp" value="192.168.90.2"/>
-  <add key="ACIp2" value="192.168.200.252"/>
-  <!-- 是否强制验证强密码 -->
-  <add key="verifypwd" value="false"/>
-  <!--疫情防控组角色Id-->
-  <add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
-  <!--注册教师生成编号 金隅:jy;西昌：xc；大厂：dc-->
-  <add key="EmpNoRule" value="jy"/>
-  <!--考勤明细统计时查询的职工编号前缀 大厂：DCZZ-->
-  <add key="ADR_RecordUserNoPrev" value="DCZZ"/>
-  <!--第三方登录跳转地址（最后不加/）-->
-  <add key="redirect_url" value="http://localhost:20472"/>
-  <add key="QJUrl" value="www.qj.com"/>
-  <!--系主任角色Id-->
-  <add key="DeptDirectorRoleId" value="cccde0ce-ebfe-41f2-9a78-e49aaa21cd5a" />
-  <!-- 登录次数限制：登录连续错误要禁止登录 -->
-  <add key="ForbidLoginNum" value="5"/>
-  <!-- 禁止登录时间（分钟） -->
-  <add key="ForbidLoginMinutes" value="10"/>
-  
-  <!--下发新闻配置-->
-  <add key="SiteId" value="1"/>
-  <add key="ChannelId" value="6"/>
-  <add key="ApiKey" value="343d69b8-32c3-4731-8c2f-92fdf3d8818e"/>
+	<!--下发新闻配置-->
+	<add key="SiteId" value="1"/>
+	<add key="ChannelId" value="6"/>
+	<add key="ApiKey" value="fafc361a-40c1-4060-8eee-ea796640c39c"/>
 </appSettings>

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

@@ -195,6 +195,7 @@
     <Compile Include="Modules\ArrangeLessonTermAttemperApi.cs" />
     <Compile Include="Modules\DataSourceNoLoginApi.cs" />
     <Compile Include="Modules\AskApi.cs" />
+    <Compile Include="Modules\EducationalAdministration\ArrangeExamTermNewApi.cs" />
     <Compile Include="Modules\EducationalAdministration\LoginUserBindApi.cs" />
     <Compile Include="Modules\PushMessageApi.cs" />
     <Compile Include="Modules\EvalApi.cs" />

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ArrangeExamTermNewApi.cs

@@ -0,0 +1,47 @@
+using Learun.Application.Organization;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.TwoDevelopment.EvaluationTeach;
+using Learun.Util;
+using Nancy;
+using System.Collections.Generic;
+using Learun.Application.TwoDevelopment.Ask;
+
+namespace Learun.Application.WebApi.Modules
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.0 数字化智慧校园
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司
+    /// 创建人：数字化智慧校园-框架开发组
+    /// 日 期：2018.01.04
+    /// 描 述：部门管理
+    /// </summary>
+    public class ArrangeExamTermNewApi : BaseApi
+    {
+        public ArrangeExamTermNewApi()
+          : base("/learun/ask")
+        {
+            Get["/testlist"] = GetPageList;
+        }
+
+        private ArrangeExamTermNewIBLL AeTerm = new ArrangeExamTermNewBLL();
+
+        /// <summary>
+        /// 获取问卷列表
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetPageList(dynamic _)
+        {
+            ReqPageParam parameter = this.GetReqData<ReqPageParam>();
+            var data = AeTerm.GetPageList(parameter.pagination, parameter.queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = parameter.pagination.total,
+                page = parameter.pagination.page,
+                records = parameter.pagination.records
+            };
+            return Success(jsonData);
+        }
+    }
+}

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

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/ArrangeExamTermNewMap.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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-08 12:19
+    /// 描 述：排考2021新
+    /// </summary>
+    public class ArrangeExamTermNewMap : EntityTypeConfiguration<ArrangeExamTermNewEntity>
+    {
+        public ArrangeExamTermNewMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("ARRANGEEXAMTERMNEW");
+            //主键
+            this.HasKey(t => t.AETId);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

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

@@ -67,6 +67,7 @@
     <Compile Include="AssetManagementSystem\Ass_PurchaseItemApplyMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_ScrapItemMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_ScrapMap.cs" />
+    <Compile Include="EducationalAdministration\ArrangeExamTermItemNewMap.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonSyncMap.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonTermAttemperMap.cs" />
     <Compile Include="EducationalAdministration\Book_borrowinfoMap.cs" />
@@ -565,6 +566,7 @@
     <Compile Include="EducationalAdministration\StuCancelLeaveManagementMap.cs" />
     <Compile Include="EducationalAdministration\StuDisciplineManagementMap.cs" />
     <Compile Include="EducationalAdministration\StuCancelDisciplineManagementMap.cs" />
+    <Compile Include="EducationalAdministration\ArrangeExamTermNewMap.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/ArrangeExamTerm/ArrangeExamTermBLL.cs

@@ -148,6 +148,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #region 扩展数据
 
+        public async Task<bool> AsyncArrangeExamDataNew(ArrangeLessonTermEntity entity)
+        {
+            try
+            {
+                return await arrangeExamTermService.AsyncArrangeExamDataNew(entity);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
         /// <summary>
         /// 排考数据同步
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTerm/ArrangeExamTermIBLL.cs

@@ -61,6 +61,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         Task<bool> AsyncArrangeExamData();
 
+        Task<bool> AsyncArrangeExamDataNew(ArrangeLessonTermEntity entity);
+
         /// <summary>
         /// 考试表
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTerm/ArrangeExamTermService.cs

@@ -190,6 +190,123 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #region 扩展数据
 
+        /// <summary>
+        /// 2021新排考接口
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<bool> AsyncArrangeExamDataNew(ArrangeLessonTermEntity entity)
+        {
+            bool result = false;
+            try
+            {
+                //清空本学年本学期排考数据
+                var academicYearNo =entity.AcademicYearNo;
+                var semester =entity.Semester;
+                var schoolid = entity.F_SchoolId;
+                this.BaseRepository("CollegeMIS").ExecuteBySql($"delete from ArrangeExamTermNew where AcademicYearNo='{academicYearNo}' and Semester='{semester}' and F_SchoolId='{schoolid}'");
+                this.BaseRepository("CollegeMIS").ExecuteBySql($"delete from ArrangeExamTermItemNew where AcademicYearNo='{academicYearNo}' and Semester='{semester}' and F_SchoolId='{schoolid}'");
+                //排考数据处理
+                var insertList = new List<ArrangeExamTermNewEntity>();
+                var arrangeExamTermData = (await BaseRepository("CollegeMIS").FindListAsync<ArrangeExamTermNewEntity>()).ToList();
+                var classinfoData = (await BaseRepository("CollegeMIS").FindListAsync<ClassInfoEntity>()).ToList();
+                var studentData = (await BaseRepository("CollegeMIS").FindListAsync<StuInfoBasicEntity>()).ToList();
+                HttpContent httpContent = new StringContent("{\"school\":\"" + entity.F_SchoolId + "\",\"year\":\"" + entity.AcademicYearNo + "\",\"number\":\"" + entity.Semester + "\"}");
+                httpContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
+                var apiData = await Client.PostAsync(Config.GetValue("ArrangeExamAPINew"), httpContent).Result.Content.ReadAsStringAsync();
+                //明细接口
+                //Client.PostAsync(Config.GetValue("ArrangeExamItemAPINew"), httpContent);
+                if (!string.IsNullOrEmpty(apiData))
+                {
+                    var data = JsonConvert.DeserializeObject<ArrangeExamRoot>(apiData);
+                    if (!data.success)
+                    {
+                        return result;
+                    }
+                    var dataList = data.entity.list;
+                    if (dataList.Any())
+                    {
+                        var insertDataList = new List<ArrangeExamTermNewEntity>();
+                        foreach (var item in dataList)
+                        {
+                            var insertData = new ArrangeExamTermNewEntity
+                            {
+                                AETId = Guid.NewGuid().ToString(),
+                                AcademicYearNo = academicYearNo,
+                                Semester = semester,
+                                F_SchoolId  = schoolid,
+                                ExamDate = Convert.ToDateTime(item.date).Date,
+                                ExamTime = Convert.ToDateTime(item.date).ToShortTimeString()+"~"+Convert.ToDateTime(item.time).ToShortTimeString(),
+                                LessonNo =item.lessonNo,
+                                LessonName=item.lessonName,
+                                EmpNo=item.empNo,
+                                EmpName = item.empName,
+                                ClassRoomNo=item.classroomNo,
+                                ClassRoomName = item.classroomName
+                            };
+                            if (arrangeExamTermData.Count(x => x.ExamDate == insertData.ExamDate  && x.LessonNo == insertData.LessonNo && x.EmpNo == insertData.EmpNo && x.ClassRoomNo == insertData.ClassRoomNo) == 0
+                                    && insertDataList.Count(x => x.ExamDate == insertData.ExamDate && x.LessonNo == insertData.LessonNo  && x.EmpNo == insertData.EmpNo && x.ClassRoomNo == insertData.ClassRoomNo) == 0)
+                            {
+                                insertDataList.Add(insertData);
+                            }
+                        }
+                        insertList.AddRange(insertDataList);
+                       result = await BaseRepository("CollegeMIS").InsertAsync(insertList)>0;
+                    }
+                }
+                //明细对接
+                string sql = @"SELECT semester.year AS 'AcademicYearNo',semester.number AS 'Semester',currid.number AS 'LessonNo',currid.name AS 'LessonName',
+                student.name AS 'StuName',student.number AS 'StuNo',classroom.name 'ClassRoomName',classroom.number AS 'ClassRoomNo',
+                paikao.time AS 'StartDate',paikao.endtime 'EndDate',a.number 'SitNumber',
+                (SELECT GROUP_CONCAT(teachername) FROM tb_paikao WHERE currid = a.`currid` AND classroomid = a.`classroom`) AS EmpName,
+                (SELECT GROUP_CONCAT(number) FROM tb_teacher WHERE id IN
+                    (SELECT  teacherid FROM tb_paikao WHERE  currid = a.`currid` AND classroomid = a.`classroom`) ) AS EmpNo
+                FROM tb_studentpaikao a
+
+                    LEFT JOIN tb_student student ON student.id = a.student
+                LEFT JOIN tb_classroom classroom ON classroom.id = a.classroom
+                LEFT JOIN tb_curriculum currid ON currid.id = a.currid
+                LEFT JOIN tb_semester semester ON semester.id = a.semester
+                LEFT JOIN tb_paikaorule paikao ON paikao.currid = a.currid where semester.year='"+academicYearNo+ "' and semester.number='"+semester+"'";
+                var list= BaseRepository("paikeDbString").FindList<ArrangeExamTermItemNewEntity>(sql);
+                var listsqlserver =new List<ArrangeExamTermItemNewEntity>();
+                foreach (var item in list)
+                {
+                    ArrangeExamTermItemNewEntity aetitem = new ArrangeExamTermItemNewEntity();
+                    aetitem.Create();
+                    aetitem.AcademicYearNo = item.AcademicYearNo;
+                    aetitem.Semester = item.Semester;
+                    aetitem.LessonNo = item.LessonNo;
+                    aetitem.LessonName = item.LessonName;
+                    item.ExamDate = Convert.ToDateTime(item.StartDate);
+                    aetitem.ExamDate = item.ExamDate;
+                    item.ExamTime = Convert.ToDateTime(item.StartDate).ToShortTimeString() + "~" + Convert.ToDateTime(item.EndDate).ToShortTimeString();
+                    aetitem.ExamTime = item.ExamTime;
+                    aetitem.ClassNo = item.ClassNo;
+                    aetitem.ClassName = item.ClassName;
+                    aetitem.EmpNo = item.EmpNo;
+                    aetitem.EmpName = item.EmpName;
+                    aetitem.ClassRoomNo = item.ClassRoomNo;
+                    aetitem.ClassRoomName = item.ClassRoomName;
+                    aetitem.F_SchoolId = schoolid;
+                    aetitem.SitNumber = item.SitNumber;
+                    aetitem.StuNo = item.StuNo;
+                    aetitem.StuName = item.StuName;
+                    var classitem = studentData.Find(m => m.StuNo == item.StuNo);
+                    item.ClassNo = classitem?.ClassNo;
+                    aetitem.ClassNo = item.ClassNo;
+                    aetitem.ClassName = classinfoData.Find(m=>m.ClassNo==aetitem.ClassNo)?.ClassName;
+                    listsqlserver.Add(aetitem);
+                }
+                BaseRepository("CollegeMIS").Insert(listsqlserver);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return result;
+        }
+
         /// <summary>
         /// 排考数据同步
         /// </summary>
@@ -708,8 +825,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             public string time { get; set; }
             public string date { get; set; }
             public string classroomId { get; set; }
+            public string classroomNo { get; set; }
             public string classroomName { get; set; }
             public string kaoshis { get; set; }
+            public string lessonNo { get; set; }
+            public string lessonName { get; set; }
+            public string empNo { get; set; }
+            public string empName { get; set; }
         }
 
         public class ArrangeExamEntity

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermItemNew/ArrangeExamTermItemNewBLL.cs

@@ -0,0 +1,148 @@
+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 力软信息技术（苏州）有限公司 
+        /// 创 建：超级管理员 
+        /// 日 期：2021-12-09 14:27 
+        /// 描 述：排考明细 
+        /// </summary> 
+    public class ArrangeExamTermItemNewBLL : ArrangeExamTermItemNewIBLL
+    {
+        private ArrangeExamTermItemNewService arrangeExamTermItemNewService = new ArrangeExamTermItemNewService();
+
+        #region 获取数据 
+
+        /// <summary> 
+                /// 获取列表数据 
+                /// </summary> 
+                /// <param name="queryJson">查询参数</param> 
+                /// <returns></returns> 
+        public IEnumerable<ArrangeExamTermItemNewEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return arrangeExamTermItemNewService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+                /// 获取列表分页数据 
+                /// </summary> 
+                /// <param name="pagination">分页参数</param> 
+                /// <param name="queryJson">查询参数</param> 
+                /// <returns></returns> 
+        public IEnumerable<ArrangeExamTermItemNewEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return arrangeExamTermItemNewService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+                /// 获取实体数据 
+                /// </summary> 
+                /// <param name="keyValue">主键</param> 
+                /// <returns></returns> 
+        public ArrangeExamTermItemNewEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return arrangeExamTermItemNewService.GetEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据 
+
+        /// <summary> 
+                /// 删除实体数据 
+                /// </summary> 
+                /// <param name="keyValue">主键</param> 
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                arrangeExamTermItemNewService.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, ArrangeExamTermItemNewEntity entity)
+        {
+            try
+            {
+                arrangeExamTermItemNewService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermItemNew/ArrangeExamTermItemNewEntity.cs

@@ -0,0 +1,145 @@
+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 力软信息技术（苏州）有限公司 
+        /// 创 建：超级管理员 
+        /// 日 期：2021-12-09 14:27 
+        /// 描 述：排考明细 
+        /// </summary> 
+    public class ArrangeExamTermItemNewEntity
+    {
+        #region 实体成员 
+        /// <summary> 
+                /// Id 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary> 
+                /// AcademicYearNo 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("ACADEMICYEARNO")]
+        public string AcademicYearNo { get; set; }
+        /// <summary> 
+                /// Semester 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("SEMESTER")]
+        public string Semester { get; set; }
+        /// <summary> 
+                /// ExamDate 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("EXAMDATE")]
+        public DateTime? ExamDate { get; set; }
+        /// <summary> 
+                /// ExamTime 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("EXAMTIME")]
+        public string ExamTime { get; set; }
+        /// <summary> 
+                /// ClassNo 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary> 
+                /// ClassName 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("CLASSNAME")]
+        public string ClassName { get; set; }
+        /// <summary> 
+                /// LessonNo 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("LESSONNO")]
+        public string LessonNo { get; set; }
+        /// <summary> 
+                /// LessonName 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("LESSONNAME")]
+        public string LessonName { get; set; }
+        /// <summary> 
+                /// EmpNo 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary> 
+                /// EmpName 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("EMPNAME")]
+        public string EmpName { get; set; }
+        /// <summary> 
+                /// ClassRoomNo 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("CLASSROOMNO")]
+        public string ClassRoomNo { get; set; }
+        /// <summary> 
+                /// ClassRoomName 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("CLASSROOMNAME")]
+        public string ClassRoomName { get; set; }
+        /// <summary> 
+                /// F_SchoolId 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("F_SCHOOLID")]
+        public string F_SchoolId { get; set; }
+        /// <summary> 
+                /// SitNumber 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("SITNUMBER")]
+        public string SitNumber { get; set; }
+        /// <summary> 
+                /// StuNo 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary> 
+                /// StuName 
+                /// </summary> 
+                /// <returns></returns> 
+        [Column("STUNAME")]
+        public string StuName { get; set; }
+
+        [NotMapped]
+        public string StartDate { get; set; }
+        [NotMapped]
+        public string EndDate { 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
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermItemNew/ArrangeExamTermItemNewIBLL.cs

@@ -0,0 +1,55 @@
+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 力软信息技术（苏州）有限公司 
+    /// 创 建：超级管理员 
+    /// 日 期：2021-12-09 14:27 
+    /// 描 述：排考明细 
+    /// </summary> 
+    public interface ArrangeExamTermItemNewIBLL
+    {
+        #region 获取数据 
+
+        /// <summary> 
+        /// 获取列表数据 
+        /// </summary> 
+        /// <param name="queryJson">查询参数</param> 
+        /// <returns></returns> 
+        IEnumerable<ArrangeExamTermItemNewEntity> GetList(string queryJson);
+        /// <summary> 
+        /// 获取列表分页数据 
+        /// </summary> 
+        /// <param name="pagination">分页参数</param> 
+        /// <param name="queryJson">查询参数</param> 
+        /// <returns></returns> 
+        IEnumerable<ArrangeExamTermItemNewEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary> 
+        /// 获取实体数据 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        /// <returns></returns> 
+        ArrangeExamTermItemNewEntity GetEntity(string keyValue);
+        #endregion
+
+        #region 提交数据 
+
+        /// <summary> 
+        /// 删除实体数据 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        void DeleteEntity(string keyValue);
+        /// <summary> 
+        /// 保存实体数据（新增、修改） 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        /// <param name="entity">实体</param> 
+        void SaveEntity(string keyValue, ArrangeExamTermItemNewEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermItemNew/ArrangeExamTermItemNewService.cs

@@ -0,0 +1,235 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary> 
+        /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+        /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+        /// 创 建：超级管理员 
+        /// 日 期：2021-12-09 14:27 
+        /// 描 述：排考明细 
+        /// </summary> 
+    public class ArrangeExamTermItemNewService : RepositoryFactory
+    {
+        #region 构造函数和属性 
+
+        private string fieldSql;
+        /// <summary> 
+                /// 构造方法 
+                /// </summary> 
+        public ArrangeExamTermItemNewService()
+        {
+            fieldSql = @" 
+                t.Id, 
+                t.AcademicYearNo, 
+                t.Semester, 
+                t.ExamDate, 
+                t.ExamTime, 
+                t.ClassNo, 
+                t.ClassName, 
+                t.LessonNo, 
+                t.LessonName, 
+                t.EmpNo, 
+                t.EmpName, 
+                t.ClassRoomNo, 
+                t.ClassRoomName, 
+                t.F_SchoolId, 
+                t.SitNumber, 
+                t.StuNo, 
+                t.StuName 
+            ";
+        }
+        #endregion
+
+        #region 获取数据 
+
+        /// <summary> 
+                /// 获取列表数据 
+                /// </summary> 
+                /// <param name="queryJson">条件参数</param> 
+                /// <returns></returns> 
+        public IEnumerable<ArrangeExamTermItemNewEntity> GetList(string queryJson)
+        {
+            try
+            {
+                //参考写法 
+                //var queryParam = queryJson.ToJObject(); 
+                // 虚拟参数 
+                //var dp = new DynamicParameters(new { }); 
+                //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); 
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM ArrangeExamTermItemNew t ");
+               
+                return this.BaseRepository("CollegeMIS").FindList<ArrangeExamTermItemNewEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+                /// 获取列表分页数据 
+                /// </summary> 
+                /// <param name="pagination">分页参数</param> 
+                /// <param name="queryJson">条件参数</param> 
+                /// <returns></returns> 
+        public IEnumerable<ArrangeExamTermItemNewEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM ArrangeExamTermItemNew t where 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.AcademicYearNo='" + queryParam["AcademicYearNo"].ToString() + "' ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    strSql.Append(" and t.Semester='" + queryParam["Semester"].ToString() + "' ");
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.LessonNo='" + queryParam["LessonNo"].ToString() + "' ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.ClassNo='" + queryParam["ClassNo"].ToString() + "' ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.StuNo='" + queryParam["StuNo"].ToString() + "' ");
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.EmpNo='" + queryParam["EmpNo"].ToString() + "' ");
+                }
+                if (!queryParam["ClassRoomNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.ClassRoomNo='" + queryParam["ClassRoomNo"].ToString() + "' ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    strSql.Append(" AND ( ExamDate >= '" + queryParam["StartTime"].ToString() + "' AND ExamDate <= '" + queryParam["StartTime"].ToString() + "' ) ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<ArrangeExamTermItemNewEntity>(strSql.ToString(),null,pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+                /// 获取实体数据 
+                /// </summary> 
+                /// <param name="keyValue">主键</param> 
+                /// <returns></returns> 
+        public ArrangeExamTermItemNewEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<ArrangeExamTermItemNewEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据 
+
+        /// <summary> 
+                /// 删除实体数据 
+                /// </summary> 
+                /// <param name="keyValue">主键</param> 
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<ArrangeExamTermItemNewEntity>(t => t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+                /// 保存实体数据（新增、修改） 
+                /// <param name="keyValue">主键</param> 
+                /// <param name="entity">实体</param> 
+                /// </summary> 
+        public void SaveEntity(string keyValue, ArrangeExamTermItemNewEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewBLL.cs

@@ -0,0 +1,202 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-08 12:19
+    /// 描 述：排考2021新
+    /// </summary>
+    public class ArrangeExamTermNewBLL : ArrangeExamTermNewIBLL
+    {
+        private ArrangeExamTermNewService arrangeExamTermNewService = new ArrangeExamTermNewService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ArrangeExamTermNewEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return arrangeExamTermNewService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ArrangeExamTermNewEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return arrangeExamTermNewService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<ArrangeExamTermItemNewEntity> GetItemPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return arrangeExamTermNewService.GetItemPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ArrangeExamTermNewEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return arrangeExamTermNewService.GetEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                arrangeExamTermNewService.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, ArrangeExamTermNewEntity entity)
+        {
+            try
+            {
+                arrangeExamTermNewService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public List<TreeModel> GetClassTree()
+        {
+            try
+            {
+                var list = arrangeExamTermNewService.GetClassTree();
+                List<TreeModel> treeList = new List<TreeModel>();
+                foreach (var item in list)
+                {
+                    TreeModel node = new TreeModel
+                    {
+                        id = item.ClassNo,
+                        text = item.ClassName,
+                        value = item.ClassNo,
+                        showcheck = false,
+                        checkstate = 0,
+                        isexpand = true,
+                        parentId = "0"
+                    };
+                    treeList.Add(node);
+                }
+                return treeList.ToTree();
+            }
+            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/ArrangeExamTermNew/ArrangeExamTermNewEntity.cs

@@ -0,0 +1,139 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-08 12:19
+    /// 描 述：排考2021新
+    /// </summary>
+    public class ArrangeExamTermNewEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// AETId
+        /// </summary>
+        /// <returns></returns>
+        [Column("AETID")]
+        public string AETId { get; set; }
+        /// <summary>
+        /// AcademicYearNo
+        /// </summary>
+        /// <returns></returns>
+        [Column("ACADEMICYEARNO")]
+        public string AcademicYearNo { get; set; }
+        /// <summary>
+        /// Semester
+        /// </summary>
+        /// <returns></returns>
+        [Column("SEMESTER")]
+        public string Semester { get; set; }
+        /// <summary>
+        /// ExamDate
+        /// </summary>
+        /// <returns></returns>
+        [Column("EXAMDATE")]
+        public DateTime? ExamDate { get; set; }
+        /// <summary>
+        /// ExamTime
+        /// </summary>
+        /// <returns></returns>
+        [Column("EXAMTIME")]
+        public string ExamTime { get; set; }
+        /// <summary>
+        /// ClassNo
+        /// </summary>
+        /// <returns></returns>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// ClassName
+        /// </summary>
+        /// <returns></returns>
+        [Column("CLASSNAME")]
+        public string ClassName { get; set; }
+        /// <summary>
+        /// LessonNo
+        /// </summary>
+        /// <returns></returns>
+        [Column("LESSONNO")]
+        public string LessonNo { get; set; }
+        /// <summary>
+        /// LessonName
+        /// </summary>
+        /// <returns></returns>
+        [Column("LESSONNAME")]
+        public string LessonName { get; set; }
+        /// <summary>
+        /// EmpNo
+        /// </summary>
+        /// <returns></returns>
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary>
+        /// EmpName
+        /// </summary>
+        /// <returns></returns>
+        [Column("EMPNAME")]
+        public string EmpName { get; set; }
+        /// <summary>
+        /// ClassRoomNo
+        /// </summary>
+        /// <returns></returns>
+        [Column("CLASSROOMNO")]
+        public string ClassRoomNo { get; set; }
+        /// <summary>
+        /// ClassRoomName
+        /// </summary>
+        /// <returns></returns>
+        [Column("CLASSROOMNAME")]
+        public string ClassRoomName { get; set; }
+        /// <summary>
+        /// F_SchoolId
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_SCHOOLID")]
+        public string F_SchoolId { get; set; }
+
+        /// <summary>
+        /// 座位编号
+        /// </summary>
+        [NotMapped]
+        public string SitNumber { get; set; }
+        [NotMapped]
+        public string StuNo { get; set; }
+        [NotMapped]
+        public string StuName { get; set; }
+        [NotMapped]
+        public string StartDate { get; set; }
+        [NotMapped]
+        public string EndDate { get; set; }
+        [NotMapped]
+        public  string Teacher { get; set; }
+
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.AETId = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.AETId = keyValue;
+        }
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewIBLL.cs

@@ -0,0 +1,57 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-08 12:19
+    /// 描 述：排考2021新
+    /// </summary>
+    public interface ArrangeExamTermNewIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ArrangeExamTermNewEntity> GetList( string queryJson );
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ArrangeExamTermNewEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<ArrangeExamTermItemNewEntity> GetItemPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        ArrangeExamTermNewEntity GetEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, ArrangeExamTermNewEntity entity);
+        #endregion
+
+        List<TreeModel> GetClassTree();
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewService.cs

@@ -0,0 +1,299 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-08 12:19
+    /// 描 述：排考2021新
+    /// </summary>
+    public class ArrangeExamTermNewService : RepositoryFactory
+    {
+        #region 构造函数和属性
+
+        private string fieldSql;
+        /// <summary>
+        /// 构造方法
+        /// </summary>
+        public ArrangeExamTermNewService()
+        {
+            fieldSql = @"*";
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<ArrangeExamTermNewEntity> GetList(string queryJson)
+        {
+            try
+            {
+                //参考写法
+                //var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                //var dp = new DynamicParameters(new { });
+                //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM ArrangeExamTermNew t ");
+                return this.BaseRepository("CollegeMIS").FindList<ArrangeExamTermNewEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<ArrangeExamTermNewEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM ArrangeExamTermNew t where 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.AcademicYearNo=@AcademicYearNo ");
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    strSql.Append(" and t.Semester=@Semester ");
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.EmpNo=@EmpNo ");
+                    dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String);
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.LessonNo=@LessonNo ");
+                    dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String);
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.ClassNo=@ClassNo ");
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                }
+                if (!queryParam["ClassRoomNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.ClassRoomNo=@ClassRoomNo ");
+                    dp.Add("ClassRoomNo", queryParam["ClassRoomNo"].ToString(), DbType.String);
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( ExamDate >= @startTime AND ExamDate <= @endTime ) ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<ArrangeExamTermNewEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取排考详情
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public IEnumerable<ArrangeExamTermItemNewEntity> GetItemPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append(@"select * from ArrangeExamTermItemNew t where 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.AcademicYearNo='"+ queryParam["AcademicYearNo"].ToString() + "' ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    strSql.Append(" and t.Semester='" + queryParam["Semester"].ToString() + "' ");
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.LessonNo='" + queryParam["LessonNo"].ToString() + "' ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.ClassNo='" + queryParam["ClassNo"].ToString() + "' ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.StuNo='" + queryParam["StuNo"].ToString() + "' ");
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.EmpNo like '%" + queryParam["EmpNo"].ToString() + "%' ");
+                }
+                if (!queryParam["ClassRoomNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.ClassRoomNo='" + queryParam["ClassRoomNo"].ToString() + "' ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    strSql.Append(" AND ( ExamDate >= '" + queryParam["StartTime"].ToString() + "' AND ExamDate <= '" + queryParam["EndTime"].ToString() + "' ) ");
+                }
+                
+                return this.BaseRepository("CollegeMIS").FindList<ArrangeExamTermItemNewEntity>(strSql.ToString(), null, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ArrangeExamTermNewEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<ArrangeExamTermNewEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<ArrangeExamTermNewEntity>(t => t.AETId == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// </summary>
+        public void SaveEntity(string keyValue, ArrangeExamTermNewEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        public IEnumerable<ClassInfoEntity> GetClassTree()
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>("select ClassNo,ClassName from ArrangeExamTermItemNew group by ClassNo,ClassName order by ClassNo");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassPlan/ClassPlanBLL.cs

@@ -120,5 +120,107 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
         #endregion
+
+        #region 扩展数据
+        /// <summary>
+        /// 去重
+        /// </summary>
+        /// <param name="School"></param>
+        /// <param name="Year"></param>
+        /// <param name="Semester"></param>
+        /// <param name="Dept"></param>
+        /// <param name="Major"></param>
+        /// <param name="Grade"></param>
+        /// <param name="Lesson"></param>
+        /// <returns></returns>
+        public OpenLessonPlanEntity GetRepetitions(string School, string Year, string Semester, string Dept,
+            string Major, string Grade, string Lesson)
+        {
+            try
+            {
+                return classPlanService.GetRepetitions(School, Year, Semester, Dept, Major, Grade, Lesson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DelRelation(string keyValue)
+        {
+            try
+            {
+                classPlanService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public List<OpenLessonPlanEntity> GetListById(string keyValue)
+        {
+            try
+            {
+                return classPlanService.GetListById(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public void SaveEntityList(string keyValue, List<OpenLessonPlanEntity> entity)
+        {
+            try
+            {
+                classPlanService.SaveEntityList(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassPlan/ClassPlanIBLL.cs

@@ -44,5 +44,36 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         void SaveEntity(string keyValue, OpenLessonPlanEntity entity);
         #endregion
 
+        #region 扩展数据
+
+        /// <summary>
+        /// 去重
+        /// </summary>
+        /// <param name="ID">主键</param>
+        /// <param name="School">校区</param>
+        /// <param name="Year">学年</param>
+        /// <param name="Semester">学期</param>
+        /// <param name="Dept">系部</param>
+        /// <param name="Major">专业</param>
+        /// <param name="Grade">年级</param>
+        /// <param name="Lesson">课程</param>
+        /// <returns></returns>
+        OpenLessonPlanEntity GetRepetitions(string School, string Year, string Semester, string Dept, string Major, string Grade, string Lesson);
+
+        /// <summary>
+        /// 编辑时删除关联数据
+        /// </summary>
+        /// <param name="keyValue"></param>
+        void DelRelation(string keyValue);
+
+        /// <summary>
+        /// 获取TeachClass表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        List<OpenLessonPlanEntity> GetListById(string keyValue);
+
+        void SaveEntityList(string keyValue, List<OpenLessonPlanEntity> entity);
+        #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassPlan/ClassPlanService.cs

@@ -122,13 +122,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         public void DeleteEntity(string keyValue)
         {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
-                var keyvalue = Convert.ToInt32(keyValue);
-                this.BaseRepository("CollegeMIS").Delete<OpenLessonPlanEntity>(t => t.ID == keyvalue);
+                var keyvalue = keyValue.Split(',');
+                foreach (var items in keyvalue)
+                {
+                    var OpList = this.BaseRepository("CollegeMIS").FindEntity<OpenLessonPlanEntity>(t => t.ID.ToString() == items);
+                    if (OpList != null)
+                    {
+                        var TeachList = this.BaseRepository("CollegeMIS").FindList<TeachClassEntity>(
+                            x => x.DeptNo == OpList.DeptNo &&
+                                 x.MajorNo == OpList.MajorNo &&
+                                 x.Grade == OpList.Grade &&
+                                 x.Semester == OpList.Semester &&
+                                 x.LessonNo == OpList.LessonNo &&
+                                 x.AcademicYearNo == OpList.AcademicYearNo
+                        ).ToList();
+                        List<string> StrTeach = null;
+                        if (TeachList.Count > 0)
+                        {
+                            StrTeach = TeachList.Select(x => x.TeachClassNo).ToList();
+                            if (StrTeach.Count() > 0)
+                            {
+                                var LessonList = this.BaseRepository("CollegeMIS").FindList<StuSelectLessonListEntity>(
+                                    y => y.DeptNo == OpList.DeptNo &&
+                                         y.MajorNo == OpList.MajorNo &&
+                                         y.Grade == OpList.Grade &&
+                                         y.Semester == OpList.Semester &&
+                                         y.LessonNo == OpList.LessonNo &&
+                                         y.AcademicYearNo == OpList.AcademicYearNo &&
+                                         StrTeach.Contains(y.ClassNo)
+                                );
+                                foreach (var item in LessonList)
+                                {
+                                    db.Delete<StuSelectLessonListEntity>(m => m.SelectId == Convert.ToInt32(item.SelectId));
+                                }
+
+                                foreach (var item in TeachList)
+                                {
+                                    db.Delete<TeachClassEntity>(m => m.ID == item.ID);
+                                }
+                            }
+                        }
+                    }
+                db.Delete<OpenLessonPlanEntity>(m => m.ID.ToString() == items);
+                }
+                db.Commit();
             }
             catch (Exception ex)
             {
+                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;
@@ -175,5 +219,160 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #endregion
 
+
+        #region 扩展数据
+        /// <summary>
+        /// 去重
+        /// </summary>
+        /// <param name="ID">主键</param>
+        /// <param name="School">校区</param>
+        /// <param name="Year">学年</param>
+        /// <param name="Semester">学期</param>
+        /// <param name="Dept">系部</param>
+        /// <param name="Major">专业</param>
+        /// <param name="Grade">年级</param>
+        /// <param name="Lesson">课程</param>
+        /// <returns></returns>
+        public OpenLessonPlanEntity GetRepetitions(string School, string Year, string Semester, string Dept,
+            string Major, string Grade, string Lesson)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<OpenLessonPlanEntity>(
+                                                                                    x => x.F_SchoolId == School
+                                                                                    && x.AcademicYearNo == Year
+                                                                                    && x.Semester == Semester
+                                                                                    && x.DeptNo == Dept
+                                                                                    && x.MajorNo == Major
+                                                                                    && x.Grade == Grade
+                                                                                    && x.LessonNo == Lesson
+                                                                             );
+
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+        }
+
+        public void DelRelation(string keyValue)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                var keyvalue = Convert.ToInt32(keyValue);
+                var OpList = this.BaseRepository("CollegeMIS").FindEntity<OpenLessonPlanEntity>(t => t.ID == keyvalue);
+                if (OpList != null)
+                {
+                    var TeachList = this.BaseRepository("CollegeMIS").FindList<TeachClassEntity>(
+                        x => x.DeptNo == OpList.DeptNo &&
+                             x.MajorNo == OpList.MajorNo &&
+                             x.Grade == OpList.Grade &&
+                             x.Semester == OpList.Semester &&
+                             x.LessonNo == OpList.LessonNo &&
+                             x.AcademicYearNo == OpList.AcademicYearNo
+                    ).ToList();
+                    List<string> StrTeach = null;
+                    if (TeachList.Count > 0)
+                    {
+                        StrTeach = TeachList.Select(x => x.TeachClassNo).ToList();
+                        if (StrTeach.Count > 0)
+                        {
+                            var LessonList = this.BaseRepository("CollegeMIS").FindList<StuSelectLessonListEntity>(
+                                y => y.DeptNo == OpList.DeptNo &&
+                                     y.MajorNo == OpList.MajorNo &&
+                                     y.Grade == OpList.Grade &&
+                                     y.Semester == OpList.Semester &&
+                                     y.LessonNo == OpList.LessonNo &&
+                                     y.AcademicYearNo == OpList.AcademicYearNo &&
+                                     StrTeach.Contains(y.ClassNo)
+                            );
+                            foreach (var item in LessonList)
+                            {
+                                db.Delete<StuSelectLessonListEntity>(m => m.SelectId == Convert.ToInt32(item.SelectId));
+                            }
+
+                            foreach (var item in TeachList)
+                            {
+                                db.Delete<TeachClassEntity>(m => m.ID == item.ID);
+                            }
+                        }
+                    }
+
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取OpenLessonPlan表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public List<OpenLessonPlanEntity> GetListById(string keyValue)
+        {
+            try
+            {
+                var id = keyValue.Split(',');
+                return this.BaseRepository("CollegeMIS")
+                    .FindList<OpenLessonPlanEntity>(x => id.Contains(x.ID.ToString())).ToList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
+        public void SaveEntityList(string keyValue, List<OpenLessonPlanEntity> entity)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                var keyvalue = keyValue.Split(',');
+                foreach (var item in keyvalue)
+                {
+                    var entityList = this.BaseRepository("CollegeMIS").FindEntity<OpenLessonPlanEntity>(x => x.ID.ToString() == item);
+                    entityList.State = 1;
+                    db.Update(entityList);
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                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/EmpInfo/EmpInfoEntity.cs

@@ -527,7 +527,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("WORKERTECHNOLOGYSTATUS")]
         public bool? WorkerTechnologyStatus { get; set; }
-        
+
         /// <summary>
         /// 任同职级职务时间
         /// </summary>
@@ -585,6 +585,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("ISINACTIVETIME")]
         public DateTime? IsInActiveTime { get; set; }
 
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [Column("F_ORDER")]
+        public int? F_Order { get; set; }
+
+
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs

@@ -434,6 +434,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
                     userbase.F_CompanyId = tEntity.F_CompanyId;
                     userbase.F_DepartmentId = tEntity.F_DepartmentId;
                     userbase.F_IdentityCardNo = tEntity.IdentityCardNo;
+                    userbase.F_Order = tEntity.F_Order;
                     userIBLL.SaveEntity(null, userbase);
                     studentList.Add(userbase);
                 }
@@ -545,7 +546,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
                 var keyValueArr = keyValue.Split(',');
                 foreach (var item in keyValueArr)
                 {
-                    db.ExecuteBySql("update EmpInfo set CheckMark=1 where EmpId='" + item + "'");
+                    db.ExecuteBySql("update EmpInfo set CheckMark=1  where EmpId='" + item + "'");
                 }
                 db.Commit();
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanEntity.cs

@@ -270,6 +270,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("ISALLOWEDIT")]
         public bool? IsAllowEdit { get; set; }
+        /// <summary>
+        /// 排课标识
+        /// </summary>
+        [Column("STATE")]
+        public int? State { get; set; }
         #endregion
 
         #region  扩展操作
@@ -305,6 +310,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [NotMapped]
         public string MajorName { get; set; }
+        /// <summary>
+        /// 教师
+        /// </summary>
+        [NotMapped]
+        public string TeachNo { get; set; }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonList/StuSelectLessonListBLL.cs

@@ -0,0 +1,164 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-01 11:49
+    /// 描 述：收文报告
+    /// </summary>
+    public class StuSelectLessonListBLL : StuSelectLessonListIBLL
+    {
+        private StuSelectLessonListService stuSelectLessonListService = new StuSelectLessonListService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuSelectLessonListEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return stuSelectLessonListService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取Dispatch表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuSelectLessonListEntity GetListEntity(string keyValue)
+        {
+            try
+            {
+                return stuSelectLessonListService.GetListEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                stuSelectLessonListService.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, StuSelectLessonListEntity entity)
+        {
+            try
+            {
+                stuSelectLessonListService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 扩展数据
+        public void SaveEntityList(List<StuSelectLessonListEntity> entity)
+        {
+            try
+            {
+                stuSelectLessonListService.SaveEntityList(entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<StuSelectLessonListEntity> GetAllList()
+        {
+            try
+            {
+                return stuSelectLessonListService.GetAllList();
+            }
+            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/StuSelectLessonList/StuSelectLessonListIBLL.cs

@@ -0,0 +1,53 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-01 11:49
+    /// 描 述：收文报告
+    /// </summary>
+    public interface StuSelectLessonListIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StuSelectLessonListEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取Dispatch表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        StuSelectLessonListEntity GetListEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, StuSelectLessonListEntity entity);
+        void SaveEntityList(List<StuSelectLessonListEntity> entity);
+
+        IEnumerable<StuSelectLessonListEntity> GetAllList();
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonList/StuSelectLessonListService.cs

@@ -0,0 +1,242 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-01 11:49
+    /// 描 述：收文报告
+    /// </summary>
+    public class StuSelectLessonListService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuSelectLessonListEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" * ");
+                strSql.Append("  FROM StuSelectLessonList t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["keyword"].IsEmpty())
+                {
+                    dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND  t.DisFrom like @keyword  ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuSelectLessonListEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取Dispatch表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuSelectLessonListEntity GetListEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuSelectLessonListEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                //this.BaseRepository("CollegeMIS").Delete<StuInfoBasicEntity>(t => t.StuId == keyValue);
+
+                //多个删除
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    db.Delete<StuSelectLessonListEntity>(t => t.SelectId.ToString() == item);
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, StuSelectLessonListEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    var keyvalue = Convert.ToInt32(keyValue);
+                    entity.Modify(keyvalue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 扩展数据
+        public void SaveEntityList(List<StuSelectLessonListEntity> entity)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                foreach (var item in entity)
+                {
+                    StuSelectLessonListEntity stuLessonList = new StuSelectLessonListEntity();
+                    stuLessonList.F_SchoolId = item.F_SchoolId;
+                    stuLessonList.NoticeBookNo = item.NoticeBookNo;
+                    stuLessonList.StuNo = item.StuNo;
+                    stuLessonList.DeptNo = item.DeptNo;
+                    stuLessonList.MajorNo = item.MajorNo;
+                    stuLessonList.ClassNo = item.ClassNo;
+                    stuLessonList.MajorDetailNo = item.MajorDetailNo;
+                    stuLessonList.MajorDetailName = item.MajorDetailName;
+                    stuLessonList.StuName = item.StuName;
+                    stuLessonList.TeachClassNo = item.TeachClassNo;
+                    stuLessonList.GenderNo = item.GenderNo;
+                    stuLessonList.AcademicYearNo = item.AcademicYearNo;
+                    stuLessonList.Semester = item.Semester;
+                    stuLessonList.OpenLessonDeptNo = item.OpenLessonDeptNo;
+                    stuLessonList.OpenLessonMajorNo = item.OpenLessonMajorNo;
+                    stuLessonList.LessonNo = item.LessonNo;
+                    stuLessonList.LessonName = item.LessonName;
+                    stuLessonList.PartCode = item.PartCode;
+                    stuLessonList.LessonNameEng = item.LessonNameEng;
+                    stuLessonList.OrdinaryScoreScale = item.OrdinaryScoreScale;
+                    stuLessonList.TermInScoreScale = item.TermInScoreScale;
+                    stuLessonList.TermEndScoreScale = item.TermEndScoreScale;
+                    stuLessonList.OtherScoreScale = item.OtherScoreScale;
+                    stuLessonList.LessonSortNo = item.LessonSortNo;
+                    stuLessonList.StuSortNo = item.StuSortNo;
+                    stuLessonList.Grade = item.Grade;
+                    stuLessonList.StudyScore = item.StudyScore;
+                    stuLessonList.TotalStudyHour = item.TotalStudyHour;
+                    stuLessonList.IsInEffect = item.IsInEffect;
+                    stuLessonList.Remark = item.Remark;
+                    stuLessonList.ConflictLessonNo = item.ConflictLessonNo;
+                    stuLessonList.EmpNo = item.EmpNo;
+                    stuLessonList.TeachPlanNo = item.TeachPlanNo;
+                    stuLessonList.IsPitchOn = item.IsPitchOn;
+                    stuLessonList.CheckMark = item.CheckMark;
+                    stuLessonList.InsertTime = item.InsertTime;
+                    stuLessonList.CheckMark = "1";
+                    db.Insert(stuLessonList);
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<StuSelectLessonListEntity> GetAllList()
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<StuSelectLessonListEntity>(m => m.CheckMark == "1");
+            }
+            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/TeachClass/TeachClassBLL.cs

@@ -0,0 +1,233 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-01-29 11:08
+    /// 描 述：班级信息管理
+    /// </summary>
+    public class TeachClassBLL : TeachClassIBLL
+    {
+        private TeachClassService teachClassEntity = new TeachClassService();
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeachClassEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return teachClassEntity.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public bool GetAny()
+        {
+            try
+            {
+                return teachClassEntity.GetAny();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ClassInfo表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public TeachClassEntity GetTeachClassEntity(string keyValue)
+        {
+            try
+            {
+                return teachClassEntity.GetTeachClassEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取ClassInfo表实体数据
+        /// <param name="classNo">班级编号</param>
+        /// <summary>
+        /// <returns></returns>
+
+        #endregion
+
+        #region  提交数据
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                teachClassEntity.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, TeachClassEntity entity)
+        {
+            try
+            {
+                teachClassEntity.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public void SaveEntityList(List<TeachClassEntity> entity)
+        {
+            try
+            {
+                teachClassEntity.SaveEntityList(entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        #endregion
+
+        #region 扩展数据
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public List<TeachClassEntity> GetTeachListById(string keyValue)
+        {
+            try
+            {
+                return teachClassEntity.GetTeachListById(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 查询条件
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<TeachClassEntity> GetAllClass()
+        {
+            try
+            {
+                return teachClassEntity.GetAllClass();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void UpEmpNo(string keyValue, string EmpNo)
+        {
+            try
+            {
+                teachClassEntity.UpEmpNo(keyValue, EmpNo);
+            }
+            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/TeachClass/TeachClassIBLL.cs

@@ -0,0 +1,76 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-01-29 11:08
+    /// 描 述：班级信息管理
+    /// </summary>
+    public interface TeachClassIBLL
+    {
+        #region  获取数据
+        bool GetAny();
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<TeachClassEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取ClassInfo表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        TeachClassEntity GetTeachClassEntity(string keyValue);
+        #endregion
+
+        #region  提交数据
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DeleteEntity(string keyValue);
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void SaveEntity(string keyValue, TeachClassEntity entity);
+
+
+        #endregion
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 获取ClassTeach表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        List<TeachClassEntity> GetTeachListById(string keyValue);
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        /// <param name="entity"></param>
+        void SaveEntityList(List<TeachClassEntity> entity);
+        /// <summary>
+        /// 去重
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<TeachClassEntity> GetAllClass();
+        /// <summary>
+        /// 保存/修改教师
+        /// </summary>
+        /// <param name="keyvalue"></param>
+        /// <param name="EmpNo"></param>
+        void UpEmpNo(string keyvalue, string EmpNo);
+        #endregion
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs

@@ -0,0 +1,331 @@
+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-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-01-29 11:08
+    /// 描 述：班级信息管理
+    /// </summary>
+    public class TeachClassService : RepositoryFactory
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeachClassEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" * ");
+                strSql.Append("  FROM TeachClass t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["F_SchoolId"].IsEmpty())
+                {
+                    dp.Add("F_SchoolId", queryParam["F_SchoolId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.F_SchoolId = @F_SchoolId ");
+                }
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Semester = @Semester ");
+                }
+                if (!queryParam["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["Grade"].IsEmpty())
+                {
+                    dp.Add("Grade", "%" + queryParam["Grade"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Grade Like @Grade ");
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.LessonNo = @LessonNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<TeachClassEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        internal bool GetAny()
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<TeachClassEntity>().ToList().Count > 0 ? true : false;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ClassInfo表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public TeachClassEntity GetTeachClassEntity(string keyValue)
+        {
+            try
+            {
+                int ID = Convert.ToInt32(keyValue);
+                return this.BaseRepository("CollegeMIS").FindEntity<TeachClassEntity>(ID);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+
+        #region  提交数据
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                //修改
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    var entity = this.BaseRepository("CollegeMIS").FindEntity<TeachClassEntity>(x => x.ID == Convert.ToInt32(item));
+                    if (entity != null)
+                    {
+                        entity.EmpNo = "";
+                        db.Update(entity);
+                    }
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, TeachClassEntity entity)
+        {
+            try
+            {
+                var keyvalue = Convert.ToInt32(keyValue);
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyvalue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
+
+        #endregion
+
+        #region 扩展数据
+        public IEnumerable<TeachClassEntity> GetAllClass()
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<TeachClassEntity>();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ClassInfo表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public List<TeachClassEntity> GetTeachListById(string keyValue)
+        {
+            try
+            {
+                var id = keyValue.Split(',');
+                return this.BaseRepository("CollegeMIS")
+                    .FindList<TeachClassEntity>(x => id.Contains(x.ID.ToString())).ToList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity"></param>
+        public void SaveEntityList(List<TeachClassEntity> List)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                foreach (var item in List)
+                {
+                    TeachClassEntity Teach = new TeachClassEntity();
+                    Teach.TeachClassNo = item.TeachClassNo;
+                    Teach.AcademicYearNo = item.AcademicYearNo;
+                    Teach.DeptNo = item.DeptNo;
+                    Teach.MajorNo = item.MajorNo;
+                    Teach.Grade = item.Grade;
+                    Teach.Semester = item.Semester;
+                    Teach.LessonNo = item.LessonNo;
+                    Teach.StuNum = item.StuNum;
+                    Teach.LessonSortNo = item.LessonSortNo;
+                    Teach.F_SchoolId = item.F_SchoolId;
+                    db.Insert(Teach);
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 保存或修改教师
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="EmpNo"></param>
+        public void UpEmpNo(string keyValue, string EmpNo)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                var keyarray = keyValue.Split(',');
+                foreach (var item in keyarray)
+                {
+                    var entityList = this.GetTeachClassEntity(item);
+                    entityList.EmpNo = EmpNo;
+                    db.Update(entityList);
+
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+    }
+}

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

@@ -91,6 +91,10 @@
     <Compile Include="AssetManagementSystem\Ass_ScrapItem\Ass_ScrapItemEntity.cs" />
     <Compile Include="AssetManagementSystem\Ass_ScrapItem\Ass_ScrapItemIBLL.cs" />
     <Compile Include="AssetManagementSystem\Ass_ScrapItem\Ass_ScrapItemService.cs" />
+    <Compile Include="EducationalAdministration\ArrangeExamTermItemNew\ArrangeExamTermItemNewBLL.cs" />
+    <Compile Include="EducationalAdministration\ArrangeExamTermItemNew\ArrangeExamTermItemNewEntity.cs" />
+    <Compile Include="EducationalAdministration\ArrangeExamTermItemNew\ArrangeExamTermItemNewIBLL.cs" />
+    <Compile Include="EducationalAdministration\ArrangeExamTermItemNew\ArrangeExamTermItemNewService.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonSync\ArrangeLessonSyncBLL.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonSync\ArrangeLessonSyncEntity.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonSync\ArrangeLessonSyncIBLL.cs" />
@@ -211,6 +215,9 @@
     <Compile Include="EducationalAdministration\StuSelectLessonListOfElectivePre\StuSelectLessonListOfElectivePreEntity.cs" />
     <Compile Include="EducationalAdministration\StuSelectLessonListOfElectivePre\StuSelectLessonListOfElectivePreIBLL.cs" />
     <Compile Include="EducationalAdministration\StuSelectLessonListOfElectivePre\StuSelectLessonListOfElectivePreService.cs" />
+    <Compile Include="EducationalAdministration\StuSelectLessonList\StuSelectLessonListBLL.cs" />
+    <Compile Include="EducationalAdministration\StuSelectLessonList\StuSelectLessonListIBLL.cs" />
+    <Compile Include="EducationalAdministration\StuSelectLessonList\StuSelectLessonListService.cs" />
     <Compile Include="EducationalAdministration\Sys_DefaultPwdConfig\Sys_DefaultPwdConfigBLL.cs" />
     <Compile Include="EducationalAdministration\Sys_DefaultPwdConfig\Sys_DefaultPwdConfigEntity.cs" />
     <Compile Include="EducationalAdministration\Sys_DefaultPwdConfig\Sys_DefaultPwdConfigIBLL.cs" />
@@ -228,6 +235,9 @@
     <Compile Include="EducationalAdministration\TeachAttendance\TeachAttendanceIBLL.cs" />
     <Compile Include="EducationalAdministration\TeachAttendance\TeachAttendanceService.cs" />
     <Compile Include="EducationalAdministration\TeachAttendance\TeachAttendanceEntity.cs" />
+    <Compile Include="EducationalAdministration\TeachClass\TeachClassBLL.cs" />
+    <Compile Include="EducationalAdministration\TeachClass\TeachClassIBLL.cs" />
+    <Compile Include="EducationalAdministration\TeachClass\TeachClassService.cs" />
     <Compile Include="EducationalAdministration\TeachingMaterial\TeachingMaterialBLL.cs" />
     <Compile Include="EducationalAdministration\TeachingMaterial\TeachingMaterialEntity.cs" />
     <Compile Include="EducationalAdministration\TeachingMaterial\TeachingMaterialIBLL.cs" />
@@ -1705,6 +1715,10 @@
     <Compile Include="EducationalAdministration\StuCancelDisciplineManagement\StuCancelDisciplineManagementService.cs" />
     <Compile Include="EducationalAdministration\StuCancelDisciplineManagement\StuCancelDisciplineManagementBLL.cs" />
     <Compile Include="EducationalAdministration\StuCancelDisciplineManagement\StuCancelDisciplineManagementIBLL.cs" />
+    <Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewEntity.cs" />
+    <Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewService.cs" />
+    <Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewIBLL.cs" />
+    <Compile Include="EducationalAdministration\ArrangeExamTermNew\ArrangeExamTermNewBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs

@@ -795,6 +795,52 @@ namespace Learun.Application.WorkFlow
                                     });
                                 }
 
+                            }
+                            break;
+                        case 8://liang 20210706新增部门负责人判断
+                               //获取流程创建用户的分管领导
+                               //判断用户所在部门是否有上级部门：如果有，找到上级部门的负责人；如果没有，找本部门的分管校长；
+                            string deptMasterId = "";
+                            var selfDepart2 = departmentIBLL.GetEntity(paramConfig.CreateUser.DepartmentId);
+                            if (selfDepart2 != null)
+                            {
+                                //本部门存在部门负责人
+                                if (!string.IsNullOrEmpty(selfDepart2.F_Manager))
+                                {
+                                    deptMasterId = selfDepart2.F_Manager;
+                                }
+                                else
+                                {
+                                    //本部门不存在就找上级部门
+                                    var parentDepart = departmentIBLL.GetEntity(selfDepart2.F_ParentId);
+                                    if (parentDepart != null)
+                                    {
+                                        if (!string.IsNullOrEmpty(selfDepart2.F_Manager))
+                                        {
+                                            deptMasterId = parentDepart.F_Manager;
+                                        }
+                                    }
+                                }
+                            }
+                            //找到部门负责人就增加审批人
+                            if (!string.IsNullOrEmpty(deptMasterId))
+                            {
+                                var userEntity7 = userIBLL.GetEntityByUserId(deptMasterId);
+
+                                if (null != userEntity7)
+                                {
+                                    if (!list.Exists(m => m.Id == userEntity7.F_UserId))
+                                    {
+                                        list.Add(new NWFUserInfo()
+                                        {
+                                            Id = userEntity7.F_UserId,
+                                            Account = userEntity7.F_Account,
+                                            Name = userEntity7.F_RealName
+                                        });
+                                    }
+
+                                }
+
                             }
                             break;
                     }