diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreOnlineController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreOnlineController.cs
new file mode 100644
index 000000000..9ad9d7fd8
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreOnlineController.cs	
@@ -0,0 +1,1244 @@
+using Hangfire;
+using Learun.Application.Base.SystemModule;
+using Learun.Application.Organization;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Util;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-06-14 11:02
+    /// 描 述：考试成绩同步
+    /// </summary>
+    public class StuScoreOnlineController : MvcControllerBase
+    {
+        private StuScoreOnlineIBLL stuScoreOnlineIBLL = new StuScoreOnlineBLL();
+        //暂时注释
+        //private StuScoreOnlineNotPassIBLL stuScoreOnlineNotPassIBLL = new StuScoreOnlineNotPassBLL();
+        //private StuScoreOnlineNotPassTwoIBLL stuScoreOnlineNotPassTwoIBLL = new StuScoreOnlineNotPassTwoBLL();
+        private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+        private CdMajorIBLL cdMajorIBLL = new CdMajorBLL();
+        private UserIBLL userIBLL = new UserBLL();
+        private EADateArrangeIBLL eADateArrangeIBLL = new EADateArrangeBLL();
+        private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
+
+
+        #region  视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        [HttpGet]
+        public ActionResult Monitor()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面【班级学生成绩初始化】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ClassIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 班级成绩查看页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ScoreQueryIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 毕业证资格审核
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ScoreQueryAllIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 个人成绩查看
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StuScoreOnlineQueryIndex()
+        {
+            var logininfo = LoginUserInfo.Get();
+            ViewBag.StuNo = logininfo.account;
+            return View();
+        }
+        /// <summary>
+        /// 毕业证资格审核(班主任)
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ScoreQueryAllIndexTeacher()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 全院班级成绩查看页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AllScoreQueryIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 新版成绩录入
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult InputScoreIndex()
+        {
+            //获取“教学工作安排”中“线上成绩录入”的记录
+            var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("线上成绩录入");
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                ViewBag.CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                ViewBag.CanInputFlag = false;
+            }
+
+            return View();
+        }
+        /// <summary>
+        /// 新版成绩录入
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult InputScoreIndexInTeacher()
+        {
+            //获取“教学工作安排”中“线上成绩录入”的记录
+            var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("线上成绩录入");
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                ViewBag.CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                ViewBag.CanInputFlag = false;
+            }
+
+            return View();
+        }
+
+        /// <summary>
+        /// 成绩统计分析
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ScoreStatisticAnalysis()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 毕业学生成绩查看页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult GraduateScoreQueryAllIndex()
+        {
+            return View();
+        }
+
+
+
+        /// <summary>
+        /// 学生成绩录入可去审核页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ScoreInputCancelIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 学生成绩录入可去审核页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ScoreInputCancelForm()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 全院学生成绩查看页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AllStuScoreOnlineQueryIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 全院学生成绩打印
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AllStuScoreOnlineQueryPrint()
+        {
+            ViewBag.WebApi = ConfigurationManager.AppSettings["WebApi"];
+            return View();
+        }
+
+
+        /// <summary>
+        /// 成绩录入导入
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult InputScoreIndexInTeacherImport()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = stuScoreOnlineIBLL.GetList(queryJson).OrderBy(a => a.StuNo);
+            return Success(data);
+        }
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetMonitorList(string queryJson)
+        {
+            var data = stuScoreOnlineIBLL.GetMonitorList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuScoreOnlineIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = stuScoreOnlineIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreInputCancelPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+
+            var aa = JsonConvert.DeserializeObject<StuScoreOnlineEntity>(queryJson);
+
+            var data = new List<StuScoreOnlineEntity>();
+            if (!string.IsNullOrEmpty(aa.AcademicYearNo) || !string.IsNullOrEmpty(aa.Semester) || !string.IsNullOrEmpty(aa.EmpNo) || !string.IsNullOrEmpty(aa.LessonNo) || !string.IsNullOrEmpty(aa.ClassNo) || !string.IsNullOrEmpty(aa.StuNo))
+            {
+                data = stuScoreOnlineIBLL.GetScoreInputCancelPageList(paginationobj, queryJson).ToList();
+            }
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <param name="pagination">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreInputCancelFormData(string keyValue)
+        {
+            var data = stuScoreOnlineIBLL.GetEntity(keyValue);
+            var StuSelectLessonListData = stuScoreOnlineIBLL.GetStuSelectLessonListEntity(data);
+            var jsonData = new
+            {
+                StuScoreOnline = data,
+                StuSelectLessonList = StuSelectLessonListData
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetEntityByJson(string queryJson)
+        {
+            var data = stuScoreOnlineIBLL.GetEntityByJson(queryJson);
+            return Success(data);
+        }
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuScoreOnlineIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult Submit(string AcademicYearNo, string Semester, string LessonNo, string EmpNo, string EditUserId)
+        {
+            stuScoreOnlineIBLL.SubmitStuScoreOnline(AcademicYearNo, Semester, LessonNo, EmpNo);
+            var userEntity = userIBLL.GetEntityByAccount(EditUserId);
+            if (userEntity != null)
+            {
+                var name = userEntity.F_Account + "_" + userEntity.F_RealName + "_线上成绩录入";
+                
+                //删除任务
+                RecurringJob.RemoveIfExists(name);
+            }
+            return Success("操作成功！");
+        }
+
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteList()
+        {
+            stuScoreOnlineIBLL.DeleteList();
+            return Success("清空成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, StuScoreOnlineEntity entity)
+        {
+            stuScoreOnlineIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 获取班级成绩初始化分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListAboutClass(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuScoreOnlineIBLL.GetPageListAboutClass(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 班级学生成绩录入初始化
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoInitAboutClass(string academicYearNo, string semester, string classNo)
+        {
+            stuScoreOnlineIBLL.DoInitAboutClass(academicYearNo, semester, classNo);
+            return Success("初始化成功！");
+        }
+
+        /// <summary>
+        /// 学年下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetAcademicYearNoData()
+        {
+            var data = stuScoreOnlineIBLL.GetAcademicYearNoData();
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 学期下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetSemesterData()
+        {
+            var data = WebHelper.GenerateNearBySemeter();
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 学期下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetSemesterDataTwo()
+        {
+            var data = WebHelper.GenerateNearBySemeterTwo();
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 班级下拉框信息【成绩录入新页面】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetClassNoDataOfAll(string lessonNo)
+        {
+            var data = stuScoreOnlineIBLL.GetClassNoData("", "", lessonNo);
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 班级下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetClassNoData(string lessonNo)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            var data = stuScoreOnlineIBLL.GetClassNoData(loginInfo.account, loginInfo.Description, lessonNo);
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 班级下拉框信息【成绩录入】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetClassNoDataForInput(string lessonNo, string AcademicYearShort, string Semester)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            // var semesterAndYear = Common.GetSemesterAndYear();
+            var data = stuScoreOnlineIBLL.GetClassNoDataForInput(loginInfo.account, loginInfo.Description, lessonNo, AcademicYearShort, Semester);
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 班级下拉框信息【全院班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetAllClassNoData()
+        {
+            var data = stuScoreOnlineIBLL.GetClassNoData("", "", "");
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 教师下拉框信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetEmpNoDataOfAll(string lessonNo)
+        {
+            var data = stuScoreOnlineIBLL.GetEmpNoData("", "", lessonNo);
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 教师下拉框信息【学生成绩录入可去审核】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetEmpNoData(string lessonNo)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            var data = stuScoreOnlineIBLL.GetEmpNoData(loginInfo.account, loginInfo.Description, lessonNo);
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 课程下拉框信息【学生成绩录入可去审核】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetLessonNoDataOfAll()
+        {
+            var loginInfo = LoginUserInfo.Get();
+            var data = stuScoreOnlineIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description);
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 课程下拉框 带编号
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetLessonNoDataOfAllWithNo()
+        {
+            var data = stuScoreOnlineIBLL.GetLessonNoDataOfAll("", "");
+            foreach (var item in data)
+            {
+                item.text = string.Format("{0}({1})", item.text, item.value);
+            }
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 课程下拉框 带编号
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetLessonNoDataWithNo(string AcademicYearShort, string Semester)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            //var semesterAndYear = Common.GetSemesterAndYear();
+            var data = stuScoreOnlineIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description, AcademicYearShort, Semester);
+            foreach (var item in data)
+            {
+                item.text = string.Format("{0}({1})", item.text, item.value);
+            }
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 选修课程下拉框 带编号【选修课】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetElectiveLessonNoDataOfAllWithNo()
+        {
+            var data = stuScoreOnlineIBLL.GetElectiveLessonNoDataOfAll("", "");
+            foreach (var item in data)
+            {
+                item.text = string.Format("{0}({1})", item.text, item.value);
+            }
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 选修课程下拉框 带编号【选修课】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetElectiveLessonNoDataWithNo(string AcademicYearShort, string Semester)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            //var semesterAndYear = Common.GetSemesterAndYear();
+            var data = stuScoreOnlineIBLL.GetElectiveLessonNoDataOfAll(loginInfo.account, loginInfo.Description, AcademicYearShort, Semester);
+            foreach (var item in data)
+            {
+                item.text = string.Format("{0}({1})", item.text, item.value);
+            }
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 教室下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetElectiveClassRoomNoDataOfAll(string lessonNo)
+        {
+            var data = stuScoreOnlineIBLL.GetElectiveClassRoomNoData("", "", lessonNo);
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 教室下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetElectiveClassRoomNoData(string lessonNo)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            var data = stuScoreOnlineIBLL.GetElectiveClassRoomNoData(loginInfo.account, loginInfo.Description, lessonNo);
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 节次下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetElectiveLessonSectionDataOfAll(string classRoomNo)
+        {
+            var data = stuScoreOnlineIBLL.GetElectiveLessonSectionData("", "", classRoomNo);
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 节次下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetElectiveLessonSectionData(string classRoomNo)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            var data = stuScoreOnlineIBLL.GetElectiveLessonSectionData(loginInfo.account, loginInfo.Description, classRoomNo);
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 课程信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetLessonNoData(string academicYearNo, string semester, string classNo)
+        {
+            var data = stuScoreOnlineIBLL.GetLessonNoData(academicYearNo, semester, classNo).OrderBy(x => x.value);
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 根据StuNo查询班级课程
+        /// </summary>
+        /// <param name="academicYearNo"></param>
+        /// <param name="semester"></param>
+        /// <param name="StuNo"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetLessonNoDataFromStuNo(string academicYearNo, string semester, string StuNo)
+        {
+            var data = stuScoreOnlineIBLL.GetLessonNoDataFromStuNo(academicYearNo, semester, StuNo).OrderBy(x => x.value);
+
+            return Success(data);
+        }
+
+        /// <summary>
+        /// 获取班级成绩列表
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreListByClassNo(string queryJson)
+        {
+            var data = stuScoreOnlineIBLL.GetScoreListByClassNo(queryJson);
+            var stuData = stuInfoBasicIBLL.GetAllList();
+
+            var aa = data.GroupBy(x => new { x.StuNo, x.StuName, x.StuId }).Select(x => new
+            {
+                StuId = x.Key.StuId,
+                StuNo = x.Key.StuNo,
+                StuName = x.Key.StuName,
+                FinishSchoolMark = stuData.FirstOrDefault(a => a.StuNo == x.Key.StuNo)?.FinishSchoolMark,
+                TotalScore = x.Select(y => y.Score).Sum(),
+                LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo)
+            }).OrderByDescending(x => x.TotalScore);
+
+            var result = new List<Dictionary<string, string>>();
+            foreach (var item in aa)
+            {
+                var aaa = new Dictionary<string, string>();
+                aaa.Add("StuId", item.StuId);
+                aaa.Add("StuNo", item.StuNo);
+                aaa.Add("StuName", item.StuName);
+                aaa.Add("FinishSchoolMark", item.FinishSchoolMark);
+                aaa.Add("TotalScore", item.TotalScore.ToString());
+                foreach (var lessonInfoItem in item.LessonInfo)
+                {
+                    aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.ScoreFormat);
+                }
+
+                result.Add(aaa);
+            }
+
+            return Success(result);
+        }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreListByStuNo(string queryJson)
+        {
+            var data = stuScoreOnlineIBLL.GetScoreListByStuNo(queryJson);
+            var stuData = stuInfoBasicIBLL.GetAllList();
+
+            var aa = data.GroupBy(x => new { x.StuNo, x.StuName, x.StuId }).Select(x => new
+            {
+                StuId = x.Key.StuId,
+                StuNo = x.Key.StuNo,
+                StuName = x.Key.StuName,
+                FinishSchoolMark = stuData.FirstOrDefault(a => a.StuNo == x.Key.StuNo)?.FinishSchoolMark,
+                TotalScore = x.Where(m => m.LessonSortNo == "1").Select(y => y.Score).Sum(),
+                LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo)
+            }).OrderByDescending(x => x.TotalScore);
+
+            var result = new List<Dictionary<string, string>>();
+            foreach (var item in aa)
+            {
+                var aaa = new Dictionary<string, string>();
+                aaa.Add("StuId", item.StuId);
+                aaa.Add("StuNo", item.StuNo);
+                aaa.Add("StuName", item.StuName);
+                aaa.Add("FinishSchoolMark", item.FinishSchoolMark);
+                aaa.Add("TotalScore", item.TotalScore.ToString());
+                foreach (var lessonInfoItem in item.LessonInfo)
+                {
+                    aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.ScoreFormat);
+                }
+
+                result.Add(aaa);
+            }
+
+            return Success(result);
+        }
+
+        /// <summary>
+        /// 全院学生成绩查看
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreListByStuInfo(string queryJson)
+        {
+            var data = stuScoreOnlineIBLL.GetScoreListByStuInfo(queryJson);
+            if (data.Any())
+            {
+                data = data.OrderByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester).ThenBy(x => x.LessonSortNo).ThenBy(x => x.LessonNo);
+            }
+
+            return Success(data);
+        }
+
+        public ActionResult GetScoreCharts(string AcademicYearNo, string Semester, string ClassNo, string LessonNo)
+        {
+            var data = stuScoreOnlineIBLL.GetScoreCharts(AcademicYearNo, Semester, ClassNo, LessonNo);
+            return Success(data);
+        }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreInfo(string queryJson)
+        {
+            var data = stuScoreOnlineIBLL.GetScoreInfo(queryJson);
+            return JsonResult(data);
+        }
+
+        /// <summary>
+        /// 导出班级成绩列表
+        /// </summary>
+        /// <returns></returns>
+        //[HttpGet]
+        //[AjaxOnly]
+        [HttpPost, ValidateInput(false)]
+        public ActionResult ExportScoreListByClassNo(string queryJson)
+        {
+            var queryModel = JsonConvert.DeserializeObject<QueryModel>(queryJson);
+            var className = string.Empty;
+            if (!string.IsNullOrEmpty(queryModel.ClassNo))
+            {
+                var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(queryModel.ClassNo);
+                className = classInfoEntity != null ? classInfoEntity.ClassName : string.Empty;
+            }
+
+            var data = stuScoreOnlineIBLL.GetScoreListByClassNo(queryJson);
+            var aa = data.GroupBy(x => new { x.StuNo, x.StuName }).Select(x => new
+            {
+                StuNo = x.Key.StuNo,
+                StuName = x.Key.StuName,
+                TotalScore = x.Select(y => y.Score).Sum(),
+                LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo)
+            }).OrderByDescending(x => x.TotalScore);
+            var result = new List<Dictionary<string, string>>();
+            foreach (var item in aa)
+            {
+                var aaa = new Dictionary<string, string>();
+                aaa.Add("StuNo", item.StuNo);
+                aaa.Add("StuName", item.StuName);
+                aaa.Add("TotalScore", item.TotalScore.ToString());
+                foreach (var lessonInfoItem in item.LessonInfo)
+                {
+                    aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.ScoreFormat);
+                }
+
+                result.Add(aaa);
+            }
+            var resultStr = JsonConvert.SerializeObject(result);
+
+            //班级成绩源
+            var exportTable = resultStr.ToTable();
+            //设置导出格式
+            ExcelConfig excelconfig = new ExcelConfig();
+            excelconfig.Title = className + " 班级成绩列表";
+            excelconfig.TitleFont = "微软雅黑";
+            excelconfig.TitlePoint = 20;
+            excelconfig.FileName = className + " 班级成绩导出.xls";
+            excelconfig.IsAllSizeColumn = true;
+            //每一列的设置,没有设置的列信息，系统将按datatable中的列名导出
+            excelconfig.ColumnEntity = new List<ColumnModel>();
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StuNo", ExcelColumn = "学号" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StuName", ExcelColumn = "姓名" });
+            excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "TotalScore", ExcelColumn = "总分" });
+
+            //课程动态列
+            var lessonTemp = stuScoreOnlineIBLL.GetLessonNoData(queryModel.AcademicYearNo, queryModel.Semester, queryModel.ClassNo).OrderBy(x => x.value);
+            foreach (var lessonTempItem in lessonTemp)
+            {
+                excelconfig.ColumnEntity.Add(new ColumnModel() { Column = lessonTempItem.value, ExcelColumn = lessonTempItem.text });
+            }
+
+            //调用导出方法
+            ExcelHelper.ExcelDownload(exportTable, excelconfig);
+
+            return Success("导出成功！");
+        }
+        /// <summary>
+        /// 查询条件模型【班级成绩查看】
+        /// </summary>
+        public class QueryModel
+        {
+            public string AcademicYearNo { get; set; }
+            public string Semester { get; set; }
+            public string ClassNo { get; set; }
+        }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetStuGraduateInfo(string queryJson)
+        {
+            var data = stuScoreOnlineIBLL.GetStuGraduateInfo(queryJson);
+            return JsonResult(data);
+        }
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPassInfo(string queryJson)
+        {
+            var data = stuScoreOnlineIBLL.GetPassInfo(queryJson);
+            return JsonResult(data);
+        }
+
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetClassOfMy()
+        {
+            var data = stuScoreOnlineIBLL.GetClassOfMy();
+            return JsonResult(data);
+        }
+
+
+
+        /// <summary>
+        /// 获取打印成绩单数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreListByStuNoList(string stuNoList)
+        {
+            var dataList = new List<object>();
+            var stuNoArr = stuNoList.Split(',');
+            foreach (var stuNo in stuNoArr)
+            {
+                var stuInfoBasicEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(stuNo);
+                if (stuInfoBasicEntity != null)
+                {
+                    var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(stuInfoBasicEntity.ClassNo);
+                    var cdMajorEntity = cdMajorIBLL.GetCdMajorEntityByMajorNo(stuInfoBasicEntity.MajorNo);
+                    var scoreList = stuScoreOnlineIBLL.GetAllScoreListByStuNo(stuNo);
+                    var scoreListOfSortNo1 = scoreList.Where(x => x.LessonSortNo == "1");   //必修课
+                    if (scoreListOfSortNo1.Any())
+                    {
+                        foreach (var item in scoreListOfSortNo1)
+                        {
+                            if ((item.Score >= 0 && item.Score < 60) || item.Score == (-5) || item.Score == (-10))
+                            {
+                                item.StuNo = stuNo;
+                                var scoreNotPassEntity = stuScoreOnlineIBLL.GetScoreNotPassByEntity(item);
+                                if (scoreNotPassEntity != null)
+                                {
+                                    item.Score = scoreNotPassEntity.Score;
+                                    if ((scoreNotPassEntity.Score >= 0 && scoreNotPassEntity.Score < 60) || scoreNotPassEntity.Score == (-5) || scoreNotPassEntity.Score == (-10))
+                                    {
+                                        scoreNotPassEntity.StuNo = stuNo;
+                                        var scoreNotPassTwoEntity = stuScoreOnlineIBLL.GetScoreNotPassTwoByEntity(scoreNotPassEntity);
+                                        if (scoreNotPassTwoEntity != null)
+                                        {
+                                            item.Score = scoreNotPassTwoEntity.Score;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    var list = scoreList.GroupBy(x => new { x.AcademicYearNo, x.Semester }).Select(x => new
+                    {
+                        academicYearNo = x.Key.AcademicYearNo,
+                        semester = x.Key.Semester,
+                        title = string.Format("{0}学年度第{1}学期", x.Key.AcademicYearNo, x.Key.Semester),
+                        list = x.Select(y => new
+                        {
+                            type = y.LessonSortNo == "1" ? "专业课" : y.LessonSortNo == "2" ? "选修课" : "公共课",
+                            className = y.LessonName,
+                            achievement = y.Score.HasValue ? y.Score.Value.ToString() : string.Empty,
+                            lessonNo = y.LessonNo
+                        }).OrderBy(y => y.lessonNo)
+                    }).OrderByDescending(x => x.academicYearNo).OrderByDescending(x => x.semester);
+
+                    var data = new
+                    {
+                        schoolId = stuInfoBasicEntity.F_SchoolId,
+                        school = string.Empty,
+                        major = cdMajorEntity != null ? cdMajorEntity.MajorName : string.Empty,
+                        className = classInfoEntity != null ? classInfoEntity.ClassName : string.Empty,
+                        student = stuInfoBasicEntity.StuName,
+                        number = stuInfoBasicEntity.StuNo,
+                        arrangementId = stuInfoBasicEntity.EduSystem,
+                        arrangement = string.Empty,
+                        list = list.Select(x => new { x.title, list = x.list.Select(y => new { y.type, y.className, y.achievement }) })
+                    };
+
+                    dataList.Add(data);
+                }
+            }
+
+            return Success(dataList);
+        }
+
+        /// <summary>
+        /// 审核学生成绩
+        /// </summary>
+        /// <param name="keyValue">成绩主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult CheckStuScoreOnline(string keyValue)
+        {
+            stuScoreOnlineIBLL.CheckStuScoreOnline(keyValue);
+            return Success("操作成功！");
+        }
+        /// <summary>
+        /// 去审核学生成绩
+        /// </summary>
+        /// <param name="keyValue">成绩主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult UnCheckStuScoreOnline(string keyValue)
+        {
+            stuScoreOnlineIBLL.UnCheckStuScoreOnline(keyValue);
+            return Success("操作成功！");
+        }
+
+        /// <summary>
+        /// 开始录入：占用成绩
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult StartInputScore(string queryJson)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            var name = loginInfo.account + "_" + loginInfo.realName + "_线上成绩录入";
+
+            stuScoreOnlineIBLL.StartInputScore(queryJson);
+
+            //添加任务
+            //RecurringJob.AddOrUpdate(name,
+            //                        () => SaveInputScoreStatus2(queryJson, name),
+            //                        Cron.MinuteInterval(3), TimeZoneInfo.Local);
+            //var m = DateTime.Now.Minute + 30;
+            //if (m >= 60)
+            //{
+            //    m = m - 60;
+            //}
+            var newDate = DateTime.Now.AddMinutes(30);
+            RecurringJob.AddOrUpdate(name,
+                                    () => SaveInputScoreStatus2(queryJson, name),
+                                    string.Format("{0} {1} * * *", newDate.Minute, newDate.Hour), TimeZoneInfo.Local);
+            return Success("操作成功");
+        }
+        /// <summary>
+        /// 续时
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult AddMinutes(string queryJson, int minutes)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            var name = loginInfo.account + "_" + loginInfo.realName + "_线上成绩录入";
+
+            //更新任务
+            //var m = DateTime.Now.Minute + minutes;
+            //if (m >= 60)
+            //{
+            //    m = m - 60;
+            //}
+            var newDate = DateTime.Now.AddMinutes(minutes);
+            RecurringJob.AddOrUpdate(name,
+                                    () => SaveInputScoreStatus2(queryJson, name),
+                                    string.Format("{0} {1} * * *", newDate.Minute, newDate.Hour), TimeZoneInfo.Local);
+            return Success("操作成功");
+        }
+
+        /// <summary>
+        /// 提交成绩
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SaveInputScore(string data)
+        {
+            var list = JsonConvert.DeserializeObject<List<StuScoreOnlineEntity>>(data);
+            if (list.Any())
+            {
+                stuScoreOnlineIBLL.SaveInputScore(list);
+            }
+            return Success("操作成功");
+        }
+        /// <summary>
+        /// 提交成绩：取消占用
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SaveInputScoreStatus(string queryJson)
+        {
+            var loginInfo = LoginUserInfo.Get();
+            var name = loginInfo.account + "_" + loginInfo.realName + "_线上成绩录入";
+            
+            stuScoreOnlineIBLL.SaveInputScoreStatus(queryJson);
+            //删除任务
+            RecurringJob.RemoveIfExists(name);
+
+            return Success("操作成功");
+        }
+        /// <summary>
+        /// 提交成绩：取消占用【服务】
+        /// <summary>
+        /// <returns></returns>
+        public ActionResult SaveInputScoreStatus2(string queryJson, string name)
+        {
+            stuScoreOnlineIBLL.SaveInputScoreStatus2(queryJson, name);
+            //删除任务
+            RecurringJob.RemoveIfExists(name);
+
+            return Success("操作成功");
+        }
+
+        /// <summary>
+        /// 审核成绩
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <param name="checkMark">已审核：1；未审核：0；</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCheckScore(string queryJson, int checkMark)
+        {
+            stuScoreOnlineIBLL.DoCheckScore(queryJson, checkMark);
+            return Success("操作成功");
+        }
+
+
+        #endregion
+
+        #region 成绩录入--导入
+        /// <summary>
+        /// 成绩导入---下载导入模板
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="columnJson">表头</param>
+        /// <param name="dataJson">列表数据</param>
+        [HttpPost, ValidateInput(false)]
+        public void ExportExcel(string fileName, string columnJson, string dataJson)
+        {
+            //设置导出格式
+            ExcelConfig excelconfig = new ExcelConfig();
+            //excelconfig.Title = Server.UrlDecode(fileName);
+            excelconfig.TitleFont = "微软雅黑";
+            excelconfig.TitlePoint = 15;
+            excelconfig.FileName = Server.UrlDecode(fileName) + ".xls";
+            excelconfig.IsAllSizeColumn = true;
+            excelconfig.ColumnEntity = new List<ColumnModel>();
+            //表头
+            List<jfGridModel> columnList = columnJson.ToList<jfGridModel>();
+            //行数据
+            DataTable rowData = dataJson.ToTable();
+            ////写入Excel表头
+            //Dictionary<string, string> exportFieldMap = new Dictionary<string, string>();
+            //if (!string.IsNullOrEmpty(exportField))
+            //{
+            //    string[] exportFields = exportField.Split(',');
+            //    foreach (var field in exportFields)
+            //    {
+            //        if (!exportFieldMap.ContainsKey(field))
+            //        {
+            //            exportFieldMap.Add(field, "1");
+            //        }
+            //    }
+            //}
+
+            foreach (jfGridModel columnModel in columnList)
+            {
+                //if (exportFieldMap.ContainsKey(columnModel.name) || string.IsNullOrEmpty(exportField))
+                //{
+                excelconfig.ColumnEntity.Add(new ColumnModel()
+                {
+                    Column = columnModel.name,
+                    ExcelColumn = columnModel.label,
+                    Alignment = columnModel.align,
+                });
+
+                // }
+            }
+            ExcelHelper.ExcelDownload(rowData, excelconfig);
+        }
+
+        /// <summary>
+        /// 成绩导入
+        /// </summary>
+        /// <param name="type">1必修；2选修；3补考成绩；4二次补考成绩</param>
+        /// <param name="fileGuid"></param>
+        /// <param name="chunks"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public ActionResult ExecuteImportExcel(int type, string fileGuid, int chunks, string queryJson)
+        {
+            string path = annexesFileIBLL.SaveAnnexes(fileGuid, fileGuid, chunks, LoginUserInfo.Get());
+            if (!string.IsNullOrEmpty(path))
+            {
+                DataTable dt = ExcelHelper.ExcelImport(path);
+                (DataTable failDt, int snum, int fnum) res;
+
+                res = stuScoreOnlineIBLL.ExecuteImportExcel(type, dt, fileGuid, queryJson);
+
+                //暂时注释
+                //if (type == 1 || type == 2)
+                //{
+                //    //必修选修
+                //    res = stuScoreOnlineIBLL.ExecuteImportExcel(type, dt, fileGuid, queryJson);
+                //}
+                //else if (type == 3)
+                //{
+                //    //补考
+                //    res = stuScoreOnlineNotPassIBLL.ExecuteImportExcelForNotPass(dt, fileGuid, queryJson);
+                //}
+                //else
+                //{
+                //    //二次补考
+                //    res = stuScoreOnlineNotPassTwoIBLL.ExecuteImportExcelForNotPassTwo(dt, fileGuid, queryJson);
+                //}
+                var data = new
+                {
+                    Success = res.snum,
+                    Fail = res.failDt.Rows.Count
+                };
+                return Success(data);
+            }
+            else
+            {
+                return Fail("导入数据失败!");
+            }
+        }
+
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/InputScoreIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/InputScoreIndex.cshtml
new file mode 100644
index 000000000..2c34f895c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/InputScoreIndex.cshtml	
@@ -0,0 +1,122 @@
+@{ ViewBag.Title = "全院学生线上成绩录入"; Layout = "~/Views/Shared/_Index.cshtml"; }
+<style>
+    .lr-select {
+        width: 150px;
+    }
+
+    #LessonNo {
+        width: 180px;
+    }
+
+    .lr-selectLittle {
+        width: 80px;
+    }
+
+    .lr-layout-tool {
+        height: 80px;
+    }
+
+    .lr-layout-center .lr-layout-wrap.lr-layout-wrap-notitle {
+        padding-top: 80px;
+    }
+
+    .divRow {
+        position: absolute;
+        width: 100%;
+        height: 55px;
+        top: 0;
+        left: 0;
+    }
+
+    .scaleRow {
+        top: 55px;
+        padding: 2px 10px;
+        height: 25px;
+    }
+
+        .scaleRow .timeBox {
+            float: right;
+            padding-right: 30px;
+        }
+
+        .scaleRow .tipBox {
+            display: inline-block;
+            color: #ff0000;
+            margin-left: 10px;
+        }
+
+    #addMinutesBtn {
+        display: inline-block;
+        cursor: pointer;
+        background-color: blue;
+        color: #fff;
+        padding: 1px 5px;
+        border-radius: 4px;
+    }
+</style>
+<div class="lr-layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="selectRow divRow">
+                    <div class="lr-layout-tool-left">
+                        <div class="lr-layout-tool-item">
+                            <div id="F_SchoolId" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="AcademicYearNo" type="lrselect" class="lr-select lr-selectLittle"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="Semester" type="lrselect" class="lr-select lr-selectLittle"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="LessonNo" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="EmpNo" type="lrselect" class="lr-select"></div>
+                        </div>
+
+                        <div class="lr-layout-tool-item">
+                            <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-right">
+                        <div class="btn-group btn-group-sm">
+                            <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                        </div>
+                        <div class=" btn-group btn-group-sm" learun-authorize="yes" id="btnBox">
+                            <a id="lr_input" class="btn btn-default"><i class="fa fa-edit">&nbsp;开始录入</i></a>
+                            <a id="lr_save" class="btn btn-default" style="display:none;"><i class="fa fa-edit">&nbsp;提交成绩</i></a>
+                            <a id="lr_check" class="btn btn-default"><i class="fa fa-lock">&nbsp;审核</i></a>
+                            <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-lock">&nbsp;取消审核</i></a>
+                            @*<a id="lr_setScale" class="btn btn-default"><i class="fa fa-edit">&nbsp;设置成绩比例</i></a>*@
+                            <a id="lr_importScore" class="btn btn-default"><i class="fa fa-edit">&nbsp;导入更新</i></a>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="scaleRow divRow">
+                    @*<span>比例设置：</span>
+                    <span>平时成绩占比 <span id="OrdinaryScoreScale">0</span> %，</span>
+                    <span>期中成绩占比 <span id="TermInScoreScale">0</span> %，</span>
+                    <span>期末成绩占比 <span id="TermEndScoreScale">0</span> %，</span>
+                    <span>其他成绩占比 <span id="OtherScoreScale">0</span> %</span>*@
+                    <div class="tipBox">提示：录入完成后，请务必点击“提交成绩”按钮，避免成绩丢失！</div>
+                    <div class="timeBox" style="display:none;">
+                        倒计时：
+                        <span id="minutes" data-minutes="30"></span>分钟（<span id="seconds" data-seconds="60"></span>秒）
+                        <div id="addMinutesBtn" data-minutes="30">续时</div>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreOnline/InputScoreIndex.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是线上成绩录入时间！', function (res) {});
+    }
+</script>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/InputScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/InputScoreIndex.js
new file mode 100644
index 000000000..7ae6b5bea
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/InputScoreIndex.js	
@@ -0,0 +1,553 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2023-06-12 11:02
+ * 描  述：全院学生线上成绩录入
+ */
+var selectedRow;
+var refreshGirdData;
+var refreshGirdData2;
+var judgeSelect;    //判断下拉框是否选择
+var modifyDate; //成绩被占用，且是登录用户时，成绩表中的编辑时间；
+var timer;  //计时器
+var submitScoreTimer;   //五分钟提交成绩计时器
+var headData;   //常规列头
+var headDataEdit;   //可编辑列头
+var headDataNoEdit;     //不可编辑列头
+var headDataFinally;    //最终列头
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            headData = [
+                {
+                    label: "审核状态", name: "CheckMark", width: 80, align: "center",
+                    formatter: function (cellvalue) {
+                        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
+                    }
+                },
+                { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
+                { label: '学期', name: 'Semester', width: 40, align: "left" },
+                { label: '课程名称', name: 'LessonName', width: 150, align: "left" },
+                {
+                    label: "学校名称", name: "F_SchoolId", width: 100, 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: "DeptNo", width: 100, align: "left",
+                    formatterAsync: function (callback, value, row, op, $cell) {
+                        learun.clientdata.getAsync('custmerData', {
+                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                            key: value,
+                            keyId: 'deptno',
+                            callback: function (_data) {
+                                callback(_data['deptname']);
+                            }
+                        });
+                    }
+                },
+                {
+                    label: "专业", name: "MajorNo", width: 100, align: "left",
+                    formatterAsync: function (callback, value, row, op, $cell) {
+                        learun.clientdata.getAsync('custmerData', {
+                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                            key: value,
+                            keyId: 'majorno',
+                            callback: function (_data) {
+                                callback(_data['majorname']);
+                            }
+                        });
+                    }
+                },
+                {
+                    label: "班级", name: "ClassNo", width: 100, align: "left",
+                    formatterAsync: function (callback, value, row, op, $cell) {
+                        learun.clientdata.getAsync('custmerData', {
+                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                            key: value,
+                            keyId: 'classno',
+                            callback: function (_data) {
+                                callback(_data['classname']);
+                            }
+                        });
+                    }
+                },
+                { label: '学生姓名', name: 'StuName', width: 100, align: "left" },
+                { label: '学生学号', name: 'StuNo', width: 100, align: "left" },
+            ];
+            headDataEdit = [
+                {
+                    label: '成绩', name: 'TermEndScore', width: 80, align: "left",
+                    edit: {
+                        type: 'input',
+                        inputType: 'number',
+                        change: function (row, rownum) {
+                            row.Score = (parseFloat(row.TermEndScore || '0') * 1).toFixed(2);
+                            $('#gridtable').jfGridSet('updateRow', rownum);
+                        },
+                    }
+                },
+                { label: '最终核定成绩', name: 'Score', width: 80, align: "left" },
+                {
+                    label: '备注', name: 'Remark', width: 100, align: "left",
+                    edit: {
+                        type: 'input',
+                    }
+                },
+            ];
+            headDataNoEdit = [
+                {
+                    label: '成绩', name: 'TermEndScore', width: 80, align: "left"
+                },
+                { label: '最终核定成绩', name: 'Score', width: 80, align: "left" },
+                {
+                    label: '备注', name: 'Remark', width: 100, align: "left"
+                },
+            ];
+            headDataFinally = headData.concat(headDataNoEdit);
+
+            page.initGird();
+            page.bind();
+            page.bindSelect();
+        },
+        bind: function () {
+            //多条件选择
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 500);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //查询
+            $('#btn_Search').on('click', function () {
+                refreshGirdData2();
+            });
+            //设置成绩比例（暂时未使用未修改）
+            $('#lr_setScale').on('click', function () {
+                var query = judgeSelect();
+                if (query) {
+                    $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/OpenLessonPlan/GetOpenLessonPlanEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                        if (data["OpenLessonPlan"] != null) {
+                            if (data["OpenLessonPlan"].IsAllowEdit) {   //教务允许成绩录入时编辑比例
+                                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/OpenLessonPlan/GetStuSelectLessonListEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                                    if (data["StuSelectLessonList"] != null) {
+                                        $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                                            if (data != null) {
+                                                if (data.CheckMark == 1) {  //学生成绩已审核
+                                                    learun.alert.warning("学生成绩已审核！");
+                                                    return false;
+                                                } else {
+                                                    learun.layerForm({
+                                                        id: 'FormOfClass',
+                                                        title: '班级成绩比例设置',
+                                                        url: top.$.rootUrl + '/EducationalAdministration/OpenLessonPlan/FormOfClass?F_SchoolId=' + query.F_SchoolId + '&AcademicYearNo=' + query.AcademicYearNo + '&Semester=' + query.Semester + '&LessonNo=' + query.LessonNo + '&ClassNo=' + query.ClassNo,
+                                                        width: 600,
+                                                        height: 400,
+                                                        callBack: function (id) {
+                                                            return top[id].acceptClick(refreshGirdData2);
+                                                        }
+                                                    });
+                                                }
+                                            } else {
+                                                learun.alert.warning("学生成绩不存在！");
+                                                return false;
+                                            }
+                                        });
+                                    } else {
+                                        learun.alert.warning("学生选课数据不存在！");
+                                        return false;
+                                    }
+                                });
+                            } else {
+                                learun.alert.warning("教务不允许设置成绩比例！");
+                                return false;
+                            }
+                        } else {
+                            learun.alert.warning("开课计划不存在！");
+                            return false;
+                        }
+                    });
+                }
+            });
+            // 开始录入
+            $('#lr_input').on('click', function () {
+                //提示弹框
+                learun.layerConfirm('录入完成后，请务必点击“提交成绩”按钮，避免成绩丢失！', function (res) {
+                    if (res) {
+
+                        var query = judgeSelect();
+                        if (query) {
+                            //判断成绩比例是否合理
+                            //var OrdinaryScoreScale = $('#OrdinaryScoreScale').html();
+                            //var TermInScoreScale = $('#TermInScoreScale').html();
+                            //var TermEndScoreScale = $('#TermEndScoreScale').html();
+                            //var OtherScoreScale = $('#OtherScoreScale').html();
+                            //var totalScale = Number(OrdinaryScoreScale) + Number(TermInScoreScale) + Number(TermEndScoreScale) + Number(OtherScoreScale);
+                            //if (totalScale !== 100) {
+                            //    learun.alert.warning("成绩比例设置不合理！");
+                            //    return false;
+                            //} else {
+                                //判断是否已审核；判断是否被其他教师占用
+                                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                                    if (data != null) {
+                                        if (data.CheckMark == 1) {
+                                            learun.alert.warning("学生成绩已审核！");
+                                            return false;
+                                        }
+                                        if (data.IsEditable == 0) {
+                                            if (data.EditUserId == learun.clientdata.get(['userinfo']).account) {
+                                                modifyDate = data.ModifyDate;
+                                            } else {
+                                                learun.alert.warning("当前班级成绩由账号为" + data.EditUserId + "的教师在使用！");
+                                                return false;
+                                            }
+                                        } else {
+                                            //占用成绩
+                                            learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/StartInputScore', { queryJson: JSON.stringify(query) }, function (res) { });
+                                        }
+                                        //显示可编辑列头
+                                        headDataFinally = headData.concat(headDataEdit);
+                                        $("#gridtable")[0].dfop = undefined;
+                                        page.initGird();
+                                        page.search(query);
+                                        //显示“提交成绩”按钮
+                                        $('#lr_save').show();
+                                        //隐藏“开始录入”按钮
+                                        $('#lr_input').hide();
+                                        //显示“倒计时”
+                                        $('.timeBox').show();
+                                        $('#minutes').html($('#minutes').attr('data-minutes'));
+                                        //开始倒计时
+                                        page.countDown();
+                                        //五分钟提交成绩
+                                        page.submitScore();
+                                    } else {
+                                        learun.alert.warning("学生成绩不存在！");
+                                        return false;
+                                    }
+                                });
+                            //}
+                        }
+
+                    }
+                });
+            });
+            //提交成绩
+            $('#lr_save').on('click', function () {
+                var query = judgeSelect();
+                if (query) {
+                    //成绩被占用，且是登录用户时，根据编辑时间判断是否是本人；
+                    $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                        if (data != null) {
+                            if (data.CheckMark == 1) {
+                                learun.alert.warning("学生成绩已审核！");
+                                return false;
+                            }
+                            if (data.IsEditable == 0) {
+                                if (data.EditUserId == learun.clientdata.get(['userinfo']).account) {
+                                    if (modifyDate != null && modifyDate != data.ModifyDate) {
+                                        learun.alert.warning("当前班级成绩被修改，请重新获取！");
+                                        return false;
+                                    }
+                                } else {
+                                    learun.alert.warning("当前班级成绩由账号为" + data.EditUserId + "的教师在使用！");
+                                    return false;
+                                }
+                            } else if (data.IsEditable == 1) {
+                                learun.alert.warning("学生成绩已提交！");
+                                return false;
+                            }
+                            //提交成绩
+                            var rowdatas = $('#gridtable').jfGridGet('rowdatas');
+                            learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/SaveInputScore', { data: JSON.stringify(rowdatas) }, function (res) {
+                                if (res.code == 200) {
+                                    //提交成绩：取消占用
+                                    learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/SaveInputScoreStatus', { queryJson: JSON.stringify(query) }, function (res) {
+                                        if (res.code == 200) {
+                                            refreshGirdData2();
+                                            modifyDate = null;
+                                            //隐藏“提交成绩”按钮
+                                            $('#lr_save').hide();
+                                            //显示“开始录入”按钮
+                                            $('#lr_input').show();
+                                            //隐藏“倒计时”
+                                            $('.timeBox').hide();
+                                            //停止倒计时
+                                            clearInterval(timer);
+                                            //停止五分钟提交成绩
+                                            clearInterval(submitScoreTimer);
+                                        } else {
+                                            learun.alert.warning("提交成绩：取消占用失败！");
+                                            return false;
+                                        }
+                                    });
+                                } else {
+                                    learun.alert.warning("提交成绩失败！");
+                                    return false;
+                                }
+                            });
+
+                        } else {
+                            learun.alert.warning("学生成绩不存在！");
+                            return false;
+                        }
+                    });
+                }
+            });
+            // 审核
+            $('#lr_check').on('click', function () {
+                var query = judgeSelect();
+                if (query) {
+                    $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                        if (data != null) {
+                            if (data.CheckMark == 1) {
+                                learun.alert.warning("学生成绩已审核！");
+                                return false;
+                            }
+                            learun.layerConfirm('是否确认审核当前班级的学生成绩！', function (res) {
+                                if (res) {
+                                    //审核成绩
+                                    learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/DoCheckScore', { queryJson: JSON.stringify(query), checkMark: 1 }, function (res) {
+                                        if (res.code == 200) {
+                                            refreshGirdData2();
+                                        } else {
+                                            learun.alert.warning("审核成绩失败！");
+                                            return false;
+                                        }
+                                    });
+                                }
+                            });
+                        } else {
+                            learun.alert.warning("学生成绩不存在！");
+                            return false;
+                        }
+                    });
+                }
+            });
+            // 去审核
+            $('#lr_uncheck').on('click', function () {
+                var query = judgeSelect();
+                if (query) {
+                    $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                        if (data != null) {
+                            if (data.CheckMark != 1) {
+                                learun.alert.warning("学生成绩未审核！");
+                                return false;
+                            }
+                            learun.layerConfirm('是否确认去审核当前班级的学生成绩！', function (res) {
+                                if (res) {
+                                    //去审核成绩
+                                    learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/DoCheckScore', { queryJson: JSON.stringify(query), checkMark: 0 }, function (res) {
+                                        if (res.code == 200) {
+                                            refreshGirdData2();
+                                        } else {
+                                            learun.alert.warning("去审核成绩失败！");
+                                            return false;
+                                        }
+                                    });
+                                }
+                            });
+                        } else {
+                            learun.alert.warning("学生成绩不存在！");
+                            return false;
+                        }
+                    });
+                }
+            });
+            //续时
+            $('#addMinutesBtn').on('click', function () {
+                var query = judgeSelect();
+                if (query) {
+                    clearInterval(timer);
+                    var addMinutes = $('#addMinutesBtn').attr('data-minutes');
+                    var newMinutes = addMinutes;
+                    var minutes = $('#minutes').html();
+                    if (minutes > 0) {
+                        newMinutes = Number(newMinutes) + Number(minutes);
+                    }
+                    $('#minutes').html(newMinutes);
+                    page.countDown();
+                    //修改服务时间
+                    learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/AddMinutes', { queryJson: JSON.stringify(query), minutes: newMinutes }, function (res) { });
+                }
+            });
+            //导入更新
+            $('#lr_importScore').on('click', function () {
+                //todo:
+            
+            });
+        },
+        bindSelect: function () {
+            //校区
+            $('#F_SchoolId').lrDataSourceSelect({
+                code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) { }
+            });
+            $('#F_SchoolId').lrselectSet(learun.clientdata.get(['userinfo']).companyId);
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetAcademicYearNoData',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
+            //课程
+            $('#LessonNo').lrselect({
+                placeholder: "请选择课程",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetLessonNoDataOfAllWithNo',
+                value: 'value',
+                text: 'text',
+                select: function (item) {
+                    if (!!item) {
+                        $("#EmpNo").lrselectRefresh({
+                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEmpNoDataOfAll?lessonNo=' + item.value,
+                            value: 'value',
+                            text: 'text',
+                        });
+                    }
+                }
+            });
+            //教师
+            $('#EmpNo').lrselect({
+                placeholder: "请选择教师",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetEmpNoDataOfAll',
+                value: 'value',
+                text: 'text'
+            });
+            //绑定学年、学期
+            $.get('/Home/GetYearAndSemesteResult', function (ref) {
+                if (ref.code == "200") {
+                    $('#AcademicYearNo').lrselectSet(ref.data.Item1);
+                    $('#Semester').lrselectSet(ref.data.Item3);
+                }
+            }.bind(this), "json");
+        },
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetList',
+                headData: headDataFinally,
+                mainId: 'ScoreId',
+                isPage: false,
+                sidx: 'StuNo',
+                sord: 'asc'
+            });
+            //page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        searchScale: function (param) {
+            param = param || {};
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/OpenLessonPlan/GetStuSelectLessonListEntityByJson?queryJson=' + JSON.stringify(param), function (data) {
+                if (data["StuSelectLessonList"] != null) {
+                    var ssll = data["StuSelectLessonList"];
+                    $('#OrdinaryScoreScale').html(ssll.OrdinaryScoreScale > 0 ? ssll.OrdinaryScoreScale : 0);
+                    $('#TermInScoreScale').html(ssll.TermInScoreScale > 0 ? ssll.TermInScoreScale : 0);
+                    $('#TermEndScoreScale').html(ssll.TermEndScoreScale > 0 ? ssll.TermEndScoreScale : 0);
+                    $('#OtherScoreScale').html(ssll.OtherScoreScale > 0 ? ssll.OtherScoreScale : 0);
+                } else {
+                    $('#OrdinaryScoreScale').html(0);
+                    $('#TermInScoreScale').html(0);
+                    $('#TermEndScoreScale').html(0);
+                    $('#OtherScoreScale').html(0);
+                }
+            });
+        },
+        countDown: function () {
+            var minutes = $('#minutes').html();
+            var minutesTemp = minutes;
+            var seconds = $('#seconds').attr('data-seconds');
+            $('#seconds').html(seconds);
+            var secondsTemp = seconds;
+            timer = setInterval(function () {
+                secondsTemp--;
+                $('#seconds').html(secondsTemp);
+                if (secondsTemp == 0) {
+                    secondsTemp = seconds;
+                    minutesTemp--;
+                    $('#minutes').html(minutesTemp);
+                    if (minutesTemp == 0) {
+                        //停止倒计时
+                        clearInterval(timer);
+                        //自动提交成绩
+                        $('#lr_save').trigger("click");
+                    }
+                }
+            }, 1000);
+        },
+        submitScore: function () {
+            submitScoreTimer = setInterval(function () {
+                var rowdatas = $('#gridtable').jfGridGet('rowdatas');
+                learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/SaveInputScore', { data: JSON.stringify(rowdatas) }, function (res) {
+                });
+            }, 300000);
+        },
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    refreshGirdData2 = function () {
+        var query = judgeSelect();
+        if (query) {
+            //显示不可编辑列头
+            headDataFinally = headData.concat(headDataNoEdit);
+            $("#gridtable")[0].dfop = undefined;
+            page.initGird();
+
+            page.search(query);
+            //page.searchScale(query);
+        }
+    };
+    judgeSelect = function () {
+        if (CanInputFlag != "True") {
+            top.learun.layerConfirm('当前时间不是线上成绩录入时间！', function (res) { });
+            return false;
+        }
+
+        var $content = $('body').find('.lr-layout-tool-left');
+        var query = $content.lrGetFormData();
+        if (query.F_SchoolId == null || query.F_SchoolId == "") {
+            learun.alert.warning("请选择校区！");
+            return false;
+        }
+        if (query.AcademicYearNo == null || query.AcademicYearNo == "") {
+            learun.alert.warning("请选择学年！");
+            return false;
+        }
+        if (query.Semester == null || query.Semester == "") {
+            learun.alert.warning("请选择学期！");
+            return false;
+        }
+        if (query.LessonNo == null || query.LessonNo == "") {
+            learun.alert.warning("请选择课程！");
+            return false;
+        }
+        if (query.EmpNo == null || query.EmpNo == "") {
+            learun.alert.warning("请选择教师！");
+            return false;
+        }
+        return query;
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/Monitor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/Monitor.cshtml
new file mode 100644
index 000000000..46703b746
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/Monitor.cshtml	
@@ -0,0 +1,38 @@
+@{
+    ViewBag.Title = "线上成绩录入监控管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-select {
+        width: 150px;
+    }
+</style>
+<div class="lr-layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="AcademicYearNo" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="Semester" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;强制提交</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreOnline/Monitor.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/Monitor.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/Monitor.js
new file mode 100644
index 000000000..b772c7a08
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreOnline/Monitor.js	
@@ -0,0 +1,132 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-14 11:02
+ * 描  述：考试成绩同步
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.bind();
+            page.initGird();
+        },
+        bind: function () {
+            //学年
+            $('#AcademicYearNo').lrselect({
+                width: '150px',
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetAcademicYearNoData',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                width: '150px',
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
+            // 查询
+            $('#btn_Search').on('click', function () {
+                page.search({ AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet() });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //强制提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('EmpNo');
+                if (learun.checkrow(keyValue)) {
+                    var IsEditable = $('#gridtable').jfGridValue('IsEditable');
+                    if (IsEditable == "1") {
+                        learun.alert.warning("当前项目无需提交！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认提交该项？未保存的成绩将会丢失！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/Submit',
+                                {
+                                    AcademicYearNo: $('#gridtable').jfGridValue('AcademicYearNo'),
+                                    Semester: $('#gridtable').jfGridValue('Semester'),
+                                    LessonNo: $('#gridtable').jfGridValue('LessonNo'),
+                                    EmpNo: $('#gridtable').jfGridValue('EmpNo'),
+                                    EditUserId: $('#gridtable').jfGridValue('EditUserId'),
+                                },
+                                function () {
+                                    refreshGirdData();
+                                });
+                        }
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreOnline/GetMonitorList',
+                headData: [
+                    {
+                        label: "录入状态", name: "IsEditable", width: 80, align: "center",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">未占用</span>" : "<span class=\"label label-danger\">正在录入</span>";
+                        }
+                    },
+                    { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
+                    { label: '学期', name: 'Semester', width: 40, align: "left" },
+                    { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
+                    { label: '课程名称', name: 'LessonName', width: 150, align: "left" },
+                    { label: '代课教师编号', name: 'EmpNo', width: 100, align: "left" },
+                    {
+                        label: '代课教师姓名', name: 'EmpNo', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_account',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '占用教师编号', name: 'EditUserId', width: 100, align: "left" },
+                    {
+                        label: '占用教师姓名', name: 'EditUserId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_account',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '开始录入日期', name: 'BeginModifyDate', width: 150, align: "left" },
+                    { label: '最后保存日期', name: 'ModifyDate', width: 150, align: "left" },
+
+                ],
+                //mainId: 'ScoreId',
+                isPage: false
+            });
+            //page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+            param.Semester = $('#Semester').lrselectGet();
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.cshtml
index f7c8f9b3c..1f5db5c37 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.cshtml	
@@ -2,7 +2,7 @@
     ViewBag.Title = "选修课课程";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -16,28 +16,40 @@
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
-                                    <div id="Semester" class="form-control"></div>
+                                    <div id="Semester"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="StuNo" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">课程名称</div>
+                                    <div id="LessonNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">建课教师</div>
+                                    <input id="EmpName" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
+                                    <div class="lr-form-item-title">院系</div>
                                     <div id="DeptNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">选课状态</div>
-                                    <div id="ElectiveSelectStatus"></div>
-                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">报名状态</div>
                                     <div id="ElectiveSignUpStatus"></div>
@@ -45,6 +57,9 @@
                             </div>
                         </div>
                     </div>
+                    <div class="lr-layout-tool-item">
+                        <div style="height:28px;line-height:28px;">提示：请输入学年和学期进行查询</div>
+                    </div>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
@@ -56,4 +71,4 @@
         </div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js")
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.js
index a773bbc7e..6498b18c6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.js	
@@ -24,7 +24,7 @@ var bootstrap = function ($, learun) {
                     return;
                 }
                 page.search(queryJson);
-            }, 300, 400);
+            }, 330, 500);
             $('#AcademicYearNo').lrselect({
                 placeholder: "请选择学年",
                 allowSearch: true,
@@ -40,12 +40,58 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#ElectiveSelectStatus').lrDataItemSelect({ code: 'ElectiveSelectStatus' });
-            $('#ElectiveSignUpStatus').lrDataItemSelect({ code: 'ElectiveSignUpStatus' });
+            //数据集不选择线上课程信息，选择选课情况里的课程信息
+            $('#LessonNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElectiveOnline/GetSelectLessonInfo',
+                value: "LessonNo",
+                text: "LessonName"
+            });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by majorno " },
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 order by majorno " },
+                        });
+                    }
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                param: { strWhere: "1=1 order by majorno " },
+                value: "majorno",
+                text: "majorname",
+                select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "majorno='" + item.majorno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
+            $('#ElectiveSignUpStatus').lrDataItemSelect({ code: 'ElectiveSignUpStatus' });
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -54,12 +100,22 @@ var bootstrap = function ($, learun) {
         // 初始化列表
         initGird: function () {
             $('#gridtable').jfGrid({
-                url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList',
+                url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElectiveOnline/GetQueryStuSelectResultList',
                 headData: [
-                    { label: "学年", name: "AcademicYearNo", width: 80, align: "left" },
-                    { label: "学期", name: "Semester", width: 60, align: "left" },
+                    { label: "学年", name: "AcademicYearNo", width: 50, align: "left" },
+                    { label: "学期", name: "Semester", width: 50, align: "left" },
+                    { label: "学号", name: "StuNo", width: 120, align: "left" },
+                    { label: "姓名", name: "StuName", width: 180, align: "left" },
+                    { label: "课程编号", name: "LessonNo", width: 100, align: "left" },
+                    {
+                        label: "课程名称", name: "LessonName", width: 150, align: "left"
+                    },
+                    //{ label: "教师编号", name: "EmpNo", width: 100, align: "left" },
+                    {
+                        label: "建课教师", name: "EmpName", width: 100, align: "left"
+                    },
                     {
-                        label: "校区", name: "F_SchoolId", width: 200, align: "left",
+                        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',
@@ -72,7 +128,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "系所", name: "DeptNo", width: 100, align: "left",
+                        label: "院系", name: "DeptNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
@@ -110,24 +166,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
-                    { label: "姓名", name: "StuName", width: 100, align: "left" },
-                    {
-                        label: "性别", name: "GenderNo", width: 80, align: "left",
-                        formatter: function (cellvalue) {
-                            return cellvalue == true ? "男" : "女";
-                        }
-                    },
-                    {
-                        label: "选课状态", name: "Id", width: 100, align: "left",
-                        formatter: function (cellvalue, row) {
-                            if (cellvalue == null || cellvalue == undefined || cellvalue == "") {
-                                return '<span class=\"label label-default\">未报名</span>';
-                            } else {
-                                return '<span class=\"label label-success\">已报名</span>';
-                            }
-                        }
-                    },
                     {
                         label: "报名状态", name: "Status", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
@@ -142,62 +180,7 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
-                    { label: "所选课程号", name: "LessonNo", width: 100, align: "left" },
-                    {
-                        label: "所选课程名称", name: "LessonName", width: 150, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                                key: row.LessonNo,
-                                keyId: 'lessonno',
-                                callback: function (_data) {
-                                    callback(_data['lessonname']);
-                                }
-                            });
-                        }
-                    },
-                    { label: "课程学分", name: "StudyScore", width: 100, align: "left" },
-                    { label: "教师编号", name: "EmpNo", width: 100, align: "left" },
-                    {
-                        label: "教师姓名", name: "EmpName", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
-                                key: row.EmpNo,
-                                keyId: 'empno',
-                                callback: function (_data) {
-                                    callback(_data['empname']);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "上课节次", name: "LessonSection", width: 150, align: "left",
-                        formatter: function (cellvalue, row) {
-                            if (cellvalue != "" && cellvalue != undefined && cellvalue != null) {
-                                if (cellvalue.indexOf(',') == -1) {
-                                    return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1) + "节";
-                                } else {
-                                    return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1, 2) + "、" + cellvalue.slice(4) + "节";
-                                }
-                            }
-                        }
-                    },
-                    { label: "上课时间", name: "LessonTime", width: 180, align: "left" },
-                    {
-                        label: "教室名称", name: "ClassRoomName", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassRoomInfo',
-                                key: row.ClassRoomNo,
-                                keyId: 'classroomno',
-                                callback: function (_data) {
-                                    callback(_data['classroomname']);
-                                }
-                            });
-                        }
-                    },
-                    { label: "备注", name: "Remark", width: 100, align: "left" },
+
                 ],
                 mainId: 'StuId',
                 isPage: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index f28aebf75..0621a1e80 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -340,6 +340,7 @@
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_UserChangeInfoController.cs" />
     <Compile Include="Areas\AssetManagementSystem\Controllers\Ass_WarningController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ElectiveMajorOnlineController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuScoreOnlineController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuSelectLessonListOfElectiveOnlineController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\YKTStateMentController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ArrangeLessonSyncController.cs" />
@@ -1030,6 +1031,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\IndexUnpassOfElective.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\InputScoreIndexOfElectiveInTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\InputScoreIndexOfElective.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\InputScoreIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\Monitor.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuSelectLessonListOfElectiveOnline\AuditForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuSelectLessonListOfElectiveOnline\AuditIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuSelectLessonListOfElectiveOnline\FinishIndex.js" />
@@ -8214,6 +8217,8 @@
     <Content Include="Areas\EducationalAdministration\Views\StuSelectLessonListOfElectiveOnline\QueryStuSelectResultForTeacher.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\LessonInfoOfElectiveOnline\StudentIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuSelectLessonListOfElectiveOnline\InitScoreForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\InputScoreIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\Monitor.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LessonInfoOfElectiveOnlineApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LessonInfoOfElectiveOnlineApi.cs
index acdbdcc1b..eaace65ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LessonInfoOfElectiveOnlineApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LessonInfoOfElectiveOnlineApi.cs	
@@ -52,13 +52,13 @@ namespace Learun.Application.WebApi
             var stuInfoBasicEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(account);
             if (stuInfoBasicEntity == null)
             {
-                return Fail("当前学员不存在！");
+                return Success(new { msg = "当前学员不存在！" });
             }
             //课程信息
             var olpeEntity = lessonInfoOfElectiveOnlineIbll.GetLessonInfoOfElectiveOnlineEntity(keyValue);
             if (olpeEntity == null)
             {
-                return Fail("当前课程不存在！");
+                return Success(new { msg = "当前课程不存在！" });
             }
 
             //当前学员本学期是否有报名课程：每学期一门
@@ -96,11 +96,11 @@ namespace Learun.Application.WebApi
             {
                 if (sslleEntity.Status == 1)
                 {
-                    return Fail("当前课程报名审核中，请耐心等待！");
+                    return Success(new { msg = "当前课程报名审核中，请耐心等待！" });
                 }
                 else if (sslleEntity.Status == 2)
                 {
-                    return Fail("当前课程已报名成功！");
+                    return Success(new { msg = "当前课程已报名成功！" });
                 }
             }
             else
@@ -110,7 +110,7 @@ namespace Learun.Application.WebApi
                 var aaa = aa.Count(x => x.Status == 1 || x.Status == 2);
                 if (aaa >= olpeEntity.StuNumMax)
                 {
-                    return Fail("当前课程报名人数已满，请选择其他课程！");
+                    return Success(new { msg = "当前课程报名人数已满，请选择其他课程！" });
                 }
                 //每学期最多两门
                 var sslleList = stuSelectLessonListOfElectiveOnlineIBLL.GetStuSelectLessonListOfElectiveOnlineListByStuNo(account);
@@ -118,15 +118,15 @@ namespace Learun.Application.WebApi
                 var sslleListOfNow1 = sslleListOfNow.Where(x => x.Status == 1 || x.Status == 2);
                 if (sslleListOfNow1.Count() >= Config.GetValue("OnlineElectiveLessonApplyMax").ToInt())
                 {
-                    return Fail("每学期最多选择" + Config.GetValue("OnlineElectiveLessonApplyMax").ToInt() + "门线上选修课！");
+                    return Success(new { msg = "每学期最多选择" + Config.GetValue("OnlineElectiveLessonApplyMax").ToInt() + "门线上选修课！" });
                 }
                 //相同时间不能报名
-                if (sslleListOfNow1.Where(x => x.LessonSection == olpeEntity.LessonSection).Any())
+                if (!string.IsNullOrEmpty(olpeEntity.LessonSection) && sslleListOfNow1.Where(x => x.LessonSection == olpeEntity.LessonSection).Any())
                 {
                     //相同时间不能报名
-                    return Fail("本学期此时间段已有报名的选修课！");
+                    return Success(new { msg = "本学期此时间段已有报名的选修课！" });
                 }
-                
+
             }
 
             return Fail("正在提交，请等待！");
@@ -173,20 +173,11 @@ namespace Learun.Application.WebApi
         public Response GetForm(dynamic _)
         {
             string keyValue = this.GetReqData();
-            var JournalReceiveData = lessonInfoOfElectiveOnlineIbll.GetLessonInfoOfElectiveOnlineEntity(keyValue);
-            if (lessonInfoIbll.GetLessonInfoEntityByLessonNo(JournalReceiveData.LessonNo) != null)
-            {
-                if (!string.IsNullOrEmpty(lessonInfoIbll.GetLessonInfoEntityByLessonNo(JournalReceiveData.LessonNo).Introduction))
-                    JournalReceiveData.Introduction = WebHelper.NoHtml(WebHelper.HtmlDecode(lessonInfoIbll.GetLessonInfoEntityByLessonNo(JournalReceiveData.LessonNo).Introduction)) ?? "";
-            }
-            if (empInfoIbll.GetEmpInfoEntityByEmpNo(JournalReceiveData.EmpNo) != null)
-            {
-                if (!string.IsNullOrEmpty(empInfoIbll.GetEmpInfoEntityByEmpNo(JournalReceiveData.EmpNo).resume))
-                    JournalReceiveData.resume = WebHelper.NoHtml(WebHelper.HtmlDecode(empInfoIbll.GetEmpInfoEntityByEmpNo(JournalReceiveData.EmpNo).resume)) ?? "";
-            }
+            var Data = lessonInfoOfElectiveOnlineIbll.GetLessonInfoOfElectiveOnlineEntity(keyValue);
+
             var jsonData = new
             {
-                JournalReceive = JournalReceiveData,
+                data = Data,
             };
             return Success(jsonData);
         }
@@ -223,7 +214,7 @@ namespace Learun.Application.WebApi
                 if (sslleEntity.Status != 2)
                 {
                     stuSelectLessonListOfElectiveOnlineIBLL.DeleteEntity(sslleEntity.Id);
-                    return Fail("取消成功");
+                    return Success("取消成功");
                 }
                 else
                 {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuScoreOnlineMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuScoreOnlineMap.cs
new file mode 100644
index 000000000..aea32cc0b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuScoreOnlineMap.cs	
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-06-14 11:02
+    /// 描 述：考试成绩同步
+    /// </summary>
+    public class StuScoreOnlineMap : EntityTypeConfiguration<StuScoreOnlineEntity>
+    {
+        public StuScoreOnlineMap()
+        {
+            #region  表、主键
+            //表
+            this.ToTable("STUSCOREONLINE");
+            //主键
+            this.HasKey(t => t.ScoreId);
+            #endregion
+
+            #region  配置关系
+            #endregion
+        }
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
index 5ce5ca424..11c7695c4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
@@ -112,6 +112,7 @@
     <Compile Include="EducationalAdministration\StuInfoBasicChangeMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoFreshMap.cs" />
     <Compile Include="EducationalAdministration\StuInfoFreshOnlineServiceMap.cs" />
+    <Compile Include="EducationalAdministration\StuScoreOnlineMap.cs" />
     <Compile Include="EducationalAdministration\StuScoreNotPassMap.cs" />
     <Compile Include="EducationalAdministration\StuSelectLessonListOfElectiveOnlineMap.cs" />
     <Compile Include="EducationalAdministration\StuSelectLessonListOfElectivePreMap.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineBLL.cs
new file mode 100644
index 000000000..0a2e3839f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineBLL.cs	
@@ -0,0 +1,1146 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+using static Learun.Application.TwoDevelopment.EducationalAdministration.StuScoreOnlineService;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-06-14 11:02
+    /// 描 述：考试成绩同步
+    /// </summary>
+    public class StuScoreOnlineBLL : StuScoreOnlineIBLL
+    {
+        private StuScoreOnlineService stuScoreOnlineService = new StuScoreOnlineService();
+
+        #region  获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public DataTable GetListForExport(string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetListForExport(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<StuScoreOnlineEntity> GetMonitorList(string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetMonitorList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public StuScoreOnlineEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetScoreInputCancelPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetScoreInputCancelPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        public StuScoreOnlineEntity GetEntityByJson(string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetEntityByJson(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                stuScoreOnlineService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        public void SubmitStuScoreOnline(string AcademicYearNo, string Semester, string LessonNo, string EmpNo)
+        {
+            try
+            {
+                stuScoreOnlineService.SubmitStuScoreOnline(AcademicYearNo, Semester, LessonNo, EmpNo);
+            }
+            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, StuScoreOnlineEntity entity)
+        {
+            try
+            {
+                stuScoreOnlineService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+
+        public void DeleteList()
+        {
+            try
+            {
+                stuScoreOnlineService.DeleteList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 获取学年学期列表
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetAcademicAndSemesterList()
+        {
+            try
+            {
+                return stuScoreOnlineService.GetAcademicAndSemesterList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 根据学号获取成绩列表
+        /// </summary>
+        /// <param name="academic"></param>
+        /// <param name="semester"></param>
+        /// <param name="stuNo">学号</param>
+        /// <param name="classNo">班级编号</param>
+        /// <returns></returns>
+        public ScoreListByStuNoModel GetScoreListByStuNo(string academic, string semester, string stuNo, string classNo)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetScoreListByStuNo(academic, semester, stuNo, classNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public bool GetAny()
+        {
+            try
+            {
+                return stuScoreOnlineService.GetAny();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade)
+        {
+            try
+            {
+                stuScoreOnlineService.UpEmpNos(xn, xq, classNo, LessonNo, EmpNo, HisEmpNo, Grade);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取一次补考名单数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetStuScoreOnlineNotPassList()
+        {
+            try
+            {
+                return stuScoreOnlineService.GetStuScoreOnlineNotPassList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取二次补考名单数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetStuScoreOnlineNotPassTwoList()
+        {
+            try
+            {
+                return stuScoreOnlineService.GetStuScoreOnlineNotPassTwoList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取班级成绩初始化信息
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetPageListAboutClass(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetPageListAboutClass(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        public StuSelectLessonListEntity GetStuSelectLessonListEntity(StuScoreOnlineEntity entity)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetStuSelectLessonListEntity(entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 班级学生成绩初始化
+        /// </summary>
+        /// <returns></returns>
+        public void DoInitAboutClass(string academicYearNo, string semester, string classNo)
+        {
+            try
+            {
+                stuScoreOnlineService.DoInitAboutClass(academicYearNo, semester, classNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 学年下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetAcademicYearNoData()
+        {
+            try
+            {
+                return stuScoreOnlineService.GetAcademicYearNoData();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 班级下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetClassNoData(userAccount, userType, lessonNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<WebHelper.YearGrade> GetClassNoDataForInput(string userAccount, string userType, string lessonNo, string academicYearShort, string semester)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetClassNoDataForInput(userAccount, userType, lessonNo, academicYearShort, semester);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 教师下拉框信息【学生成绩录入可去审核】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetEmpNoData(string userAccount, string userType, string lessonNo)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetEmpNoData(userAccount, userType, lessonNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 课程下拉框信息【学生成绩录入可去审核】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo = "", string Semester = "")
+        {
+            try
+            {
+                return stuScoreOnlineService.GetLessonNoDataOfAll(userAccount, userType, AcademicYearNo, Semester);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 课程下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetElectiveLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo = "", string Semester = "")
+        {
+            try
+            {
+                return stuScoreOnlineService.GetElectiveLessonNoDataOfAll(userAccount, userType, AcademicYearNo, Semester);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 教室下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetElectiveClassRoomNoData(string userAccount, string userType, string lessonNo)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetElectiveClassRoomNoData(userAccount, userType, lessonNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 节次下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetElectiveLessonSectionData(string userAccount, string userType, string classRoomNo)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetElectiveLessonSectionData(userAccount, userType, classRoomNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 课程信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetLessonNoData(string academicYearNo, string semester, string classNo)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetLessonNoData(academicYearNo, semester, classNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取班级成绩列表
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetScoreListByClassNo(string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetScoreListByClassNo(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<StuScoreOnlineEntity> GetScoreListByClassNoForScholarship(string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetScoreListByClassNoForScholarship(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<StuScoreOnlineEntity> GetScoreListByStuNo(string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetScoreListByStuNo(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 根据学号/姓名获取学生成绩列表
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetScoreListByStuInfo(string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetScoreListByStuInfo(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public List<object> GetStuGraduateInfo(string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetStuGraduateInfo(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        public List<object> GetPassInfo(string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetPassInfo(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        public List<object> GetClassOfMy()
+        {
+            try
+            {
+                return stuScoreOnlineService.GetClassOfMy();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取个人成绩列表
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetAllScoreListByStuNo(string stuNo)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetAllScoreListByStuNo(stuNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public object GetScoreCharts(string academicYearNo, string semester, string classNo, string lessonNo)
+        {
+            try
+            {
+                var data = stuScoreOnlineService.GetScoreCharts(academicYearNo, semester, classNo, lessonNo);
+                return data;
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public List<StuScoreOnlineEntity> GetScoreInfo(string queryJson)
+        {
+            try
+            {
+                var data = stuScoreOnlineService.GetScoreInfo(queryJson);
+                return data;
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 审核学生成绩
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void CheckStuScoreOnline(string keyValue)
+        {
+            try
+            {
+                stuScoreOnlineService.CheckStuScoreOnline(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 去审核学生成绩
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void UnCheckStuScoreOnline(string keyValue)
+        {
+            try
+            {
+                stuScoreOnlineService.UnCheckStuScoreOnline(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取个人补考成绩
+        /// <summary>
+        /// <returns></returns>
+        public StuScoreOnlineEntity GetScoreNotPassByEntity(StuScoreOnlineEntity entity)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetScoreNotPassByEntity(entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取个人二次补考成绩
+        /// <summary>
+        /// <returns></returns>
+        public StuScoreOnlineEntity GetScoreNotPassTwoByEntity(StuScoreOnlineEntity entity)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetScoreNotPassTwoByEntity(entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 开始录入：占用成绩
+        /// <summary>
+        /// <returns></returns>
+        public void StartInputScore(string queryJson)
+        {
+            try
+            {
+                stuScoreOnlineService.StartInputScore(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 提交成绩
+        /// <summary>
+        /// <returns></returns>
+        public void SaveInputScore(List<StuScoreOnlineEntity> list)
+        {
+            try
+            {
+                stuScoreOnlineService.SaveInputScore(list);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 提交成绩：取消占用
+        /// <summary>
+        /// <returns></returns>
+        public void SaveInputScoreStatus(string queryJson)
+        {
+            try
+            {
+                stuScoreOnlineService.SaveInputScoreStatus(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 提交成绩：取消占用【服务】
+        /// <summary>
+        /// <returns></returns>
+        public void SaveInputScoreStatus2(string queryJson, string name)
+        {
+            try
+            {
+                stuScoreOnlineService.SaveInputScoreStatus2(queryJson, name);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 审核成绩
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <param name="checkMark">已审核：1；未审核：0；</param>
+        public void DoCheckScore(string queryJson, int checkMark)
+        {
+            try
+            {
+                stuScoreOnlineService.DoCheckScore(queryJson, checkMark);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataFromStuNo(string academicYearNo, string semester, string stuNo)
+        {
+            try
+            {
+                return stuScoreOnlineService.GetLessonNoDataFromStuNo(academicYearNo, semester, stuNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 成绩导入
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="dt"></param>
+        /// <param name="fileGuid"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public (DataTable failDt, int snum, int fnum) ExecuteImportExcel(int type, DataTable dt, string fileGuid, string queryJson)
+        {
+            try
+            {
+                return stuScoreOnlineService.ExecuteImportExcel(type, dt, fileGuid, queryJson);
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineEntity.cs
new file mode 100644
index 000000000..998f8de7f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineEntity.cs	
@@ -0,0 +1,452 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-06-14 11:02
+    /// 描 述：考试成绩同步
+    /// </summary>
+    public class StuScoreOnlineEntity
+    {
+        #region  实体成员
+        /// <summary>
+        /// ScoreId
+        /// </summary>
+        /// <returns></returns>
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        [Column("SCOREID")]
+        public int? ScoreId { get; set; }
+        /// <summary>
+        /// 通知书号
+        /// </summary>
+        /// <returns></returns>
+        [Column("NOTICEBOOKNO")]
+        public string NoticeBookNo { get; set; }
+        /// <summary>
+        /// 学号
+        /// </summary>
+        /// <returns></returns>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// 学生所在系部
+        /// </summary>
+        /// <returns></returns>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// 学生所在专业号
+        /// </summary>
+        /// <returns></returns>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// 行政班号
+        /// </summary>
+        /// <returns></returns>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        /// <returns></returns>
+        [Column("STUNAME")]
+        public string StuName { get; set; }
+        /// <summary>
+        /// GenderNo
+        /// </summary>
+        /// <returns></returns>
+        [Column("GENDERNO")]
+        public string GenderNo { get; set; }
+        /// <summary>
+        /// 学年度
+        /// </summary>
+        /// <returns></returns>
+        [Column("ACADEMICYEARNO")]
+        public string AcademicYearNo { get; set; }
+        /// <summary>
+        /// 学期
+        /// </summary>
+        /// <returns></returns>
+        [Column("SEMESTER")]
+        public string Semester { get; set; }
+        /// <summary>
+        /// 开课系部码
+        /// </summary>
+        /// <returns></returns>
+        [Column("OPENLESSONDEPTNO")]
+        public string OpenLessonDeptNo { get; set; }
+        /// <summary>
+        /// 开课专业码
+        /// </summary>
+        /// <returns></returns>
+        [Column("OPENLESSONMAJORNO")]
+        public string OpenLessonMajorNo { get; set; }
+        /// <summary>
+        /// 课程号
+        /// </summary>
+        /// <returns></returns>
+        [Column("LESSONNO")]
+        public string LessonNo { get; set; }
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        /// <returns></returns>
+        [Column("LESSONNAME")]
+        public string LessonName { get; set; }
+        /// <summary>
+        /// LessonNameEn
+        /// </summary>
+        /// <returns></returns>
+        [Column("LESSONNAMEEN")]
+        public string LessonNameEn { get; set; }
+        /// <summary>
+        /// 教学班号
+        /// </summary>
+        /// <returns></returns>
+        [Column("TEACHCLASSNO")]
+        public string TeachClassNo { get; set; }
+        /// <summary>
+        /// 课程类别码
+        /// </summary>
+        /// <returns></returns>
+        [Column("LESSONSORTNO")]
+        public string LessonSortNo { get; set; }
+        /// <summary>
+        /// 学生类别
+        /// </summary>
+        /// <returns></returns>
+        [Column("STUSORTNO")]
+        public string StuSortNo { get; set; }
+        /// <summary>
+        /// 年级
+        /// </summary>
+        /// <returns></returns>
+        [Column("GRADE")]
+        public string Grade { get; set; }
+        /// <summary>
+        /// 学分
+        /// </summary>
+        /// <returns></returns>
+        [Column("STUDYSCORE")]
+        public decimal? StudyScore { get; set; }
+        /// <summary>
+        /// 总学时
+        /// </summary>
+        /// <returns></returns>
+        [Column("TOTALSTUDYHOUR")]
+        public decimal? TotalStudyHour { get; set; }
+        /// <summary>
+        /// 专业属性
+        /// </summary>
+        /// <returns></returns>
+        [Column("ZYSX")]
+        public string zysx { get; set; }
+        /// <summary>
+        /// 考核（试）方式码(关联表BCdTestMode)
+        /// </summary>
+        /// <returns></returns>
+        [Column("TESTMODENO")]
+        public string TestModeNo { get; set; }
+        /// <summary>
+        /// ScoreRecordStyleNo
+        /// </summary>
+        /// <returns></returns>
+        [Column("SCORERECORDSTYLENO")]
+        public string ScoreRecordStyleNo { get; set; }
+        /// <summary>
+        /// 平时成绩
+        /// </summary>
+        /// <returns></returns>
+        [Column("ORDINARYSCORE")]
+        public decimal? OrdinaryScore { get; set; }
+        /// <summary>
+        /// 期中成绩
+        /// </summary>
+        /// <returns></returns>
+        [Column("TERMINSCORE")]
+        public decimal? TermInScore { get; set; }
+        /// <summary>
+        /// 期末成绩 学期
+        /// </summary>
+        /// <returns></returns>
+        [Column("TERMENDSCORE")]
+        public decimal? TermEndScore { get; set; }
+        /// <summary>
+        /// OtherScore
+        /// </summary>
+        /// <returns></returns>
+        [Column("OTHERSCORE")]
+        public decimal? OtherScore { get; set; }
+        /// <summary>
+        /// 总评成绩
+        /// </summary>
+        /// <returns></returns>
+        [Column("SCORE")]
+        public decimal? Score { get; set; }
+        /// <summary>
+        /// 绩点
+        /// </summary>
+        /// <returns></returns>
+        [Column("SCOREPOINT")]
+        public decimal? ScorePoint { get; set; }
+        /// <summary>
+        /// 考试日期
+        /// </summary>
+        /// <returns></returns>
+        [Column("TESTDATE")]
+        public DateTime? TestDate { get; set; }
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        /// <returns></returns>
+        [Column("ISINEFFECT")]
+        public string IsInEffect { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        /// <returns></returns>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 冲突课程代码
+        /// </summary>
+        /// <returns></returns>
+        [Column("CONFLICTLESSONNO")]
+        public string ConflictLessonNo { get; set; }
+        /// <summary>
+        /// 是否重修成绩
+        /// </summary>
+        /// <returns></returns>
+        [Column("ISRESTUDY")]
+        public string IsReStudy { get; set; }
+        /// <summary>
+        /// 审查标志
+        /// </summary>
+        /// <returns></returns>
+        [Column("CHECKMARK")]
+        public string CheckMark { get; set; }
+        /// <summary>
+        /// 是否选中
+        /// </summary>
+        /// <returns></returns>
+        [Column("ISPITCHON")]
+        public string IsPitchOn { get; set; }
+        /// <summary>
+        /// 教师号
+        /// </summary>
+        /// <returns></returns>
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary>
+        /// 专业教学计划编码
+        /// </summary>
+        /// <returns></returns>
+        [Column("TECHPLANNO")]
+        public string TechPlanNo { get; set; }
+        /// <summary>
+        /// 考试性质码（关联表CdTestKind）
+        /// </summary>
+        /// <returns></returns>
+        [Column("TESTKINDNO")]
+        public string TestKindNo { get; set; }
+        /// <summary>
+        /// 课程区别码(此编码针对同一课程编号，同一门课程、不同课时、学分的情况而加，由系统自动产生以区分此类课程）
+        /// </summary>
+        /// <returns></returns>
+        [Column("PARTCODE")]
+        public string PartCode { get; set; }
+        /// <summary>
+        /// LessonSection
+        /// </summary>
+        /// <returns></returns>
+        [Column("LESSONSECTION")]
+        public string LessonSection { 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>
+        /// IsEditable
+        /// </summary>
+        /// <returns></returns>
+        [Column("ISEDITABLE")]
+        public string IsEditable { get; set; }
+        /// <summary>
+        /// EditUserId
+        /// </summary>
+        /// <returns></returns>
+        [Column("EDITUSERID")]
+        public string EditUserId { get; set; }
+        /// <summary>
+        /// ModifyDate
+        /// </summary>
+        /// <returns></returns>
+        [Column("MODIFYDATE")]
+        public DateTime? ModifyDate { get; set; }
+
+        [Column("BEGINMODIFYDATE")]
+        public DateTime? BeginModifyDate { get; set; }
+        /// <summary>
+        /// ModifyUserId
+        /// </summary>
+        /// <returns></returns>
+        [Column("MODIFYUSERID")]
+        public string ModifyUserId { get; set; }
+        /// <summary>
+        /// ModifyUserName
+        /// </summary>
+        /// <returns></returns>
+        [Column("MODIFYUSERNAME")]
+        public string ModifyUserName { get; set; }
+        /// <summary>
+        /// 学校主键
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_SCHOOLID")]
+        public string F_SchoolId { get; set; }
+
+        #endregion
+
+        #region  扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(int? keyValue)
+        {
+            this.ScoreId = keyValue;
+        }
+        #endregion
+
+
+        /// <summary>
+        /// 学生Id
+        /// </summary>
+        [NotMapped]
+        public string StuId { get; set; }
+        /// <summary>
+        /// 课程Id
+        /// </summary>
+        [NotMapped]
+        public string LessonId { get; set; }
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        [NotMapped]
+        public string ClassName { get; set; }
+        /// <summary>
+        /// 班级Id
+        /// </summary>
+        [NotMapped]
+        public string ClassId { get; set; }
+        /// <summary>
+        /// 教师姓名
+        /// </summary>
+        [NotMapped]
+        public string EmpName { get; set; }
+        /// <summary>
+        /// 教师主键
+        /// </summary>
+        [NotMapped]
+        public string EmpId { get; set; }
+        /// <summary>
+        /// 补考标识（1：一次补考；2：二次补考）
+        /// </summary>
+        [NotMapped]
+        public int BuKaoFlag { get; set; }
+        /// <summary>
+        /// 学生成绩数量
+        /// </summary>
+        [NotMapped]
+        public int StuScoreOnlineNum { get; set; }
+        /// <summary>
+        /// 临时主键
+        /// </summary>
+        [NotMapped]
+        public string TempId { get; set; }
+        [NotMapped]
+        public string DepositBank { get; set; }
+        [NotMapped]
+        public string BankCard { get; set; }
+        [NotMapped]
+        public string IdCard { get; set; }
+        [NotMapped]
+        public string Birthday { get; set; }
+        [NotMapped]
+        public string NationalityNo { get; set; }
+        [NotMapped]
+        public string PartyFaceNo { get; set; }
+
+
+        /// <summary>
+        /// 成绩格式化(补)(重)(选修)
+        /// </summary>
+        [NotMapped]
+        public string ScoreFormat { get; set; }
+
+        /// <summary>
+        /// 补考成绩
+        /// </summary>
+        [NotMapped]
+        public string ScoreOfNotPass { get; set; }
+        /// <summary>
+        /// 二次补考成绩
+        /// </summary>
+        [NotMapped]
+        public string ScoreOfNotPassTwo { get; set; }
+        /// <summary>
+        /// 课程类别名称
+        /// </summary>
+        /// <returns></returns>
+        [NotMapped]
+        public string LessonSortName { get; set; }
+        /// <summary>
+        /// 专业名称
+        /// </summary>
+        [NotMapped]
+        public string MajorName { get; set; }
+        /// <summary>
+        /// 专业排名
+        /// </summary>
+        [NotMapped]
+        public int RankInMajor { get; set; }
+        /// <summary>
+        /// 班级排名
+        /// </summary>
+        [NotMapped]
+        public int RankInClass { get; set; }
+        /// <summary>
+        /// 学习形式
+        /// </summary>
+        [NotMapped]
+        public string StudyModality { get; set; }
+        /// <summary>
+        /// 异动类型
+        /// </summary>
+        [NotMapped]
+        public string MoveType { get; set; }
+
+
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineIBLL.cs
new file mode 100644
index 000000000..1c9c9437e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineIBLL.cs	
@@ -0,0 +1,261 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+using static Learun.Application.TwoDevelopment.EducationalAdministration.StuScoreOnlineService;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-06-14 11:02
+    /// 描 述：考试成绩同步
+    /// </summary>
+    public interface StuScoreOnlineIBLL
+    {
+        #region  获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        IEnumerable<StuScoreOnlineEntity> GetList(string queryJson);
+        DataTable GetListForExport(string queryJson);
+
+        IEnumerable<StuScoreOnlineEntity> GetMonitorList(string queryJson);
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        IEnumerable<StuScoreOnlineEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        StuScoreOnlineEntity GetEntity(string keyValue);
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        IEnumerable<StuScoreOnlineEntity> GetScoreInputCancelPageList(Pagination pagination, string queryJson);
+
+
+        List<object> GetStuGraduateInfo(string queryJson);
+        List<object> GetPassInfo(string queryJson);
+        List<object> GetClassOfMy();
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        StuSelectLessonListEntity GetStuSelectLessonListEntity(StuScoreOnlineEntity entity);
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        StuScoreOnlineEntity GetEntityByJson(string queryJson);
+        #endregion
+
+        #region  提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DeleteEntity(string keyValue);
+        void SubmitStuScoreOnline(string AcademicYearNo, string Semester, string LessonNo, string EmpNo);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void SaveEntity(string keyValue, StuScoreOnlineEntity entity);
+        #endregion
+
+        void DeleteList();
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 获取学年学期列表
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<WebHelper.YearGrade> GetAcademicAndSemesterList();
+        /// <summary>
+        /// 根据学号获取成绩列表
+        /// </summary>
+        /// <param name="academic"></param>
+        /// <param name="semester"></param>
+        /// <param name="stuNo">学号</param>
+        /// <param name="classNo">班级编号</param>
+        /// <returns></returns>
+        ScoreListByStuNoModel GetScoreListByStuNo(string academic, string semester, string stuNo, string classNo);
+        bool GetAny();
+
+
+        /// <summary>
+        /// 获取一次补考名单数据
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<StuScoreOnlineEntity> GetStuScoreOnlineNotPassList();
+
+        /// <summary>
+        /// 获取二次补考名单数据
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<StuScoreOnlineEntity> GetStuScoreOnlineNotPassTwoList();
+
+        /// <summary>
+        /// 获取班级成绩初始化信息
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<StuScoreOnlineEntity> GetPageListAboutClass(Pagination pagination, string queryJson);
+
+        /// <summary>
+        /// 班级学生成绩初始化
+        /// </summary>
+        /// <returns></returns>
+        void DoInitAboutClass(string academicYearNo, string semester, string classNo);
+
+        /// <summary>
+        /// 学年下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<WebHelper.YearGrade> GetAcademicYearNoData();
+
+        /// <summary>
+        /// 班级下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo);
+        IEnumerable<WebHelper.YearGrade> GetClassNoDataForInput(string userAccount, string userType, string lessonNo, string academicYearShort, string semester);
+
+        /// <summary>
+        /// 教师下拉框信息【学生成绩录入可去审核】
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<WebHelper.YearGrade> GetEmpNoData(string userAccount, string userType, string lessonNo);
+
+        /// <summary>
+        /// 课程下拉框信息【学生成绩录入可去审核】
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo = "", string Semester = "");
+
+        /// <summary>
+        /// 课程下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<WebHelper.YearGrade> GetElectiveLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo = "", string Semester = "");
+
+        /// <summary>
+        /// 教室下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<WebHelper.YearGrade> GetElectiveClassRoomNoData(string userAccount, string userType, string lessonNo);
+
+        /// <summary>
+        /// 节次下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<WebHelper.YearGrade> GetElectiveLessonSectionData(string userAccount, string userType, string classRoomNo);
+
+        /// <summary>
+        /// 课程信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<WebHelper.YearGrade> GetLessonNoData(string academicYearNo, string semester, string classNo);
+
+        /// <summary>
+        /// 获取班级成绩列表
+        /// <summary>
+        /// <returns></returns>
+        IEnumerable<StuScoreOnlineEntity> GetScoreListByClassNo(string queryJson);
+        IEnumerable<StuScoreOnlineEntity> GetScoreListByClassNoForScholarship(string queryJson);
+        /// <summary>
+        /// 获取学生成绩
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        IEnumerable<StuScoreOnlineEntity> GetScoreListByStuNo(string queryJson);
+        /// <summary>
+        /// 根据学号/姓名获取学生成绩列表
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        IEnumerable<StuScoreOnlineEntity> GetScoreListByStuInfo(string queryJson);
+
+        /// <summary>
+        /// 获取个人成绩列表
+        /// <summary>
+        /// <returns></returns>
+        IEnumerable<StuScoreOnlineEntity> GetAllScoreListByStuNo(string stuNo);
+        object GetScoreCharts(string academicYearNo, string semester, string classNo, string lessonNo);
+        void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade);
+
+
+        /// <summary>
+        /// 审核学生成绩
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void CheckStuScoreOnline(string keyValue);
+        /// <summary>
+        /// 去审核学生成绩
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void UnCheckStuScoreOnline(string keyValue);
+        List<StuScoreOnlineEntity> GetScoreInfo(string queryJson);
+
+        /// <summary>
+        /// 获取个人补考成绩
+        /// <summary>
+        /// <returns></returns>
+        StuScoreOnlineEntity GetScoreNotPassByEntity(StuScoreOnlineEntity entity);
+
+        /// <summary>
+        /// 获取个人二次补考成绩
+        /// <summary>
+        /// <returns></returns>
+        StuScoreOnlineEntity GetScoreNotPassTwoByEntity(StuScoreOnlineEntity entity);
+        /// <summary>
+        /// 开始录入：占用成绩
+        /// <summary>
+        /// <returns></returns>
+        void StartInputScore(string queryJson);
+        /// <summary>
+        /// 提交成绩
+        /// <summary>
+        /// <returns></returns>
+        void SaveInputScore(List<StuScoreOnlineEntity> list);
+        /// <summary>
+        /// 提交成绩：取消占用
+        /// <summary>
+        /// <returns></returns>
+        void SaveInputScoreStatus(string queryJson);
+        /// <summary>
+        /// 提交成绩：取消占用【服务】
+        /// <summary>
+        /// <returns></returns>
+        void SaveInputScoreStatus2(string queryJson, string name);
+        /// <summary>
+        /// 审核成绩
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <param name="checkMark">已审核：1；未审核：0；</param>
+        void DoCheckScore(string queryJson, int checkMark);
+
+        (DataTable failDt, int snum, int fnum) ExecuteImportExcel(int type, DataTable dt, string fileGuid, string queryJson);
+
+        #endregion
+
+        IEnumerable<WebHelper.YearGrade> GetLessonNoDataFromStuNo(string academicYearNo, string semester, string stuNo);
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineService.cs
new file mode 100644
index 000000000..5a628a84c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreOnline/StuScoreOnlineService.cs	
@@ -0,0 +1,2468 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Learun.Cache.Base;
+using Learun.Cache.Factory;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2019-06-14 11:02
+    /// 描 述：考试成绩同步
+    /// </summary>
+    public class StuScoreOnlineService : RepositoryFactory
+    {
+        #region  构造函数和属性
+
+        private string fieldSql;
+        public StuScoreOnlineService()
+        {
+            fieldSql = @"
+                t.ScoreId,
+                t.NoticeBookNo,
+                t.StuNo,
+                t.DeptNo,
+                t.MajorNo,
+                t.ClassNo,
+                t.StuName,
+                t.GenderNo,
+                t.AcademicYearNo,
+                t.Semester,
+                t.OpenLessonDeptNo,
+                t.OpenLessonMajorNo,
+                t.LessonNo,
+                t.LessonName,
+                t.LessonNameEn,
+                t.TeachClassNo,
+                t.LessonSortNo,
+                t.StuSortNo,
+                t.Grade,
+                t.StudyScore,
+                t.TotalStudyHour,
+                t.zysx,
+                t.TestModeNo,
+                t.ScoreRecordStyleNo,
+                t.OrdinaryScore,
+                t.TermInScore,
+                t.TermEndScore,
+                t.OtherScore,
+                t.Score,
+                t.ScorePoint,
+                t.TestDate,
+                t.IsInEffect,
+                t.Remark,
+                t.ConflictLessonNo,
+                t.IsReStudy,
+                t.CheckMark,
+                t.IsPitchOn,
+                t.EmpNo,
+                t.TechPlanNo,
+                t.TestKindNo,
+                t.PartCode,
+                t.LessonSection,
+                t.ClassRoomNo,
+                t.ClassRoomName,
+                t.IsEditable,
+                t.EditUserId,
+                t.ModifyDate,
+                t.ModifyUserId,
+                t.ModifyUserName
+            ";
+        }
+        #endregion
+        #region  缓存定义
+        private ICache cache = CacheFactory.CaChe();
+        private string cacheKey = "Learun_adms_excelError_";
+        #endregion
+        #region  获取数据
+
+        public IEnumerable<StuScoreOnlineEntity> GetMonitorList(string queryJson)
+        {
+            try
+            {
+                //参考写法
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                var strSql = new StringBuilder();
+                strSql.Append("select AcademicYearNo,Semester,lessonno,LessonName,EmpNo,IsEditable,EditUserId,BeginModifyDate,ModifyDate from StuScoreOnline where 1=1 ");
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    strSql.Append(" and AcademicYearNo = @AcademicYearNo ");
+                    dp.Add("AcademicYearNo", "" + queryParam["AcademicYearNo"].ToString() + "", DbType.String);
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    strSql.Append(" and Semester =@Semester ");
+                    dp.Add("Semester", "" + queryParam["Semester"].ToString() + "", DbType.String);
+                }
+                if (!queryParam["LessonSortNo"].IsEmpty())
+                {
+                    strSql.Append(" and LessonSortNo =@LessonSortNo ");
+                    dp.Add("LessonSortNo", "" + queryParam["LessonSortNo"].ToString() + "", DbType.String);
+                }
+                strSql.Append(" group by AcademicYearNo,Semester,lessonno,LessonName, EmpNo, IsEditable, EditUserId, BeginModifyDate, ModifyDate ");
+                strSql.Append(" order by IsEditable, BeginModifyDate, edituserid,AcademicYearNo,Semester,LessonNo ");
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,sb.StudyModality,sb.MoveType FROM StuScoreOnline t ");
+                strSql.Append(" left join StuInfoBasic sb on t.StuNo=sb.StuNo ");
+                strSql.Append(" where 1=1 ");
+
+                //学籍异动的学生不显示
+                //strSql.Append(" and t.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus=1) ");
+                //20220616改 休学的要录入成绩，退学和转校的不用
+                strSql.Append(" and t.StuNo not in (select StuNo from StuInfoBasicChange where StuChangeType in('04','06')) ");
+                var queryParam = queryJson.ToJObject();
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["F_SchoolId"].IsEmpty())
+                {
+                    strSql.Append(" and t.F_SchoolId=@F_SchoolId ");
+                    dp.Add("F_SchoolId", queryParam["F_SchoolId"].ToString(), DbType.String);
+                }
+                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["LessonNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.LessonNo=@LessonNo ");
+                    dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String);
+                }
+                if (!queryParam["LessonName"].IsEmpty())
+                {
+                    strSql.Append(" and t.LessonName=@LessonName ");
+                    dp.Add("LessonName", queryParam["LessonName"].ToString(), DbType.String);
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.EmpNo=@EmpNo ");
+                    dp.Add("EmpNo", queryParam["EmpNo"].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["LessonSection"].IsEmpty())
+                {
+                    strSql.Append(" and t.LessonSection=@LessonSection ");
+                    dp.Add("LessonSection", queryParam["LessonSection"].ToString(), DbType.String);
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public DataTable GetListForExport(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,sb.StudyModality,sb.MoveType FROM StuScoreOnline t ");
+                strSql.Append(" left join StuInfoBasic sb on t.StuNo=sb.StuNo ");
+                strSql.Append(" where 1=1 ");
+
+                //学籍异动的学生不显示
+                //strSql.Append(" and t.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus=1) ");
+                //20220616改 休学的要录入成绩，退学和转校的不用
+                strSql.Append(" and t.StuNo not in (select StuNo from StuInfoBasicChange where StuChangeType in('04','06')) ");
+                var queryParam = queryJson.ToJObject();
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["F_SchoolId"].IsEmpty())
+                {
+                    strSql.Append(" and t.F_SchoolId=@F_SchoolId ");
+                    dp.Add("F_SchoolId", queryParam["F_SchoolId"].ToString(), DbType.String);
+                }
+                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["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["LessonSection"].IsEmpty())
+                {
+                    strSql.Append(" and t.LessonSection=@LessonSection ");
+                    dp.Add("LessonSection", queryParam["LessonSection"].ToString(), DbType.String);
+                }
+
+                return new DataTable(); //this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM StuScoreOnline t where 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["keyword"].IsEmpty())
+                {
+                    strSql.Append(" and (stuno like @keyword or stuname like @keyword )");
+                    dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public StuScoreOnlineEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuScoreOnlineEntity>(Convert.ToInt32(keyValue));
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetScoreInputCancelPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT * FROM StuScoreOnline t where 1=1 ");
+
+                var loginInfo = LoginUserInfo.Get();
+                if (loginInfo.Description == "教师")
+                {
+                    strSql.Append(" and t.EmpNo='" + loginInfo.account + "' ");
+                }
+
+                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["StuNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.StuNo=@StuNo ");
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// <param name="pagination">分页参数</param>
+        /// <summary>
+        /// <returns></returns>
+        public StuSelectLessonListEntity GetStuSelectLessonListEntity(StuScoreOnlineEntity entity)
+        {
+            try
+            {
+                var model = this.BaseRepository("CollegeMIS").FindEntity<StuSelectLessonListEntity>(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.EmpNo == entity.EmpNo && x.LessonNo == entity.LessonNo && x.ClassNo == entity.ClassNo && x.StuNo == entity.StuNo);
+                return model;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        public StuScoreOnlineEntity GetEntityByJson(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* FROM StuScoreOnline t where 1=1 ");
+
+                var queryParam = queryJson.ToJObject();
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["F_SchoolId"].IsEmpty())
+                {
+                    strSql.Append(" and t.F_SchoolId=@F_SchoolId ");
+                    dp.Add("F_SchoolId", queryParam["F_SchoolId"].ToString(), DbType.String);
+                }
+                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["LessonNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.LessonNo=@LessonNo ");
+                    dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String);
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.EmpNo=@EmpNo ");
+                    dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String);
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.ClassNo=@ClassNo ");
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                }
+                if (!queryParam["LessonSection"].IsEmpty())
+                {
+                    strSql.Append(" and t.LessonSection=@LessonSection ");
+                    dp.Add("LessonSection", queryParam["LessonSection"].ToString(), DbType.String);
+                }
+                if (!queryParam["ClassRoomNo"].IsEmpty())
+                {
+                    strSql.Append(" and t.ClassRoomNo=@ClassRoomNo ");
+                    dp.Add("ClassRoomNo", queryParam["ClassRoomNo"].ToString(), DbType.String);
+                }
+                return this.BaseRepository("CollegeMIS").FindEntity<StuScoreOnlineEntity>(strSql.ToString(), dp);
+            }
+            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)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<StuScoreOnlineEntity>(t => t.ScoreId == Convert.ToInt32(keyValue));
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public void SubmitStuScoreOnline(string AcademicYearNo, string Semester, string LessonNo, string EmpNo)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").ExecuteBySql(
+                    @"update StuScoreOnline set IsEditable=1,EditUserId=null,BeginModifyDate=null  
+                    where AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and LessonNo='" +
+                    LessonNo + "' and EmpNo='" + EmpNo + "' ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, StuScoreOnlineEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(Convert.ToInt32(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);
+                }
+            }
+        }
+
+        internal bool GetAny()
+        {
+            try
+            {
+                var yearAndSemester = Common.GetSemesterAndYear();
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(a => a.AcademicYearNo == yearAndSemester.AcademicYearShort && a.Semester == yearAndSemester.Semester).Any();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string hisempno, string Grade)
+        {
+            try
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.Append(" update StuScoreOnline set EmpNo ='" + EmpNo + "' where classno = '" + classNo + "' and Semester ='" + xq + "' and  AcademicYearNo ='" + xn + "' and LessonNo ='" + LessonNo + "' and empno = '" + hisempno + "' and Grade='" + Grade + "' ");
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sb.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+        private static HttpClient Client;
+        
+        internal List<StuScoreOnlineEntity> GetScoreInfo(string queryJson)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+                var academicYearNo = queryParam["AcademicYearNo"].ToString();
+                var semester = queryParam["Semester"].ToString();
+                var classNo = queryParam["ClassNo"].ToString();
+                var lessonNo = queryParam["LessonNo"].ToString();
+
+                var data = this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(a => a.AcademicYearNo == academicYearNo && a.Semester == semester && a.ClassNo == classNo && a.LessonNo == lessonNo).OrderByDescending(a => a.Score).ToList();
+                //及格的
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        internal object GetScoreCharts(string academicYearNo, string semester, string classNo, string lessonNo)
+        {
+            try
+            {
+                var aab = new List<Object>();
+                var data = this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(a => a.AcademicYearNo == academicYearNo && a.Semester == semester && a.ClassNo == classNo && a.LessonNo == lessonNo).ToList();
+                //及格的
+                aab.Add(new { name = "及格", value = data.Count(a => a.Score >= 60).ToString() });
+                //不及格的
+                aab.Add(new { name = "不及格", value = data.Count(a => a.Score < 60).ToString() });
+                var aaa = new List<String> { "及格", "不及格" };
+                var aa = new { aaa, aab };
+
+
+                var bbb = new List<Object>();
+                bbb.Add(new { name = "80-100", value = data.Count(a => a.Score >= 80).ToString() });
+                bbb.Add(new { name = "60-80", value = data.Count(a => a.Score >= 60 && a.Score < 80).ToString() });
+                bbb.Add(new { name = "0-60", value = data.Count(a => a.Score >= 0 && a.Score < 60).ToString() });
+                var bba = new List<String> { "80-100", "60-80", "0-60" };
+                var bb = new { bba, bbb };
+
+                return new { aa, bb };
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public void DeleteList()
+        {
+            try
+            {
+                var semesterAndYear = Common.GetSemesterAndYear();
+                var strAcademicYear = semesterAndYear.AcademicYearShort;
+                var strSemester = semesterAndYear.Semester;
+                BaseRepository("CollegeMIS").ExecuteBySql("delete from StuScoreOnline where AcademicYearNo = '" + strAcademicYear + "' and Semester = '" + strSemester + "'");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+
+        }
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 获取学年学期列表
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetAcademicAndSemesterList()
+        {
+            try
+            {
+                var aa = this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(x => !string.IsNullOrEmpty(x.AcademicYearNo) && !string.IsNullOrEmpty(x.Semester));
+                var aaa = aa.ToList().GroupBy(x => new { x.AcademicYearNo, x.Semester }).Select(x => new WebHelper.YearGrade()
+                {
+                    text = string.Format("{0}学年第{1}学期", x.Key.AcademicYearNo, x.Key.Semester),
+                    value = string.Format("{0},{1}", x.Key.AcademicYearNo, x.Key.Semester)
+                });
+                return aaa;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 根据学号获取成绩列表
+        /// </summary>
+        /// <param name="academic"></param>
+        /// <param name="semester"></param>
+        /// <param name="stuNo">学号</param>
+        /// <param name="classNo">班级编号</param>
+        /// <returns></returns>
+        public ScoreListByStuNoModel GetScoreListByStuNo(string academic, string semester, string stuNo, string classNo)
+        {
+            try
+            {
+                var result = new ScoreListByStuNoModel();
+
+                //获取已审核成绩列表
+                var stuScoreOnlineList = this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(x => x.AcademicYearNo == academic && x.Semester == semester && x.StuNo == stuNo && x.CheckMark == "1");
+                foreach (var scoreEntity in stuScoreOnlineList)
+                {
+                    if (scoreEntity.LessonSortNo == "2")
+                    {
+                        scoreEntity.LessonName = scoreEntity.LessonName + "(选修)";
+                    }
+                    else
+                    {
+                        if (scoreEntity.Score < 60)
+                        {
+                            //暂时注释
+                            //var notpass = this.BaseRepository("CollegeMIS").FindEntity<StuScoreOnlineNotPassEntity>(x => x.AcademicYearNo == scoreEntity.AcademicYearNo && x.Semester == scoreEntity.Semester && x.StuNo == scoreEntity.StuNo && x.LessonNo == scoreEntity.LessonNo && x.CheckMark == "1");
+                            //if (notpass != null)
+                            //{
+                            //    if (notpass.Score >= 60)
+                            //    {
+                            //        scoreEntity.Score = notpass.Score;
+                            //    }
+                            //    else
+                            //    {
+                            //        var notpasstwo = this.BaseRepository("CollegeMIS").FindEntity<StuScoreOnlineNotPassTwoEntity>(x => x.AcademicYearNo == scoreEntity.AcademicYearNo && x.Semester == scoreEntity.Semester && x.StuNo == scoreEntity.StuNo && x.LessonNo == scoreEntity.LessonNo && x.CheckMark == "1");
+                            //        if (notpasstwo != null)
+                            //        {
+                            //            if (notpasstwo.Score >= 60)
+                            //            {
+                            //                scoreEntity.Score = notpasstwo.Score;
+                            //            }
+                            //        }
+                            //    }
+                            //}
+                        }
+                    }
+                }
+                result.ScoreList = stuScoreOnlineList.ToList();
+                //获取排名、综合成绩
+                var aa = this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(x => x.AcademicYearNo == academic && x.Semester == semester && x.ClassNo == classNo && x.CheckMark == "1" && x.LessonSortNo == "1");
+                var aaa = aa.GroupBy(x => x.StuNo).Select(x => new
+                {
+                    StuNo = x.Key,
+                    Score = x.Select(y => y.Score).Sum()
+                }).OrderByDescending(x => x.Score);
+                if (aaa.Any())
+                {
+                    var rank = aaa.Select(x => x.StuNo).ToList().IndexOf(stuNo);
+                    var totalScore = aaa.FirstOrDefault(x => x.StuNo == stuNo)?.Score;
+
+                    result.Rank = rank + 1;
+                    result.TotalScore = totalScore.Value;
+                }
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        public class ScoreListByStuNoModel
+        {
+            /// <summary>
+            /// 成绩列表
+            /// </summary>
+            public List<StuScoreOnlineEntity> ScoreList { get; set; }
+            /// <summary>
+            /// 排名
+            /// </summary>
+            public int Rank { get; set; }
+            /// <summary>
+            /// 综合成绩
+            /// </summary>
+            public decimal TotalScore { get; set; }
+        }
+
+        /// <summary>
+        /// 获取一次补考名单数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetStuScoreOnlineNotPassList()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select s.AcademicYearNo,s.Semester,s.StuNo,s.StuName,si.StuId,s.LessonNo,s.LessonName,l.LessonId,s.ClassNo,c.ClassName,c.ClassId,s.EmpNo,e.EmpName,e.EmpId,1 AS BuKaoFlag ");
+                strSql.Append(" from StuScoreOnlineNotPass s left join ClassInfo c on s.ClassNo=c.ClassNo left join EmpInfo e on s.EmpNo=e.EmpNo left join StuInfoBasic si on s.StuNo=si.StuNo left join LessonInfo l on s.LessonNo=l.LessonNo ");
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取二次补考名单数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetStuScoreOnlineNotPassTwoList()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select s.AcademicYearNo,s.Semester,s.StuNo,s.StuName,si.StuId,s.LessonNo,s.LessonName,l.LessonId,s.ClassNo,c.ClassName,c.ClassId,s.EmpNo,e.EmpName,e.EmpId,2 AS BuKaoFlag ");
+                strSql.Append(" from StuScoreOnlineNotPassTwo s left join ClassInfo c on s.ClassNo=c.ClassNo left join EmpInfo e on s.EmpNo=e.EmpNo left join StuInfoBasic si on s.StuNo=si.StuNo left join LessonInfo l on s.LessonNo=l.LessonNo  ");
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取班级成绩初始化信息
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetPageListAboutClass(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select s.AcademicYearNo+'/'+s.Semester+'/'+s.ClassNo as TempId,s.AcademicYearNo,s.Semester,s.ClassNo,c.ClassName,count(s.scoreid) as StuScoreOnlineNum ");
+                strSql.Append(" FROM stuscore s inner join classinfo c on s.ClassNo=c.ClassNo ");
+
+                var queryParam = queryJson.ToJObject();
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["keyword"].IsEmpty())
+                {
+                    strSql.Append(" where c.classname like @keyword ");
+                    dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
+                }
+                strSql.Append(" group by s.AcademicYearNo,s.Semester,s.ClassNo,c.ClassName ");
+
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 班级学生成绩初始化
+        /// </summary>
+        /// <returns></returns>
+        public void DoInitAboutClass(string academicYearNo, string semester, string classNo)
+        {
+            try
+            {
+                //清空StuSelectLessonList
+                this.BaseRepository("CollegeMIS").ExecuteBySql("delete from StuSelectLessonList where AcademicYearNo='" + academicYearNo + "' and Semester='" + semester + "' and ClassNo='" + classNo + "' ");
+                //清空StuScoreOnline
+                this.BaseRepository("CollegeMIS").ExecuteBySql("delete from StuScoreOnline where AcademicYearNo='" + academicYearNo + "' and Semester='" + semester + "' and ClassNo='" + classNo + "' and LessonSortNo='1' ");
+                //重置StuSelectLessonList
+                var lessonData = this.BaseRepository("CollegeMIS").FindList<LessonInfoEntity>();
+                var TeachClassData = this.BaseRepository("CollegeMIS").FindList<TeachClassEntity>(x => x.AcademicYearNo == academicYearNo && x.Semester == semester && x.TeachClassNo == classNo);
+                var classstulist = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(x => x.ClassNo == classNo);
+                var stuSelectLessonListEntityData = this.BaseRepository("CollegeMIS").FindList<StuSelectLessonListEntity>();
+                var insertStuSelectLessonListDataList = new List<StuSelectLessonListEntity>();
+                if (TeachClassData.Any())
+                {
+                    foreach (var itemteachclass in TeachClassData)
+                    {
+                        foreach (var stu in classstulist)
+                        {
+                            var insertDatastuselect = new StuSelectLessonListEntity();
+                            insertDatastuselect.NoticeBookNo = stu.NoticeNo;
+                            insertDatastuselect.StuNo = stu.StuNo;
+                            insertDatastuselect.DeptNo = stu.DeptNo;
+                            insertDatastuselect.ClassNo = stu.ClassNo;
+                            insertDatastuselect.MajorNo = stu.MajorNo;
+                            insertDatastuselect.StuName = stu.StuName;
+                            insertDatastuselect.GenderNo = stu.GenderNo != null && stu.GenderNo.Value ? "1" : "0";
+                            insertDatastuselect.AcademicYearNo = itemteachclass.AcademicYearNo;
+                            insertDatastuselect.Semester = itemteachclass.Semester;
+                            insertDatastuselect.OpenLessonDeptNo = itemteachclass.DeptNo;
+                            insertDatastuselect.OpenLessonMajorNo = itemteachclass.MajorNo;
+                            insertDatastuselect.LessonNo = itemteachclass.LessonNo;
+                            insertDatastuselect.LessonName = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo)?.LessonName;
+                            insertDatastuselect.PartCode = "";
+                            insertDatastuselect.OrdinaryScoreScale = 1;
+                            insertDatastuselect.TermInScoreScale = 1;
+                            insertDatastuselect.TermEndScoreScale = 1;
+                            insertDatastuselect.OtherScoreScale = 1;
+                            insertDatastuselect.TeachClassNo = stu.ClassNo;
+                            insertDatastuselect.LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo)?.LessonSortNo;
+                            insertDatastuselect.StuSortNo = "02";
+                            insertDatastuselect.Grade = stu.Grade;
+                            insertDatastuselect.StudyScore = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo).StudyScore == null ? 0 : lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo).StudyScore;
+                            insertDatastuselect.TotalStudyHour = lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo).TotalStudyHour == null ? 0 : lessonData.FirstOrDefault(m => m.LessonNo == itemteachclass.LessonNo).TotalStudyHour;
+                            insertDatastuselect.IsInEffect = "1";
+                            insertDatastuselect.EmpNo = itemteachclass.EmpNo;
+                            insertDatastuselect.IsPitchOn = "1";
+                            insertDatastuselect.CheckMark = "0";
+                            insertDatastuselect.InsertTime = DateTime.Now;
+                            if (stuSelectLessonListEntityData.Count(m => m.StuNo == insertDatastuselect.StuNo &&
+                                                                         m.AcademicYearNo == insertDatastuselect.AcademicYearNo &&
+                                                                         m.Semester == insertDatastuselect.Semester &&
+                                                                         m.DeptNo == insertDatastuselect.DeptNo &&
+                                                                         m.MajorNo == insertDatastuselect.MajorNo &&
+                                                                         m.LessonNo == insertDatastuselect.LessonNo &&
+                                                                         m.Grade == insertDatastuselect.Grade &&
+                                                                         m.OpenLessonDeptNo == insertDatastuselect.OpenLessonDeptNo &&
+                                                                         m.OpenLessonMajorNo == insertDatastuselect.OpenLessonMajorNo) == 0 && insertStuSelectLessonListDataList.Count(m => m.StuNo == insertDatastuselect.StuNo &&
+                                                                                                                                                                                            m.AcademicYearNo == insertDatastuselect.AcademicYearNo &&
+                                                                                                                                                                                            m.Semester == insertDatastuselect.Semester &&
+                                                                                                                                                                                            m.DeptNo == insertDatastuselect.DeptNo &&
+                                                                                                                                                                                            m.MajorNo == insertDatastuselect.MajorNo &&
+                                                                                                                                                                                            m.LessonNo == insertDatastuselect.LessonNo &&
+                                                                                                                                                                                            m.Grade == insertDatastuselect.Grade &&
+                                                                                                                                                                                            m.OpenLessonDeptNo == insertDatastuselect.OpenLessonDeptNo &&
+                                                                                                                                                                                            m.OpenLessonMajorNo == insertDatastuselect.OpenLessonMajorNo) == 0)
+                            {
+                                insertStuSelectLessonListDataList.Add(insertDatastuselect);
+                            }
+                        }
+                    }
+                    this.BaseRepository("CollegeMIS").Insert(insertStuSelectLessonListDataList);
+                }
+                //重置StuScoreOnline
+                var strSql = new StringBuilder();
+                strSql.Append(@"insert into stuscore(NoticeBookNo,StuNo,DeptNo,MajorNo,ClassNo,StuName,GenderNo,AcademicYearNo,Semester,OpenLessonDeptNo,OpenLessonMajorNo,LessonNo,LessonName,LessonNameEn,TeachClassNo,LessonSortNo,StuSortNo,Grade,StudyScore,TotalStudyHour,OrdinaryScore,TermInScore,TermEndScore,OtherScore,IsInEffect,Remark,ConflictLessonNo,IsPitchOn,CheckMark,TechPlanNo,EmpNo,PartCode,ScoreRecordStyleNo,TestModeNo,zysx,TestKindNo,IsEditable)
+select NoticeBookNo,StuNo,DeptNo,MajorNo,ClassNo,StuName,GenderNo,AcademicYearNo,Semester,OpenLessonDeptNo,OpenLessonMajorNo,LessonNo,LessonName,LessonNameEng as LessionNameEn,TeachClassNo,LessonSortNo,StuSortNo,Grade,StudyScore,TotalStudyHour,'0','0','0','0',IsInEffect,Remark,ConflictLessonNo,IsPitchOn,CheckMark,TeachPlanNo as TechPlanNo,EmpNo,PartCode,ScoreRecordStyleNo,TestModeNo,zysx=1,TestKindNo=1,IsEditable=1 from 
+(
+select s.NoticeBookNo,s.StuNo,s.DeptNo,s.MajorNo,s.ClassNo,s.StuName,s.GenderNo,s.AcademicYearNo,s.Semester,s.OpenLessonDeptNo,s.OpenLessonMajorNo,s.LessonNo,s.LessonName,s.LessonNameEng,s.TeachClassNo,s.LessonSortNo,s.StuSortNo,s.Grade,s.StudyScore,s.TotalStudyHour,s.IsInEffect,s.Remark,s.ConflictLessonNo,s.IsPitchOn,s.CheckMark,s.TeachPlanNo,s.EmpNo,s.PartCode,o.ScoreRecordStyleNo,cs.ScoreRecordName,bc.TestModeNo,bc.TestMode
+from StuSelectLessonList s 
+left join OpenLessonPlan o on s.AcademicYearNo=o.AcademicYearNo and s.Semester=o.Semester and s.LessonNo=o.LessonNo 
+and s.PartCode=o.PartCode and s.OpenLessonMajorNo=o.MajorNo 
+left join CdScoreRecordStyle cs on o.ScoreRecordStyleNo=cs.ScoreRecordStyleNo
+left join BCdTestMode bc on o.CheckStyleNo=bc.TestModeNo
+where s.AcademicYearNo='" + academicYearNo + "' and s.Semester='" + semester + "' and s.TeachClassNo='" + classNo + @"' and s.LessonSortNo='1'
+) as sl
+where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Academicyearno
+ and s.Semester = sl.Semester and s.lessonno = sl.lessonno and s.teachclassno = sl.teachclassno and s.LessonSortNo = '1') ");
+                this.BaseRepository("CollegeMIS").ExecuteBySql(strSql.ToString());
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 学年下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetAcademicYearNoData()
+        {
+            try
+            {
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>("select distinct s.AcademicYearNo as value,s.AcademicYearNo as text from StuScoreOnline s ");
+                data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 班级下拉框信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct s.ClassNo as value,c.ClassName as text from stuscore s inner join ClassInfo c on s.ClassNo=c.ClassNo where s.LessonSortNo='1' ");
+                if (userType == "教师")
+                {
+                    strSql.Append(" and s.EmpNo='" + userAccount + "' ");
+                }
+                if (!string.IsNullOrEmpty(lessonNo))
+                {
+                    strSql.Append(" and s.LessonNo='" + lessonNo + "' ");
+                }
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
+                data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 班级下拉框【成绩录入】
+        /// </summary>
+        /// <param name="userAccount"></param>
+        /// <param name="userType"></param>
+        /// <param name="lessonNo"></param>
+        /// <param name="academicYearShort"></param>
+        /// <param name="semester"></param>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetClassNoDataForInput(string userAccount, string userType, string lessonNo, string academicYearShort, string semester)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct s.ClassNo as value,c.ClassName as text from stuscore s inner join ClassInfo c on s.ClassNo=c.ClassNo where s.LessonSortNo='1' ");
+                if (userType == "教师")
+                {
+                    strSql.Append(" and s.EmpNo='" + userAccount + "' ");
+                }
+
+                if (!string.IsNullOrEmpty(academicYearShort))
+                {
+                    strSql.Append(" and s.AcademicYearNo='" + academicYearShort + "' and s.Semester='" + semester + "' ");
+                }
+                if (!string.IsNullOrEmpty(lessonNo))
+                {
+                    strSql.Append(" and s.LessonNo='" + lessonNo + "' ");
+                }
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
+                data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 教师下拉框信息【学生成绩录入可去审核】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetEmpNoData(string userAccount, string userType, string lessonNo)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct s.EmpNo as value,c.EmpName as text from StuScoreOnline s inner join EmpInfo c on s.EmpNo=c.EmpNo where 1=1 ");
+                if (userType == "教师")
+                {
+                    strSql.Append(" and s.EmpNo='" + userAccount + "' ");
+                }
+                if (!string.IsNullOrEmpty(lessonNo))
+                {
+                    strSql.Append(" and s.LessonNo='" + lessonNo + "' ");
+                }
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
+                data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 课程下拉框信息【学生成绩录入可去审核】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo = "", string Semester = "")
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct s.LessonNo as value,s.LessonName as text from StuScoreOnline s where 1=1 ");
+                if (userType == "教师")
+                {
+                    strSql.Append(" and s.EmpNo='" + userAccount + "' ");
+                }
+                if (!string.IsNullOrEmpty(AcademicYearNo))
+                {
+                    strSql.Append(" and s.AcademicYearNo='" + AcademicYearNo + "' and s.Semester='" + Semester + "' ");
+                }
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
+                data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 课程下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetElectiveLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo = "", string Semester = "")
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct s.LessonNo as value,l.LessonName as text from stuscore s left join LessonInfo l on s.LessonNo=l.LessonNo where s.LessonSortNo='2' ");
+                if (userType == "教师")
+                {
+                    strSql.Append(" and s.EmpNo='" + userAccount + "' ");
+                }
+                if (!string.IsNullOrEmpty(AcademicYearNo))
+                {
+                    strSql.Append(" and s.AcademicYearNo='" + AcademicYearNo + "' and s.Semester='" + Semester + "' ");
+                }
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
+                data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 教室下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetElectiveClassRoomNoData(string userAccount, string userType, string lessonNo)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct s.ClassRoomNo as value,c.ClassroomName as text from stuscore s inner join ClassroomInfo c on s.ClassRoomNo=c.ClassroomNo where s.LessonSortNo='2' ");
+                if (userType == "教师")
+                {
+                    strSql.Append(" and s.EmpNo='" + userAccount + "' ");
+                }
+                if (!string.IsNullOrEmpty(lessonNo))
+                {
+                    strSql.Append(" and s.LessonNo='" + lessonNo + "' ");
+                }
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
+                data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 节次下拉框信息【选修课】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetElectiveLessonSectionData(string userAccount, string userType, string classRoomNo)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct s.LessonSection as value,s.LessonSection as text from stuscore s where s.LessonSortNo='2' ");
+                if (userType == "教师")
+                {
+                    strSql.Append(" and s.EmpNo='" + userAccount + "' ");
+                }
+                if (!string.IsNullOrEmpty(classRoomNo))
+                {
+                    strSql.Append(" and s.ClassRoomNo='" + classRoomNo + "' ");
+                }
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
+                data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 课程信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetLessonNoData(string academicYearNo, string semester, string classNo)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct s.LessonNo as value,s.LessonName as text from stuscore s ");
+                strSql.Append(" where s.AcademicYearNo='" + academicYearNo + "' and s.Semester='" + semester + "' and s.ClassNo='" + classNo + "' and s.LessonSortNo='1' ");
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
+                data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取班级成绩列表
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetScoreListByClassNo(string queryJson)
+        {
+            try
+            {
+                //参考写法
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                var tableName = "StuScoreOnline";
+                if (!queryParam["TableName"].IsEmpty())
+                {
+                    tableName = queryParam["TableName"].ToString();
+                }
+                var strSql = new StringBuilder();
+                strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.ClassNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName ");
+                strSql.Append(" ,case when bb.Score >=60 then bb.Score else (case when sp.Score>= 60 then sp.Score else (case when spt.Score>=60 then spt.Score else bb.Score end) end) end as Score ");
+                strSql.Append(" ,case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end as ScoreFormat ");
+                strSql.Append(" from ( ");
+                strSql.Append($" select s.AcademicYearNo,s.Semester,s.ClassNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo ");
+                strSql.Append(" where 1=1 and s.LessonSortNo='1' and s.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus =1) ");
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" and s.AcademicYearNo=@AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" and s.Semester=@Semester ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" and s.ClassNo=@ClassNo ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" and s.StuNo=@StuNo ");
+                }
+                strSql.Append(" group by s.AcademicYearNo,s.Semester,s.ClassNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName ) as bb ");
+                strSql.Append(" left join StuScoreOnlineNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.ClassNo=sp.ClassNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo ");
+                strSql.Append(" left join StuScoreOnlineNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.ClassNo=spt.ClassNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo ");
+
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 获取班级成绩列表（校级奖学金）
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetScoreListByClassNoForScholarship(string queryJson)
+        {
+            try
+            {
+                //参考写法
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                var tableName = "StuScoreOnline";
+                if (!queryParam["TableName"].IsEmpty())
+                {
+                    tableName = queryParam["TableName"].ToString();
+                }
+                var strSql = new StringBuilder();
+                strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.DeptNo,bb.ClassNo,bb.IdentityCardNo as IdCard,bb.DepositBank,bb.BankCard ,bb.MajorNo,bb.GenderNo,bb.Birthday,bb.NationalityNo,bb.PartyFaceNo,bb.Grade ");
+                strSql.Append(" ,case when bb.Score >=60 then bb.Score else (case when sp.Score>= 60 then sp.Score else (case when spt.Score>=60 then spt.Score else bb.Score end) end) end as Score ");
+                strSql.Append(" ,case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end as ScoreFormat ");
+                strSql.Append(" from ( ");
+                strSql.Append($" select s.AcademicYearNo,s.Semester,s.ClassNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score,sb.DeptNo,sb.IdentityCardNo,sb.DepositBank,sb.BankCard,sb.majorno,sb.GenderNo,sb.Birthday,sb.NationalityNo,sb.PartyFaceNo,sb.Grade from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo ");
+                strSql.Append(" where 1=1 and s.LessonSortNo='1' and s.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus =1) ");
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" and s.AcademicYearNo=@AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" and s.Semester=@Semester ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" and s.ClassNo=@ClassNo ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" and s.StuNo=@StuNo ");
+                }
+                strSql.Append(" group by s.AcademicYearNo,s.Semester,s.ClassNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,sb.DeptNo,sb.ClassNo,sb.IdentityCardNo,sb.DepositBank,sb.BankCard,sb.majorno,sb.GenderNo,sb.Birthday,sb.NationalityNo,sb.PartyFaceNo,sb.Grade ) as bb ");
+                strSql.Append(" left join StuScoreOnlineNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.ClassNo=sp.ClassNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo ");
+                strSql.Append(" left join StuScoreOnlineNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.ClassNo=spt.ClassNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo ");
+
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取学生的补考信息
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public List<object> GetStuGraduateInfo(string queryJson)
+        {
+            try
+            {
+                var aa = new List<object>();
+
+                //参考写法
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    var stuNo = queryParam["StuNo"].ToString();
+                    var result = GetStuPassInfo(stuNo);
+                    aa.Add(result);
+
+                }
+                else
+                {
+                    var classNo = queryParam["ClassNo"].ToString();
+                    var listStu = this.BaseRepository("CollegeMIS")
+                        .FindList<StuInfoBasicEntity>(a => a.ClassNo == classNo);
+
+                    foreach (var stuInfo in listStu)
+                    {
+                        aa.Add(GetStuPassInfo(stuInfo?.StuNo));
+                    }
+                }
+
+                return aa;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        public List<object> GetPassInfo(string queryJson)
+        {
+            try
+            {
+                var aa = new List<object>();
+
+                //参考写法
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    var stuNo = queryParam["StuNo"].ToString();
+                    //暂时注释
+                    //var passInfo1 = this.BaseRepository("CollegeMIS")
+                    //    .FindList<StuScoreOnlineNotPassEntity>(a => a.StuNo == stuNo);
+                    //foreach (var item in passInfo1)
+                    //{
+                    //    aa.Add(new { item.LessonNo, item.LessonName, item.Score, Type = "第一次补考" });
+                    //}
+                    //var passInfo2 = this.BaseRepository("CollegeMIS")
+                    //    .FindList<StuScoreOnlineNotPassTwoEntity>(a => a.StuNo == stuNo);
+                    //foreach (var item in passInfo2)
+                    //{
+                    //    aa.Add(new { item.LessonNo, item.LessonName, item.Score, Type = "第二次补考" });
+                    //}
+
+                }
+
+                return aa;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        public List<object> GetClassOfMy()
+        {
+            try
+            {
+                var aa = new List<object>();
+
+                var userInfo = LoginUserInfo.Get();
+                var classList = this.BaseRepository("CollegeMIS")
+                    .FindList<ClassInfoEntity>(a => a.ClassDiredctorNo == userInfo.account);
+                foreach (var item in classList)
+                {
+                    aa.Add(new { text = item.ClassName, value = item.ClassNo });
+                }
+
+                return aa;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public object GetStuPassInfo(string stuNo)
+        {
+            var stuInfo = this.BaseRepository("CollegeMIS")
+                .FindEntity<StuInfoBasicEntity>(a => a.StuNo == stuNo);
+
+            //暂时注释
+            //var notpass1 = this.BaseRepository("CollegeMIS")
+            //    .FindList<StuScoreOnlineNotPassEntity>(a => a.StuNo == stuNo).Count();
+            //var notpass2 = this.BaseRepository("CollegeMIS")
+            //    .FindList<StuScoreOnlineNotPassTwoEntity>(a => a.StuNo == stuNo).Count();
+            //if ((notpass1 + notpass2) > 0)
+            if(0>0)
+            {
+                var result = new
+                {
+                    StuNo = stuInfo?.StuNo,
+                    StuName = stuInfo?.StuName,
+                    IsNoPass = "是",
+                    FinishSchoolMark = stuInfo?.FinishSchoolMark
+                };
+                return result;
+            }
+            else
+            {
+                var result = new
+                {
+                    StuNo = stuInfo?.StuNo,
+                    StuName = stuInfo?.StuName,
+                    IsNoPass = "否",
+                    FinishSchoolMark = stuInfo?.FinishSchoolMark
+                };
+                return result;
+            }
+        }
+
+
+        /// <summary>
+        /// 获取个人成绩列表
+        /// <summary>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetAllScoreListByStuNo(string stuNo)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select s.AcademicYearNo,s.Semester,s.LessonNo,s.LessonName,s.LessonSortNo,MAX(s.Score) as Score from StuScoreOnline s ");
+                strSql.Append(" where s.StuNo='" + stuNo + "' ");
+                strSql.Append(" group by s.AcademicYearNo,s.Semester,s.LessonNo,s.LessonName,s.LessonSortNo ");
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 审核学生成绩
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void CheckStuScoreOnline(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScoreOnline set CheckMark='1' where ScoreId='" + keyValue + "' ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 去审核学生成绩
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void UnCheckStuScoreOnline(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScoreOnline set CheckMark='0' where ScoreId='" + keyValue + "' ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取个人补考成绩
+        /// <summary>
+        /// <returns></returns>
+        public StuScoreOnlineEntity GetScoreNotPassByEntity(StuScoreOnlineEntity entity)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select s.ScoreId,s.AcademicYearNo,s.Semester,s.LessonNo,s.Score from StuScoreOnlineNotPass s ");
+                strSql.Append($" where s.AcademicYearNo='{entity.AcademicYearNo}' and s.Semester='{entity.Semester}' and s.StuNo='{entity.StuNo}' and s.LessonNo='{entity.LessonNo}' and s.CheckMark='1' ");
+                var aa = this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString());
+                return aa.FirstOrDefault();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取个人二次补考成绩
+        /// <summary>
+        /// <returns></returns>
+        public StuScoreOnlineEntity GetScoreNotPassTwoByEntity(StuScoreOnlineEntity entity)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select s.ScoreId,s.AcademicYearNo,s.Semester,s.LessonNo,s.Score from StuScoreOnlineNotPassTwo s ");
+                strSql.Append($" where s.AcademicYearNo='{entity.AcademicYearNo}' and s.Semester='{entity.Semester}' and s.StuNo='{entity.StuNo}' and s.LessonNo='{entity.LessonNo}' and s.CheckMark='1' ");
+                var aa = this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString());
+                return aa.FirstOrDefault();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 开始录入：占用成绩
+        /// <summary>
+        /// <returns></returns>
+        public void StartInputScore(string queryJson)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
+                var Semester = queryParam["Semester"].ToString();
+                var LessonNo = queryParam["LessonNo"].ToString();
+                var EmpNo = queryParam["EmpNo"].ToString();
+                
+                var now = DateTime.Now;
+                var loginUserInfo = LoginUserInfo.Get();
+                this.BaseRepository("CollegeMIS").ExecuteBySql("update StuScoreOnline set IsEditable='0',EditUserId='" + loginUserInfo.account + "',BeginModifyDate='" + now + "' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and LessonNo='" + LessonNo + "' and EmpNo='" + EmpNo + "' ");
+                
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 提交成绩
+        /// <summary>
+        /// <returns></returns>
+        public void SaveInputScore(List<StuScoreOnlineEntity> list)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                var now = DateTime.Now;
+                var loginUserInfo = LoginUserInfo.Get();
+
+                foreach (var item in list)
+                {
+                    item.OrdinaryScore = item.OrdinaryScore.HasValue ? item.OrdinaryScore.Value : 0;
+                    item.TermInScore = item.TermInScore.HasValue ? item.TermInScore.Value : 0;
+                    item.TermEndScore = item.TermEndScore.HasValue ? item.TermEndScore.Value : 0;
+                    item.OtherScore = item.OtherScore.HasValue ? item.OtherScore.Value : 0;
+                    item.Score = item.Score.HasValue ? item.Score.Value : 0;
+                    //if (!item.Score.HasValue)
+                    //{
+                    //    item.Score = 0;
+                    //}
+                    //db.ExecuteBySql($"update StuScoreOnline set OrdinaryScore={item.OrdinaryScore},TermInScore={item.TermInScore},TermEndScore={item.TermEndScore},OtherScore={item.OtherScore},Score={item.Score},IsEditable='1',EditUserId=null,BeginModifyDate=null,ModifyDate='{now}',ModifyUserId='{loginUserInfo.userId}',ModifyUserName='{loginUserInfo.realName}' where ScoreId='{item.ScoreId}' ");
+                    db.ExecuteBySql($"update StuScoreOnline set OrdinaryScore={item.OrdinaryScore},TermInScore={item.TermInScore},TermEndScore={item.TermEndScore},OtherScore={item.OtherScore},Score={item.Score},Remark='{item.Remark}' where ScoreId='{item.ScoreId}' ");
+                }
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 提交成绩：取消占用
+        /// <summary>
+        /// <returns></returns>
+        public void SaveInputScoreStatus(string queryJson)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
+                var Semester = queryParam["Semester"].ToString();
+                var LessonNo = queryParam["LessonNo"].ToString();
+                var EmpNo = queryParam["EmpNo"].ToString();
+                
+                var now = DateTime.Now;
+                var loginUserInfo = LoginUserInfo.Get();
+                this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set IsEditable='1',EditUserId=null,BeginModifyDate=null,ModifyDate='{now}',ModifyUserId='{loginUserInfo.account}',ModifyUserName='{loginUserInfo.realName}' where F_SchoolId='{F_SchoolId}' and AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and LessonNo='{LessonNo}' and EmpNo='{EmpNo}' ");
+                
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 提交成绩：取消占用【服务】
+        /// <summary>
+        /// <returns></returns>
+        public void SaveInputScoreStatus2(string queryJson, string name)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
+                var Semester = queryParam["Semester"].ToString();
+                var LessonNo = queryParam["LessonNo"].ToString();
+                var EmpNo = queryParam["EmpNo"].ToString();
+                
+                var now = DateTime.Now;
+                var loginUserInfo = new
+                {
+                    account = name.Split('_')[0],
+                    realName = name.Split('_')[1]
+                };
+                this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set IsEditable='1',EditUserId=null,BeginModifyDate=null,ModifyDate='{now}',ModifyUserId='{loginUserInfo.account}',ModifyUserName='{loginUserInfo.realName}' where F_SchoolId='{F_SchoolId}' and AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and LessonNo='{LessonNo}' and EmpNo='{EmpNo}' ");
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 审核成绩
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <param name="checkMark">已审核：1；未审核：0；</param>
+        public void DoCheckScore(string queryJson, int checkMark)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
+                var Semester = queryParam["Semester"].ToString();
+                var LessonNo = queryParam["LessonNo"].ToString();
+                var EmpNo = queryParam["EmpNo"].ToString();
+
+                this.BaseRepository("CollegeMIS").ExecuteBySql($"update StuScoreOnline set CheckMark='{checkMark}' where F_SchoolId='" + F_SchoolId + "' and AcademicYearNo='" + AcademicYearNo + "' and Semester='" + Semester + "' and LessonNo='" + LessonNo + "' and EmpNo='" + EmpNo + "' ");
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 学生成绩查看含选修
+        /// </summary>
+        /// <param name="academicYearNo"></param>
+        /// <param name="semester"></param>
+        /// <param name="stuNo"></param>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataFromStuNo(string academicYearNo, string semester, string stuNo)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct s.LessonNo as value,s.LessonName+(case s.LessonSortNo when '2' then '(选修)' else '' end) as text from stuscore s ");
+                strSql.Append(" where s.AcademicYearNo='" + academicYearNo + "' and s.Semester='" + semester + "' and s.StuNo='" + stuNo + "' ");
+                var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
+                data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                return data;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<StuScoreOnlineEntity> GetScoreListByStuNo(string queryJson)
+        {
+            try
+            {
+                //参考写法
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                var tableName = "StuScoreOnline";
+                if (!queryParam["TableName"].IsEmpty())
+                {
+                    tableName = queryParam["TableName"].ToString();
+                }
+                var strSql = new StringBuilder();
+                strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName ");
+                strSql.Append(" ,case when bb.LessonSortNo='2' then bb.Score else (case when bb.Score >=60 then bb.Score else (case when sp.Score>= 60 then sp.Score else (case when spt.Score>=60 then spt.Score else bb.Score end) end) end) end as Score ");
+                strSql.Append(" ,case when bb.LessonSortNo='2' then convert(nvarchar(50),bb.Score)+'(选修)' else (case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end) end as ScoreFormat ");
+                strSql.Append(" from ( ");
+                strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo ");
+                strSql.Append(" where 1=1 and s.CheckMark='1' ");
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" and s.AcademicYearNo=@AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" and s.Semester=@Semester ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" and s.StuNo=@StuNo ");
+                }
+                strSql.Append(" group by s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName ) as bb ");
+                strSql.Append(" left join StuScoreOnlineNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.LessonSortNo=sp.LessonSortNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo and sp.CheckMark = '1' ");
+                strSql.Append(" left join StuScoreOnlineNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.LessonSortNo=spt.LessonSortNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo and spt.CheckMark = '1' ");
+
+                return this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 根据学号/姓名获取学生成绩列表
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public IEnumerable<StuScoreOnlineEntity> GetScoreListByStuInfo(string queryJson)
+        {
+            try
+            {
+                //参考写法
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                var tableName = "StuScoreOnline";
+                if (!queryParam["TableName"].IsEmpty())
+                {
+                    tableName = queryParam["TableName"].ToString();
+                }
+                var strSql = new StringBuilder();
+                strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.MajorNo,bb.ClassNo,li.StudyScore,ls.LessonSortName,bb.Score,(case when sp.Score>=60 then 60 else sp.score end) as ScoreOfNotPass,(case when spt.Score>=60 then 60 else spt.Score end) as ScoreOfNotPassTwo,cm.MajorName,ci.ClassName ");
+                strSql.Append(" from ( ");
+                strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo ");
+                strSql.Append(" where 1=1 and s.CheckMark='1' ");
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" and s.AcademicYearNo=@AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" and s.Semester=@Semester ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" and s.StuNo=@StuNo ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", queryParam["StuName"].ToString(), DbType.String);
+                    strSql.Append(" and s.StuName=@StuName ");
+                }
+                strSql.Append(" group by s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo ) as bb ");
+                strSql.Append(" left join StuScoreOnlineNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.LessonSortNo=sp.LessonSortNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo and sp.CheckMark = '1' ");
+                strSql.Append(" left join StuScoreOnlineNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.LessonSortNo=spt.LessonSortNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo and spt.CheckMark = '1' ");
+                strSql.Append(" left join CdLessonSort ls on bb.LessonSortNo= ls.LessonSortNo ");
+                strSql.Append(" left join LessonInfo li on bb.LessonNo= li.LessonNo and li.CheckMark='1' ");
+                strSql.Append(" left join CdMajor cm on bb.MajorNo= cm.MajorNo and cm.CheckMark='1' ");
+                strSql.Append(" left join ClassInfo ci on bb.ClassNo= ci.ClassNo and ci.CheckMark='1' ");
+
+                var result = this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(strSql.ToString(), dp);
+
+                //计算专业排名，班级排名
+                if (result.Any())
+                {
+                    var temp = result.GroupBy(x => new { x.AcademicYearNo, x.Semester }).Select(x => new StuScoreOnlineEntity()
+                    {
+                        AcademicYearNo = x.Key.AcademicYearNo,
+                        Semester = x.Key.Semester,
+                        StuNo = x.FirstOrDefault().StuNo,
+                        ClassNo = x.FirstOrDefault().ClassNo,
+                        MajorNo = x.FirstOrDefault().MajorNo
+                    }).ToList();
+                    if (temp.Any())
+                    {
+                        foreach (var item in temp)
+                        {
+                            //专业排名
+                            var ml = this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.LessonSortNo == "1" && x.MajorNo == item.MajorNo && x.CheckMark == "1");
+                            var mlGroup = ml.GroupBy(x => x.StuNo).Select(x => new
+                            {
+                                StuNo = x.Key,
+                                TotalScore = x.Select(y => y.Score).Sum()
+                            }).OrderByDescending(x => x.TotalScore);
+                            if (mlGroup.Any())
+                            {
+                                var rank = mlGroup.Select(x => x.StuNo).ToList().IndexOf(item.StuNo);
+                                item.RankInMajor = rank + 1;
+                            }
+                            //班级排名
+                            var cl = this.BaseRepository("CollegeMIS").FindList<StuScoreOnlineEntity>(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.LessonSortNo == "1" && x.ClassNo == item.ClassNo && x.CheckMark == "1");
+                            var clGroup = cl.GroupBy(x => x.StuNo).Select(x => new
+                            {
+                                StuNo = x.Key,
+                                TotalScore = x.Select(y => y.Score).Sum()
+                            }).OrderByDescending(x => x.TotalScore);
+                            if (clGroup.Any())
+                            {
+                                var rank = clGroup.Select(x => x.StuNo).ToList().IndexOf(item.StuNo);
+                                item.RankInClass = rank + 1;
+                            }
+                        }
+                    }
+                    foreach (var ii in result)
+                    {
+                        ii.RankInMajor = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInMajor;
+                        ii.RankInClass = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInClass;
+                    }
+
+                }
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 成绩导入--必修课 选修课
+        /// </summary>
+        /// <param name="type">1：必修，2：选修</param>
+        /// <param name="dt"></param>
+        /// <param name="fileGuid"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public (DataTable failDt, int snum, int fnum) ExecuteImportExcel(int type, DataTable dt, string fileGuid,
+            string queryJson)
+        {
+            if (type == 1)
+            {
+                //必修
+                return ExecuteImportExcelForRequired(dt, fileGuid, queryJson);
+            }
+            else
+            {
+                //选修
+                return ExecuteImportExcelForElective(dt, fileGuid, queryJson);
+            }
+
+        }
+
+        /// <summary>
+        /// 导入学生成绩--必修课
+        /// </summary>
+        /// <param name="dt"></param>
+        /// <returns></returns>
+        private (DataTable failDt, int snum, int fnum) ExecuteImportExcelForRequired(DataTable dt, string fileGuid, string queryJson)
+        {
+            //成功记录数
+            int snum = 0;
+            //总记录数
+            int num = 0;
+            var db = this.BaseRepository("CollegeMIS");
+            var msg = "";
+            try
+            {
+                db.BeginTrans();
+                // 创建一个datatable容器用于保存导入失败的数据
+                DataTable failDt = new DataTable();
+
+                var queryParam = queryJson.ToJObject();
+                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
+                var Semester = queryParam["Semester"].ToString();
+                var LessonNo = queryParam["LessonNo"].ToString();
+                var ClassNo = queryParam["ClassNo"].ToString();
+                var classInfoList = db.FindList<ClassInfoEntity>();
+                var lessonInfoList = db.FindList<LessonInfoEntity>();
+                var classInfoEntity = classInfoList.FirstOrDefault(x => x.ClassNo == ClassNo);
+                var lessonInfoEntity = lessonInfoList.FirstOrDefault(x => x.LessonNo == LessonNo && x.CheckMark == true);
+
+                if (classInfoEntity != null)
+                {
+                    //获取成绩比例数据
+                    var stuSelectLessonListEntity = db.FindEntity<StuSelectLessonListEntity>(x => x.F_SchoolId == F_SchoolId && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.OpenLessonDeptNo == classInfoEntity.DeptNo && x.OpenLessonMajorNo == classInfoEntity.MajorNo && x.LessonNo == LessonNo && x.LessonSortNo == "1" && x.ClassNo == ClassNo);
+                    if (stuSelectLessonListEntity != null)
+                    {
+                        //当前班级学生成绩
+                        var list = GetList(queryJson).ToList();
+
+                        foreach (DataColumn dc in dt.Columns)
+                        {
+                            failDt.Columns.Add(dc.ColumnName, dc.DataType);
+                        }
+                        failDt.Columns.Add("导入错误", typeof(string));
+                        dt.Columns.Add("导入错误", typeof(string));
+
+                        foreach (DataRow dr in dt.Rows)
+                        {
+                            try
+                            {
+                                var stuno = dr["学号"].ToString().Trim();
+                                var academicYearNo_dr = dr["学年"].ToString().Trim();
+                                var semester_dr = dr["学期"].ToString().Trim();
+                                var lessoninfo_dr = dr["课程名称"].ToString().Trim();
+                                var classinfo_dr = dr["班级"].ToString().Trim();
+                                //var lessonNo_dr = lessonInfoList.FirstOrDefault(x => x.LessonName == lessoninfo_dr)?.LessonNo;
+                                //var classNo_dr = classInfoList.FirstOrDefault(x => x.ClassName == classinfo_dr)?.ClassNo;
+
+                                if (!string.IsNullOrEmpty(stuno))
+                                {
+                                    num++;
+                                    if (!academicYearNo_dr.Equals(AcademicYearNo) || !semester_dr.Equals(Semester))
+                                    {
+                                        dr["导入错误"] = "学年学期与查询条件不匹配！";
+                                        failDt.Rows.Add(dr.ItemArray);
+                                        continue;
+                                    }
+
+                                    if (!classinfo_dr.Equals(classInfoEntity.ClassName))
+                                    {
+                                        dr["导入错误"] = "班级与查询条件班级（" + classInfoEntity.ClassName + "）不匹配！";
+                                        failDt.Rows.Add(dr.ItemArray);
+                                        continue;
+                                    }
+                                    if (!lessoninfo_dr.Equals(lessonInfoEntity.LessonName))
+                                    {
+                                        dr["导入错误"] = "课程与查询条件课程（" + lessonInfoEntity.LessonName + "）不匹配！";
+                                        failDt.Rows.Add(dr.ItemArray);
+                                        continue;
+                                    }
+
+                                    if (!lessoninfo_dr.Equals(lessonInfoEntity.LessonName) || !classinfo_dr.Equals(classInfoEntity.ClassName))
+                                    {
+                                        dr["导入错误"] = "课程：" + lessonInfoEntity.LessonName + "，班级：" + classInfoEntity.ClassName + "找不到学号为" + stuno + "的学生";
+                                        failDt.Rows.Add(dr.ItemArray);
+                                        continue;
+                                    }
+                                    var item = list.Find(x => x.StuNo == stuno && x.LessonNo == LessonNo && x.ClassNo == ClassNo);
+                                    var OrdinaryScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["平时成绩"].ToString().Trim()) ? "0" : dr["平时成绩"].ToString().Trim());
+                                    var TermInScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期中成绩"].ToString().Trim()) ? "0" : dr["期中成绩"].ToString().Trim());
+                                    var TermEndScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期末成绩"].ToString().Trim()) ? "0" : dr["期末成绩"].ToString().Trim());
+                                    var OtherScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["其他成绩"].ToString().Trim()) ? "0" : dr["其他成绩"].ToString().Trim());
+                                    if (OrdinaryScore < 0 || TermInScore < 0 || TermEndScore < 0 || OtherScore < 0)
+                                    {
+                                        dr["导入错误"] = "成绩必须大于0！";
+                                        failDt.Rows.Add(dr.ItemArray);
+                                        continue;
+                                    }
+                                    var Score = Math.Round(Convert.ToDouble(OrdinaryScore * (stuSelectLessonListEntity.OrdinaryScoreScale / 100) +
+                                                TermInScore * (stuSelectLessonListEntity.TermInScoreScale / 100) +
+                                                TermEndScore * (stuSelectLessonListEntity.TermEndScoreScale / 100) +
+                                                OtherScore * (stuSelectLessonListEntity.OtherScoreScale / 100)), MidpointRounding.AwayFromZero);
+                                    var remark = dr["备注"].ToString().Trim();
+                                    db.ExecuteBySql($"update StuScoreOnline set OrdinaryScore={OrdinaryScore},TermInScore={TermInScore},TermEndScore={TermEndScore},OtherScore={OtherScore},Score={Score},Remark='{remark}' where ScoreId='{item.ScoreId}' ");
+
+                                }
+                                else
+                                {
+                                    break;
+                                }
+                            }
+                            catch (Exception e)
+                            {
+                                dr["导入错误"] = "出现异常：" + e.Message;
+                                failDt.Rows.Add(dr.ItemArray);
+                                continue;
+                            }
+                        }
+                        db.Commit();
+
+                        // 写入缓存如果有未导入的数据
+                        if (failDt.Rows.Count > 0)
+                        {
+                            string errordt = failDt.ToJson();
+
+                            cache.Write<string>(cacheKey + fileGuid, errordt, CacheId.excel);
+                        }
+                        snum = (num - failDt.Rows.Count) > 0 ? num - failDt.Rows.Count : 0;
+                    }
+                }
+
+                return (failDt, snum, failDt.Rows.Count);
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 导入学生成绩--选修课
+        /// </summary>
+        /// <param name="dt"></param>
+        /// <returns></returns>
+        private (DataTable failDt, int snum, int fnum) ExecuteImportExcelForElective(DataTable dt, string fileGuid, string queryJson)
+        {
+
+            //成功记录数
+            int snum = 0;
+            //总记录数
+            int num = 0;
+            var db = this.BaseRepository("CollegeMIS");
+            var msg = "";
+            try
+            {
+                db.BeginTrans();
+
+                //创建一个datatable容器用于保存导入失败的数据
+                DataTable failDt = new DataTable();
+
+                var queryParam = queryJson.ToJObject();
+                var F_SchoolId = queryParam["F_SchoolId"].ToString();
+                var AcademicYearNo = queryParam["AcademicYearNo"].ToString();
+                var Semester = queryParam["Semester"].ToString();
+                var LessonNo = queryParam["LessonNo"].ToString();
+                var LessonSection = queryParam["LessonSection"].ToString();
+                var ClassRoomNo = queryParam["ClassRoomNo"].ToString();
+
+                var classRoomList = db.FindList<ClassroomInfoEntity>();
+                var lessonInfoList = db.FindList<LessonInfoEntity>();
+                var lessonInfoEntity = lessonInfoList.FirstOrDefault(x => x.LessonNo == LessonNo && x.CheckMark == true);
+                var classRoomEntity = classRoomList.FirstOrDefault(x => x.ClassroomNo == ClassRoomNo);
+
+                //成绩比例数据
+                var stuSelectLessonListOfElectiveEntity = this.BaseRepository("CollegeMIS").FindEntity<StuSelectLessonListOfElectiveEntity>(x => x.F_SchoolId == F_SchoolId && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.LessonNo == LessonNo && x.LessonSortNo == "2" && x.ClassRoomNo == ClassRoomNo && x.LessonSection == LessonSection);
+
+                if (stuSelectLessonListOfElectiveEntity != null)
+                {
+                    //查询学生成绩数据
+                    var list = GetList(queryJson).ToList();
+
+                    foreach (DataColumn dc in dt.Columns)
+                    {
+                        failDt.Columns.Add(dc.ColumnName, dc.DataType);
+                    }
+                    failDt.Columns.Add("导入错误", typeof(string));
+                    dt.Columns.Add("导入错误", typeof(string));
+
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        try
+                        {
+                            var stuno = dr["学号"].ToString().Trim();
+                            var academicYearNo_dr = dr["学年"].ToString().Trim();
+                            var semester_dr = dr["学期"].ToString().Trim();
+                            var lessoninfo_dr = dr["课程名称"].ToString().Trim();
+                            var classRoominfo_dr = dr["教室名称"].ToString().Trim();
+                            var lessonSection_dr = dr["节次"].ToString().Trim();
+                            //var lessonNo_dr = lessonInfoList.FirstOrDefault(x => x.LessonName == lessoninfo_dr)?.LessonNo;
+                            //var classRoomNo_dr = classRoomList.FirstOrDefault(x => x.ClassroomName == classRoominfo_dr)?.ClassroomNo;
+                            if (!string.IsNullOrEmpty(stuno))
+                            {
+                                num++;
+                                var item = list.Find(x => x.StuNo == stuno && x.LessonNo == LessonNo && x.ClassRoomNo == ClassRoomNo && x.LessonSection == LessonSection);
+                                if (!academicYearNo_dr.Equals(AcademicYearNo) || !semester_dr.Equals(semester_dr))
+                                {
+                                    dr["导入错误"] = "学年学期与查询条件不匹配！";
+                                    failDt.Rows.Add(dr.ItemArray);
+                                    continue;
+                                }
+
+                                if (!lessoninfo_dr.Equals(lessonInfoEntity.LessonName))
+                                {
+                                    dr["导入错误"] = "课程与查询条件课程（" + lessonInfoEntity.LessonName + "）不匹配！";
+                                    failDt.Rows.Add(dr.ItemArray);
+                                    continue;
+                                }
+                                if (!classRoominfo_dr.Equals(classRoomEntity.ClassroomName))
+                                {
+                                    dr["导入错误"] = "教室与查询条件教室（" + classRoomEntity.ClassroomName + "）不匹配！";
+                                    failDt.Rows.Add(dr.ItemArray);
+                                    continue;
+                                }
+                                if (!lessonSection_dr.Equals(LessonSection))
+                                {
+                                    dr["导入错误"] = "节次与查询条件节次（" + LessonSection + "）不匹配！";
+                                    failDt.Rows.Add(dr.ItemArray);
+                                    continue;
+                                }
+                                if (item == null)
+                                {
+                                    dr["导入错误"] = "课程：" + lessonInfoEntity.LessonName + "在" + LessonSection + "节次找不到学号为" + stuno + "的学生";
+                                    failDt.Rows.Add(dr.ItemArray);
+                                    continue;
+                                }
+                                var OrdinaryScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["平时成绩"].ToString().Trim()) ? "0" : dr["平时成绩"].ToString().Trim());
+                                var TermInScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期中成绩"].ToString().Trim()) ? "0" : dr["期中成绩"].ToString().Trim());
+                                var TermEndScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["期末成绩"].ToString().Trim()) ? "0" : dr["期末成绩"].ToString().Trim());
+                                var OtherScore = Convert.ToDecimal(string.IsNullOrEmpty(dr["其他成绩"].ToString().Trim()) ? "0" : dr["其他成绩"].ToString().Trim());
+                                if (OrdinaryScore < 0 || TermInScore < 0 || TermEndScore < 0 || OtherScore < 0)
+                                {
+                                    dr["导入错误"] = "成绩必须大于0！";
+                                    failDt.Rows.Add(dr.ItemArray);
+                                    continue;
+                                }
+
+                                var Score = Math.Round(Convert.ToDouble(OrdinaryScore * (stuSelectLessonListOfElectiveEntity.OrdinaryScoreScale / 100) +
+                                            TermInScore * (stuSelectLessonListOfElectiveEntity.TermInScoreScale / 100) +
+                                            TermEndScore * (stuSelectLessonListOfElectiveEntity.TermEndScoreScale / 100) +
+                                            OtherScore * (stuSelectLessonListOfElectiveEntity.OtherScoreScale / 100)), MidpointRounding.AwayFromZero);
+                                var remark = dr["备注"].ToString().Trim();
+                                db.ExecuteBySql($"update StuScoreOnline set OrdinaryScore={OrdinaryScore},TermInScore={TermInScore},TermEndScore={TermEndScore},OtherScore={OtherScore},Score={Score},Remark='{remark}' where ScoreId='{item.ScoreId}' ");
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            dr["导入错误"] = "出现异常：" + e.Message;
+                            failDt.Rows.Add(dr.ItemArray);
+                            continue;
+                        }
+                    }
+                    db.Commit();
+
+                    // 写入缓存如果有未导入的数据
+                    if (failDt.Rows.Count > 0)
+                    {
+                        string errordt = failDt.ToJson();
+
+                        cache.Write<string>(cacheKey + fileGuid, errordt, CacheId.excel);
+                    }
+
+                    snum = (num - failDt.Rows.Count) > 0 ? num - failDt.Rows.Count : 0;
+                }
+                return (failDt, snum, failDt.Rows.Count);
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
index 788d7dc46..4df6bb3c1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
@@ -96,6 +96,10 @@
     <Compile Include="EducationalAdministration\ElectiveMajorOnline\ElectiveMajorOnlineIBLL.cs" />
     <Compile Include="EducationalAdministration\ElectiveMajorOnline\ElectiveMajorOnlineService.cs" />
     <Compile Include="EducationalAdministration\SignUpOnlineHelper.cs" />
+    <Compile Include="EducationalAdministration\StuScoreOnline\StuScoreOnlineBLL.cs" />
+    <Compile Include="EducationalAdministration\StuScoreOnline\StuScoreOnlineEntity.cs" />
+    <Compile Include="EducationalAdministration\StuScoreOnline\StuScoreOnlineIBLL.cs" />
+    <Compile Include="EducationalAdministration\StuScoreOnline\StuScoreOnlineService.cs" />
     <Compile Include="EducationalAdministration\StuSelectLessonListOfElectiveOnline\StuSelectLessonListOfElectiveOnlineBLL.cs" />
     <Compile Include="EducationalAdministration\StuSelectLessonListOfElectiveOnline\StuSelectLessonListOfElectiveOnlineEntity.cs" />
     <Compile Include="EducationalAdministration\StuSelectLessonListOfElectiveOnline\StuSelectLessonListOfElectiveOnlineIBLL.cs" />
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
index ff1ff458b..d82e8cb8e 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
@@ -745,6 +745,19 @@
 				"navigationBarTitleText": "查看详情"
 			}
 		},
+		//线上课程选课
+		{
+			"path": "pages/EducationalAdministration/LessonInfoOfElectiveOnline/list",
+			"style": {
+				"navigationBarTitleText": "线上课程选课"
+			}
+		},
+		{
+			"path": "pages/EducationalAdministration/LessonInfoOfElectiveOnline/from",
+			"style": {
+				"navigationBarTitleText": "查看详情"
+			}
+		},
 		//学费查询
 		{
 			"path": "pages/StuPayFee/list",
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/from.vue
new file mode 100644
index 000000000..7f3b862a1
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/from.vue	
@@ -0,0 +1,137 @@
+<template>
+	<view class="page">
+		<l-input title="学年" placeholder="请填写学年" :value="data.AcademicYearNo" disabled right />
+		<l-input title="学期" placeholder="请填写学期" :value="data.Semester" disabled right />
+		<l-input title="课程编号" placeholder="请填写课程编号" :value="data.LessonNo" disabled right />
+		<l-input title="课程名称" placeholder="请填写课程名称" :value="data.LessonName" disabled right />
+		<l-input title="建课教师" placeholder="请填写建课教师" :value="data.EmpName" disabled right />
+		
+		<l-input title="建课学校" placeholder="请填写建课学校" :value="F_SchoolName" disabled right />
+
+		<l-input title="已报人数" placeholder="请填写已报人数" :value="data.StuNumOfApply" disabled right />
+		<view class="btn" @click="fromBtn" v-show="showFlag">报名</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				keyValue: '', //列表页面传参
+				data: {},
+				param: {}, //列表页面传参-对象
+				showFlag: true,
+				// 数据源
+				dataSource: {
+					F_SchoolId: []
+				},
+				F_SchoolName: '', //建课学校名称
+			}
+		},
+		methods: {
+			init() {
+				//this.keyValue = this.GET_PARAM(); //获取页面传递参数
+				// console.log(this.keyValue);
+
+				this.param = this.GET_PARAM();
+				//console.log(this.param);
+				this.keyValue = this.param.keyValue;
+				//审核中或者报名成功不显示报名按钮
+				if (this.param.Status == 1 || this.param.Status == 2) {
+					this.showFlag = false;
+				}
+
+				this.LOADING('加载数据中…');
+				this.HTTP_GET('learun/LessonInfoOfElectiveOnline/form', this.keyValue, '加载数据时出错').then(res => {
+					this.HIDE_LOADING();
+					this.data = res.data;
+					let timer3 = setTimeout(() => {
+						let checkedSchool = this.dataSource.F_SchoolId.find((item) => {
+							return item.value === this.data.F_SchoolId
+						});
+						if (checkedSchool) {
+							this.F_SchoolName = checkedSchool.text;
+						}
+						clearTimeout(timer3);
+					}, 500);
+
+				});
+			},
+			fromBtn() {
+				var _postData = {}
+				// let _this = this;
+				let user = this.GET_GLOBAL('loginUser');;
+				_postData.keyValue = this.keyValue;
+				_postData.StuNo = user.account;
+				this.LOADING('正在提交…');
+				this.HTTP_POST('learun/LessonInfoOfElectiveOnline/SignInByMobile', _postData, '加载数据时出错').then((res, info,
+					code) => {
+					//console.log(res)
+					if (res) { // 表单数据保存成功
+						//判断队列结果
+						let timer = setInterval(() => {
+							this.HTTP_POST('learun/LessonInfoOfElectiveOnline/GetApplyResult', _postData,
+								'报名状态').then(
+								(dataresult) => {
+									//console.log(dataresult)
+									clearInterval(timer);
+									if (!dataresult) return
+									this.HIDE_LOADING();
+									this.EMIT('LessonInfoOfElectiveOnline')
+									this.TOAST(dataresult.msg);
+									let timer2 = setTimeout(() => {
+										clearTimeout(timer2);
+										this.NAV_BACK();
+									}, 2000);
+								});
+						}, 5000);
+					}
+				});
+
+			}
+
+		},
+		created() {
+			// 拉取加载列表和数据源
+			Promise.all([
+				this.FETCH_DATASOURCE('company').then(result => {
+					this.dataSource.F_SchoolId = result.data.map(t => ({
+						text: t.f_fullname,
+						value: t.f_companyid
+					}))
+				}),
+				() => {},
+			]);
+			
+			this.init()
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.txt {
+		line-height: 24px;
+		font-size: 15px;
+		background-color: #fff;
+		padding: 10px 0 10px 15px;
+	}
+
+	.page {
+		background-color: #fff;
+		padding-bottom: 1px;
+	}
+
+	/deep/ .cu-form-group uni-textarea {
+		height: auto;
+	}
+
+	.remarks {
+		border-bottom: 0.5px solid #eee;
+		padding-bottom: 10px;
+	}
+
+	.remarks textarea {
+		width: 100%;
+		padding: 0 15px;
+	}
+</style>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/list.vue
new file mode 100644
index 000000000..8dd9b5e32
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/LessonInfoOfElectiveOnline/list.vue	
@@ -0,0 +1,304 @@
+<template>
+	<view class="page">
+		<view class="mainpage" :class="sideOpen ? 'show' : ''" style="padding-top: 40px;">
+			<!-- 顶部条目/分页信息栏 -->
+			<l-customlist-banner @buttonClick="sideOpen = true">{{
+			  tips
+			}}</l-customlist-banner>
+			<!-- <view class="records">共 {{ records }} 条数据</view> -->
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="data">
+				<l-customlist :tips="loadState" showTips>
+					<view class="pageBox customlist-item" showDelete="true" v-for="(item, ind) in data" :key="item.Id"
+						@click="tapClick(item)">
+						<view class="">
+							<text>学年：</text>
+							{{ item.AcademicYearNo }}
+						</view>
+						<view class="">
+							<text>学期：</text>
+							{{ item.Semester }}
+						</view>
+						<view class="">
+							<text>课程编号：</text>
+							{{ item.LessonNo }}
+						</view>
+						<view class="">
+							<text>课程名称：</text>
+							{{ item.LessonName }}
+						</view>
+						<view class="">
+							<text>建课教师：</text>
+							{{ item.EmpName }}
+						</view>
+						<view class="">
+							<text>建课学校：</text>
+							{{ dataSource.F_SchoolId.find(x=>x.value==item.F_SchoolId).text }}
+						</view>
+						<view class="">
+							<text>已报人数：</text>
+							{{ item.StuNumOfApply }}
+						</view>
+						<view class="pageType">
+							<text>报名状态：</text>
+							{{ typePd(item.Status) }}
+						</view>
+						<view class="delbtn" v-if="item.Status == 1" @click.stop="delTap(item)">取消报名</view>
+					</view>
+				</l-customlist>
+			</l-scroll-list>
+		</view>
+
+		<!-- 关闭侧边抽屉按钮 -->
+		<view @click="sideOpen = false" :class="sideOpen ? 'show' : ''" class="sideclose">
+			<l-icon type="pullright" color="blue" />
+		</view>
+
+		<!-- 侧边栏，用于设置查询条件 -->
+		<scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y>
+			<view v-if="ready" class="padding">
+
+				<l-input v-model="queryData.LessonNo" @change="searchChange" title="课程编号" placeholder="按课程编号查询" />
+				<l-input v-model="queryData.LessonName" @change="searchChange" title="课程名称" placeholder="按课程名称查询" />
+
+				<!-- 重置查询条件按钮 -->
+				<view class="padding-tb">
+					<l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button>
+				</view>
+			</view>
+		</scroll-view>
+
+	</view>
+</template>
+
+<script>
+	import pickBy from "lodash/pickBy";
+	import mapValues from "lodash/mapValues";
+
+	export default {
+		data() {
+			return {
+				weekChina: ['一', '二', '三', '四', '五', '六', '日'],
+				user: null,
+				data: [],
+				total: 1,
+				records: 0,
+				ready: false,
+				page: 1,
+				rows: 10,
+				multipleData: null,
+				sideOpen: false,
+				tips: "加载中...",
+				loadState: '向下翻以加载更多',
+				// 数据源
+				dataSource: {
+					F_SchoolId: []
+				},
+
+				// 查询条件
+				searchData: {},
+				defaultQueryData: {},
+				queryData: {
+					LessonNo: "",
+					LessonName: "",
+				},
+
+			};
+		},
+		onUnload() {
+			this.OFF('LessonInfoOfElectiveOnline');
+		},
+		onShow() {
+			if (this.data.length) {
+				this.pullDown()
+			}
+		},
+		methods: {
+			init() {
+				this.ON('LessonInfoOfElectiveOnline', this.refreshList);
+				// 拉取加载列表和数据源
+				Promise.all([
+					this.FETCH_DATASOURCE('company').then(result => {
+						this.dataSource.F_SchoolId = result.data.map(t => ({
+							text: t.f_fullname,
+							value: t.f_companyid
+						}))
+					}),
+					() => {},
+				]);
+				// var _this = this;
+				this.user = this.GET_GLOBAL('loginUser');
+				this.fetchList();
+				// 初始化查询条件
+				this.defaultQueryData = this.COPY(this.queryData);
+				this.ready = true;
+			},
+			// 拉取列表
+			async fetchList() {
+				if (this.page > this.total) {
+					return;
+				}
+				// let _this = this;
+				this.searchData.StuNo = this.user.account;
+				this.searchData.StuMajorNo = this.user.majorno;
+				this.searchData.StuGrade = this.user.grade;
+				let _postParam = {
+					pagination: {
+						rows: this.rows,
+						page: this.page,
+						sidx: 'AcademicYearNo DESC, Semester DESC, LessonNo ASC,EmpNo ASC',
+						sord: 'asc'
+					},
+					//queryJson: '{}'
+					queryJson: JSON.stringify(this.searchData),
+				};
+				this.LOADING('加载数据中…')
+				this.HTTP_GET('learun/LessonInfoOfElectiveOnline/pagelist', _postParam, '加载数据时出错').then(res => {
+					this.HIDE_LOADING();
+					this.data = this.data.concat(res.rows);
+					this.total = res.total;
+					this.records = res.records;
+					this.page = res.page + 1;
+					this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+					this.tips = `已加载 ${Math.min(res.page, res.total)} / ${
+					  res.total
+					} 页，共 ${res.records} 项`;
+					// console.log(_this.data);
+				});
+			},
+			// 列表下拉
+			pullDown() {
+				this.refreshList().then(() => {
+					this.$refs.data.stopPullDown();
+				});
+			},
+			async refreshList() {
+				this.page = 1;
+				this.total = 1;
+				this.data = [];
+
+				this.fetchList();
+			},
+			tapClick(data) {
+				this.NAV_TO('./from', {
+					keyValue: data.Id,
+					Status: data.Status
+				}, true);
+			},
+			delTap(item) {
+				// console.log(item)
+				// let this = this;
+				this.CONFIRM('数字化校园提示', '确定要取消报名吗？', true).then(res => {
+					if (res) {
+						let _postData = {
+							keyValue: item.Id,
+							StuNo: this.user.account
+						}
+						this.LOADING('正在取消报名…')
+						this.HTTP_POST(
+							'learun/LessonInfoOfElectiveOnline/Cancel',
+							_postData,
+							'加载数据时出错'
+						).then(data => {
+							this.HIDE_LOADING()
+							// console.log(data)
+							if (data) { // 成功
+								this.TOAST('取消报名成功！');
+								this.refreshList()
+							}
+						})
+					}
+				})
+			},
+
+			// 设置搜索条件
+			async searchChange() {
+				const result = {};
+
+				// 将其他查询项添加到查询 JSON 中
+				const queryObj = pickBy(this.queryData, (t) =>
+					Array.isArray(t) ? t.length > 0 : t
+				);
+				Object.assign(
+					result,
+					mapValues(queryObj, (t) => (Array.isArray(t) ? t.join(",") : t))
+				);
+				this.searchData = result;
+				this.refreshList();
+			},
+
+			// 点击「清空查询条件」按钮
+			reset() {
+				this.queryData = this.COPY(this.defaultQueryData);
+				this.searchChange();
+			},
+
+		},
+		computed: {
+			typePd() {
+				return num => {
+					let txt = '';
+					if (num == 1) {
+						txt = '审核中';
+					} else if (num == 2) {
+						txt = '报名成功';
+					} else if (num == 3) {
+						txt = '报名失败';
+					} else {
+						txt = '未报名';
+					}
+					return txt;
+				};
+			}
+		},
+		created() {
+			this.init();
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	@import '~@/common/css/sidepage.less';
+	@import '~@/common/css/customlist.less';
+
+	.page {
+		background-color: #fff;
+	}
+
+	.page-content {
+		margin-top: 39px;
+	}
+
+	.records {
+		color: #8f8f94;
+		background: #ffffff;
+		padding: 10px 12px;
+		width: 100%;
+		vertical-align: middle;
+		border-bottom: 0.5px solid #ddd;
+		position: fixed;
+		top: var(--window-top);
+		z-index: 1024;
+		border-bottom: 0.5px solid #ddd;
+		height: 40px;
+		width: 100%;
+		box-shadow: 0 0.5px 3px rgba(0, 0, 0, 0.1);
+		// background: #f1f1f1;
+	}
+
+	.pageBox {
+		// margin-top: 34px;
+		padding: 5px 15px;
+		line-height: 24px;
+		border-bottom: 5px solid #f5f5f5;
+	}
+
+	.delbtn {
+		position: absolute;
+		right: 15px;
+		bottom: 7px;
+		padding: 3px 10px;
+		background: #dd524d;
+		color: #fff;
+		border-radius: 3px;
+	}
+</style>
\ No newline at end of file