Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

# Conflicts:
#	Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.js

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

@@ -141,40 +141,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success(jsonData);
         }
 
+        /// <summary>
+        /// 教学质量监测
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetLessonList(string academicYearNo, string semester, string classNo)
+        {
+            var data = exam_ArrangeExamTermNewIBLL.GetLessonList(academicYearNo, semester, classNo).OrderBy(x => x.value);
+            return Success(data);
+        }
         public ActionResult GetTeachingQualityPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
             var data = exam_ArrangeExamTermNewIBLL.GetTeachingQualityPageList(paginationobj, 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.StuNo);
-
-            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);
-                result.Add(aaa);
-            }
-
             var jsonData = new
             {
                 rows = data,
                 total = paginationobj.total,
                 page = paginationobj.page,
                 records = paginationobj.records,
-                result = result
             };
             return Success(jsonData);
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.cshtml

@@ -25,9 +25,9 @@
                     <div class="lr-layout-tool-item">
                         <div id="LessonNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
                     </div>
-                    @*<div class="lr-layout-tool-item">
-                            <div id="ClassRoomNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
-                        </div>*@
+                    <div class="lr-layout-tool-item">
+                            <div id="ClassNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                        </div>
                     <div class="lr-layout-tool-item">
                         <div id="EmpNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.js

@@ -6,6 +6,8 @@
  */
 var selectedRow;
 var refreshGirdData;
+//课程列
+var LessonTemp = [];
 
 var bootstrap = function ($, learun) {
     "use strict";
@@ -20,7 +22,7 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
-            // 初始化左侧树形数据 考场信息
+            // 初始化左侧树形数据 
             $('#dataTree').lrtree({
                 url: top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/GetClassRoomTree',
                 nodeClick: function (item) {
@@ -29,7 +31,6 @@ var bootstrap = function ($, learun) {
                     $('#titleinfo').html(item.text);
                 }
             });
-            //日期
             $('.datetime').each(function () {
                 $(this).lrdate({
                     dfdata: [
@@ -58,56 +59,59 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
+            //打印
+            $('#lr_print').on('click', function () {
+                $('#printPage').jqprint()
+            });
             // 查询
             $('#btn_Search').on('click', function () {
-                page.search({ ClassRoomNo: ClassRoomNo, AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet(), EmpNo: $('#EmpNo').lrselectGet() });
+                var p = {};
+                p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+                p.Semester = $('#Semester').lrselectGet();
+                p.ClassNo = $('#ClassNo').lrselectGet();
+                if (p.AcademicYearNo == null || p.AcademicYearNo == "") {
+                    learun.alert.warning("请选择学年！");
+                    return;
+                }
+                if (p.Semester == null || p.Semester == "") {
+                    learun.alert.warning("请选择学期！");
+                    return;
+                }
+                if (p.ClassNo == null || p.ClassNo == "") {
+                    learun.alert.warning("请选择班级！");
+                    return;
+                }
+                //page.search({ ClassRoomNo: ClassRoomNo, AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet(), EmpNo: $('#EmpNo').lrselectGet() });
+
+                $.lrSetFormWithParam(top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/GetLessonList', p,
+                    function (data) {
+                        var temparr = [];
+                        for (var i = 0; i < data.length; i++) {
+                            var item = {};
+                            item.label = data[i].text;
+                            item.name = data[i].value;
+                            item.width = 150;
+                            item.align = "left";
+                            temparr.push(item);
+                        }
+                        LessonTemp = temparr;
+
+                        page.initGird();
+                        page.search(p);
+                    });
             });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            //打印
-            $('#lr_print').on('click', function () {
-                learun.layerForm({
-                    id: 'TeachingQualityPrint',
-                    title: '教学质量检测考生统计表',
-                    url: top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/TeachingQualityPrint?' + $.param({}),
-                    width: 1200,
-                    height: 800,
-                    btn: null
-                });
-            });
-            //学年
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#AcademicYearNo').lrselect({
                 placeholder: "学年",
                 allowSearch: false,
                 url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
                 value: 'value',
-                text: 'text',
-                select: function (e) {
-                    console.log(e)
-                }
+                text: 'text'
             });
-            //$('#AcademicYearNo').bind('change', function () {
-            //    ClassRoomNo = ''
-            //    var AcademicYearNo = '';
-            //    var Semester = '';
-            //    if ($('#AcademicYearNo').lrselectGet()) {
-            //        AcademicYearNo = $('#AcademicYearNo').lrselectGet()
-            //    }
-            //    if ($('#Semester').lrselectGet()) {
-            //        var Semester = $('#Semester').lrselectGet();
-            //    }
-            //    if (Semester != '' && AcademicYearNo != '') {
-            //        $('#dataTree').lrtree({
-            //            url: top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/GetClassRoomTree?AcademicYearNo = ' + AcademicYearNo + ' &Semester=' + Semester,
-            //            nodeClick: function (item) {
-            //                ClassRoomNo = item.value;
-            //                page.search({ ClassRoomNo: item.value, AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet(), EmpNo: $('#EmpNo').lrselectGet() });
-            //            }
-            //        });
-            //    }
-            //});
             //学期
             $('#Semester').lrselect({
                 placeholder: "学期",
@@ -116,6 +120,27 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+
+            $('#AcademicYearNo').bind('change', function () {
+                ClassRoomNo = ''
+                var AcademicYearNo = '';
+                var Semester = '';
+                if ($('#AcademicYearNo').lrselectGet()) {
+                    AcademicYearNo = $('#AcademicYearNo').lrselectGet()
+                }
+                if ($('#Semester').lrselectGet()) {
+                    var Semester = $('#Semester').lrselectGet();
+                }
+                if (Semester != '' && AcademicYearNo != '') {
+                    $('#dataTree').lrtree({
+                        url: top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/GetClassRoomTree?AcademicYearNo = ' + AcademicYearNo + ' &Semester=' + Semester,
+                        nodeClick: function (item) {
+                            ClassRoomNo = item.value;
+                            page.search({ ClassRoomNo: item.value, AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet(), EmpNo: $('#EmpNo').lrselectGet() });
+                        }
+                    });
+                }
+            });
             $('#Semester').bind('change', function () {
                 ClassRoomNo = ''
                 var AcademicYearNo = '';
@@ -224,7 +249,96 @@ var bootstrap = function ($, learun) {
                 sidx: ' AcademicYearNo desc,Semester desc,ExamDate desc, LessonNo desc,ClassRoomNo desc,ClassRoomNo desc,SitNumber asc ',
                 isPage: true
             });
-            page.search();
+
+            //var headData = [
+            //    {
+            //        label: '学校', name: 'F_SchoolId', width: 190, align: "left",
+            //        formatterAsync: function (callback, value, row, op, $cell) {
+            //            learun.clientdata.getAsync('custmerData', {
+            //                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+            //                key: value,
+            //                keyId: 'f_companyid',
+            //                callback: function (_data) {
+            //                    callback(_data['f_fullname']);
+            //                }
+            //            });
+            //        }
+            //    },
+            //    { label: '学年', name: 'AcademicYearNo', width: 60, align: "left" },
+            //    { label: '学期', name: 'Semester', width: 50, align: "left" },
+            //    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+            //    { label: '学生编号', name: 'StuNo', width: 130, align: "left" },
+            //    { label: '学籍号', name: 'StuCode', width: 130, align: "left" },
+            //    {
+            //        label: "系所", name: "DeptNo", width: 100, align: "left",
+            //        formatterAsync: function (callback, value, row, op, $cell) {
+            //            learun.clientdata.getAsync('custmerData', {
+            //                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+            //                key: value,
+            //                keyId: 'deptno',
+            //                callback: function (_data) {
+            //                    callback(_data['deptname']);
+            //                }
+            //            });
+            //        }
+            //    },
+            //    {
+            //        label: "专业", name: "MajorNo", width: 100, align: "left",
+            //        formatterAsync: function (callback, value, row, op, $cell) {
+            //            learun.clientdata.getAsync('custmerData', {
+            //                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+            //                key: value,
+            //                keyId: 'majorno',
+            //                callback: function (_data) {
+            //                    callback(_data['majorname']);
+            //                }
+            //            });
+            //        }
+            //    },
+            //    {
+            //        label: "班级", name: "ClassNo", width: 100, align: "left",
+            //        formatterAsync: function (callback, value, row, op, $cell) {
+            //            learun.clientdata.getAsync('custmerData', {
+            //                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+            //                key: value,
+            //                keyId: 'classno',
+            //                callback: function (_data) {
+            //                    callback(_data['classname']);
+            //                }
+            //            });
+            //        }
+            //    },
+
+            //    {
+            //        label: '考试日期', name: 'ExamDate', width: 90, align: "left",
+            //        formatter: function (v) {
+            //            return learun.formatDate(v, "yyyy-MM-dd");
+            //        }
+            //    },
+            //    { label: '考试时间', name: 'ExamTime', width: 90, align: "left" },
+            //    { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
+            //    { label: '课程名称', name: 'LessonName', width: 200, align: "left" },
+            //    { label: '监考教师编号', name: 'EmpNo', width: 150, align: "left" },
+            //    { label: '监考教师姓名', name: 'EmpName', width: 150, align: "left" },
+            //    { label: '教室编号', name: 'ClassroomNo', width: 100, align: "left" },
+            //    { label: '教室名称', name: 'ClassroomName', width: 100, align: "left" },
+            //    { label: '班级名称', name: 'ClassName', width: 100, align: "left" },
+            //    { label: '座位编号', name: 'SitNumber', width: 80, aligndd: "left" },
+            //    { label: '考号', name: 'kh', width: 140, align: "left", ishide: true },
+            //];
+            //var headDatas = headData.concat(LessonTemp);
+
+            //$("#gridtable")[0].dfop = undefined;
+            //$('#gridtable').lrAuthorizeJfGridLei({
+            //    url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByClassNo',
+            //    headData: headDatas,
+            //    mainId: 'StuNo',
+            //    isPage: false,
+            //    sidx: 'StuNo',
+            //    sord: 'desc',
+            //    isMultiselect: true
+            //});
+            //page.search();
         },
         search: function (param) {
             param = param || {};

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewBLL.cs

@@ -165,6 +165,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        public IEnumerable<WebHelper.YearGrade> GetLessonList(string academicYearNo, string semester, string classNo)
+        {
+            try
+            {
+                return exam_ArrangeExamTermNewService.GetLessonList(academicYearNo, semester, classNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        
         public IEnumerable<Exam_ArrangeExamTermItemNewEntity> GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo,string LessonNo)
         {
             try

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewIBLL.cs

@@ -27,6 +27,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         IEnumerable<Exam_ArrangeExamTermItemNewEntity> ScreeningPlan(Pagination pagination, string queryJson);
         IEnumerable<Exam_ArrangeExamTermItemNewEntity> GetItemPageList(Pagination pagination, string queryJson);
         IEnumerable<Exam_ArrangeExamTermItemNewEntity> GetTeachingQualityPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 教学质量监测
+        /// </summary>
+        /// <param name="academicYearNo"></param>
+        /// <param name="semester"></param>
+        /// <param name="classNo"></param>
+        /// <returns></returns>
+        IEnumerable<WebHelper.YearGrade> GetLessonList(string academicYearNo, string semester, string classNo);
 
         IEnumerable<Exam_ArrangeExamTermItemNewEntity> GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo, string LessonNo);
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs

@@ -338,7 +338,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     strSql.Append(" AND ( ExamDate >= '" + queryParam["StartTime"].ToString() + "' AND ExamDate <= '" + queryParam["EndTime"].ToString() + "' ) ");
                 }
-
                 return this.BaseRepository("CollegeMIS").FindList<Exam_ArrangeExamTermItemNewEntity>(strSql.ToString(), null, pagination);
             }
             catch (Exception ex)
@@ -354,6 +353,34 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
         /// <summary>
+        /// 课程信息【班级成绩查看】
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<WebHelper.YearGrade> GetLessonList(string academicYearNo, string semester, string classNo)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct s.LessonName as value,s.EmpNo as text from stuscore s ");
+                strSql.Append(" where s.AcademicYearNo='" + academicYearNo + "' and s.Semester='" + semester + "' and s.ClassNo='" + classNo + "' and s.LessonSortNo='1' ");
+                return this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString()).Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+                //data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
+
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
         /// 获取页面显示列表数据
         /// </summary>
         /// <param name="pagination">查询参数</param>
@@ -455,13 +482,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="pagination"></param>
         /// <param name="queryJson"></param>
         /// <returns></returns>
-        public IEnumerable<Exam_ArrangeExamTermItemNewEntity> GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo,string LessonNo)
+        public IEnumerable<Exam_ArrangeExamTermItemNewEntity> GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo, string LessonNo)
         {
             try
             {
                 var strSql = new StringBuilder();
                 strSql.Append(@"select t.*,e.AcademicYearNo,e.Semester from Exam_ArrangeExamTermItemNew t join Exam_ExamPlan e on t.EPId=e.EPId where 1=1 and t.ClassNo is not null 
-                                and e.AcademicYearNo ='" + AcademicYearNo + "' and e.Semester='" + Semester + "' and Classroomno= '" + ClassRoomNo + "' and LessonNo = '"+ LessonNo + "' ");
+                                and e.AcademicYearNo ='" + AcademicYearNo + "' and e.Semester='" + Semester + "' and Classroomno= '" + ClassRoomNo + "' and LessonNo = '" + LessonNo + "' ");
                 return this.BaseRepository("CollegeMIS").FindList<Exam_ArrangeExamTermItemNewEntity>(strSql.ToString());
             }
             catch (Exception ex)