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

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

@@ -32,5 +32,4 @@
         </div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js")
-<script src="~/Content/static/js/LodopFuncs.js"></script>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs

@@ -85,6 +85,15 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return View();
         }
         /// <summary>
+        /// 班级课程表【教务】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ClassIndexInEducation()
+        {
+            return View();
+        }
+        /// <summary>
         /// 课程表【教学调度】
         /// <summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml

@@ -0,0 +1,159 @@
+@{
+    ViewBag.Title = "班级课程表";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<link href="~/Content/static/css/TimeTable.css" rel="stylesheet" />
+<style id="style1" media="print">
+    * {
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        box-sizing: border-box;
+    }
+
+    ul {
+        margin: 0px;
+        padding: 0px;
+        list-style: none;
+    }
+
+    li {
+        list-style: none;
+    }
+
+    table, tr, td {
+        cellspacing: 0px;
+        cellpadding: 0px;
+        padding: 0;
+        margin: 0;
+    }
+
+    body {
+        font-family: "Microsoft YaHei", "微软雅黑" !important;
+        padding: 10px;
+        color: #333;
+        font-size: 12px;
+        margin: 0;
+    }
+
+    .personalBox {
+        padding: 10px;
+    }
+
+    .personT {
+        font-size: 24px;
+        text-align: center;
+        margin-bottom: 15px
+    }
+
+    .perSemester {
+        text-align: center;
+        border: 1px solid #333;
+        line-height: 25px;
+        height: 30px;
+    }
+
+    .perWeek {
+        overflow: hidden;
+        line-height: 26px;
+        height: 30px;
+        text-align: center;
+        border-left: 1px solid #333;
+        border-right: 1px solid #333;
+    }
+
+    .perWeek li {
+        width: 12.5%;
+        float: left;
+        border-left: 1px solid #333;
+        height: 100%;
+    }
+
+    .perFestivalsBox {
+        border-left: 1px solid #333;
+        border-right: 1px solid #333;
+        border-bottom: 1px solid #333;
+        text-align: center;
+    }
+
+    .perFestivalsBox table {
+        display: block;
+        width: 100%;
+        text-align: center;
+    }
+
+    .perFestivalsBox td {
+        border-left: 1px solid #333;
+        border-top: 1px solid #333;
+        padding: 1px;
+        width: 12.5%;
+        font-size: 12px;
+    }
+
+    .perFestivalsBox td div {
+        min-height: 16px;
+        line-height: 16px;
+    }
+
+    .perFestivalsBox td:first-child, .perWeek li:first-child {
+        border-left: 0;
+    }
+
+</style>
+<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="datesearch" class="lr-search-date"></div>
+                    </div>
+
+                    <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="ClassNo" type="lrselect" class="lr-select"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="lr_search" class="btn btn-primary">查询</a>
+                    </div>
+
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" style="overflow: auto;">
+                <div class="warpper">
+                    <div class="personalBox">
+                        <div class="personT"></div>
+                        <div class="perSemester"></div>
+                        <ul class="perWeek">
+                            <li>节次/星期</li>
+                            <li>星期一</li>
+                            <li>星期二</li>
+                            <li>星期三</li>
+                            <li>星期四</li>
+                            <li>星期五</li>
+                            <li>星期六</li>
+                            <li>星期日</li>
+                        </ul>
+                        <div class="perFestivalsBox">
+                            <table cellspacing="0" border="0"></table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js")
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js

@@ -0,0 +1,202 @@
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+            page.bind();
+            page.bindSelect();
+        },
+        loadData: function (param) {
+            $.lrSetFormWithParam(top.$.rootUrl + '/PersonnelManagement/TimeTable/GetDataInEducation', param,
+                function (data) {
+                    // 数据处理
+                    var html = '';
+                    var weekLists = data.weekList;
+                    for (var i = 1; i < 11; i++) {
+                        (function (arg) {
+                            var args = arg - 1;
+                            var datas = flogs(arg, weekLists, 'time');
+                            html += ' <tr><td>' + arg + '节</td>';
+                            if (datas) {
+                                var lists = datas.list;
+                                html += tdHandles(lists);
+                            } else {
+                                html += tdHandle(arg);
+                            }
+                            html += '</tr>';
+                        })(i); //调用时参数  
+                    }
+                    $('.personT').text(data.schoolName);
+                    $('.perSemester').text(data.semester);
+                    $('.perFestivalsBox table').html(html);
+                    
+                    function flogs(num, data, obj) {
+                        var flog = false;
+                        $.each(data,
+                            function (i, n) {
+                                if (n[obj] == num) {
+                                    flog = n;
+                                    return;
+                                }
+                            })
+                        return flog;
+                    }
+                    function flogs2(num, data, obj) {
+                        var arr = new Array();
+                        $.each(data,
+                            function (i, n) {
+                                if (n[obj] == num) {
+                                    arr.push(n);
+                                }
+                            })
+                        return arr;
+                    }
+
+                    //某节课空
+                    function tdHandle() {
+                        var html = '';
+                        for (var j = 0; j < 7; j++) {
+                            html += '<td><div></div><div></div><div></div><div></div></td>';
+                        }
+                        return html;
+                    }
+
+                    //某节课不空
+                    function tdHandles(lists) {
+                        var html = '';
+                        for (var k = 1; k < 8; k++) {
+                            (function (arg) {
+                                var args = arg - 1;
+                                var datas = flogs2(arg, lists, 'day');
+                                if (datas.length > 0) {
+                                    html += '<td class="active">';
+                                    $.each(datas, function (i, item) {
+                                        if (i > 0) {
+                                            html += '<hr>';
+                                        }
+                                        html += '<div>课程：' +
+                                            item.curriculum +
+                                            '</div>' +
+                                            '<div>教师：' +
+                                            item.teacher +
+                                            '</div>' +
+                                            '<div>班级：' +
+                                            item.className +
+                                            '</div>' +
+                                            '<div>教室：' +
+                                            item.classRoom +
+                                            '</div>';
+                                    });
+                                    html += '</td>';
+
+                                } else {
+                                    html += '<td><div></div><div></div><div></div><div></div></td>';
+                                }
+
+                            })(k);
+                        }
+                        return html;
+                    }
+                });
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#datesearch').lrdate({
+                dfdata: [
+                    {
+                        name: '上周',
+                        begin: function () { return learun.getTime(7); },
+                        end: function () {
+                            return learun.getTime(1);
+                        }
+                    },
+                    {
+                        name: '本周',
+                        begin: function () { return learun.getTime(0); },
+                        end: function () {
+                            return learun.getTime(-6);
+                        }
+                    },
+                    {
+                        name: '下周',
+                        begin: function () { return learun.getTime(-7); },
+                        end: function () {
+                            return learun.getTime(-13);
+                        }
+                    }],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: 'currentWeek',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            //查询
+            $('#lr_search').on('click', function () {
+                var p = {};
+                p.schoolId = $('#F_SchoolId').lrselectGet();
+                p.ClassNo = $('#ClassNo').lrselectGet();
+                page.search(p);
+            });
+        },
+        bindSelect: function () {
+            //校区
+            $('#F_SchoolId').lrDataSourceSelect({
+                code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) {
+                    if (!!item) {
+                        // 班级
+                        $('#ClassNo').lrselectRefresh({
+                            placeholder: "请选择班级",
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData',
+                            param: { schoolId: item.f_companyid },
+                            value: 'value',
+                            text: 'text'
+                        });
+                    } else {
+                        //班级
+                        $('#ClassNo').lrselectRefresh({
+                            placeholder: "请选择班级",
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData',
+                            param: { schoolId: "" },
+                            value: 'value',
+                            text: 'text'
+                        });
+                    }
+                }
+            });
+            //班级
+            $('#ClassNo').lrselect({
+                placeholder: "请选择班级",
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            page.loadData(param);
+        }
+    };
+    page.init();
+};

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

@@ -1527,6 +1527,7 @@
     <Content Include="Areas\PersonnelManagement\Views\TeacherCancelLeaveManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherLeaveManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherOvertimeManagement\FormView.js" />
+    <Content Include="Areas\PersonnelManagement\Views\TimeTable\ClassIndexInEducation.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\CheckIndex.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\FormView.js" />
@@ -7600,6 +7601,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\IndexUnpass.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\IndexUnpassTwo.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\AllStuScoreQueryIndex.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\TimeTable\ClassIndexInEducation.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs

@@ -24,7 +24,7 @@ namespace Learun.Application.WebApi.Modules
         private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
         
         /// <summary>
-        /// 获取成绩列表
+        /// 全院学生成绩查看-打印成绩单
         /// </summary>
         /// <param name="_"></param>
         /// <returns></returns>
@@ -57,7 +57,7 @@ namespace Learun.Application.WebApi.Modules
             {
                 AcademicYearNo = x.Key.AcademicYearNo,
                 Semester = x.Key.Semester,
-                StuScoreEntityList = x.Select(y => new StuScoreEntity()
+                StuScoreEntityList = x.Select(y => new StuScoreModel()
                 {
                     AcademicYearNo = y.AcademicYearNo,
                     Semester = y.Semester,
@@ -105,7 +105,38 @@ namespace Learun.Application.WebApi.Modules
         public class ScoreList {
             public string AcademicYearNo { get; set; }
             public string Semester { get; set; }
-            public List<StuScoreEntity> StuScoreEntityList { get; set; }
+            public List<StuScoreModel> StuScoreEntityList { get; set; }
+        }
+        public class StuScoreModel {
+            public string AcademicYearNo { get; set; }
+            public string Semester { get; set; }
+            /// <summary>
+            /// 课程类别码
+            /// </summary>
+            public string LessonSortNo { get; set; }
+            /// <summary>
+            /// 课程类别名称
+            /// </summary>
+            public string LessonSortName { get; set; }
+            public string LessonNo { get; set; }
+            public string LessonName { get; set; }
+            /// <summary>
+            /// 学分
+            /// </summary>
+            public decimal? StudyScore { get; set; }
+            /// <summary>
+            /// 成绩
+            /// </summary>
+            public decimal? Score { get; set; }
+            /// <summary>
+            /// 第一次补考成绩
+            /// </summary>
+            public string ScoreOfNotPass { get; set; }
+            /// <summary>
+            /// 第二次补考成绩
+            /// </summary>
+            public string ScoreOfNotPassTwo { get; set; }
+
         }
 
     }