成绩录入状态查询、成绩打印格式调整

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

@@ -1352,5 +1352,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
         #endregion
 
+
+        [HttpGet]
+        public ActionResult StuScoreStat()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreStatList(string queryJson)
+        {
+            //Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuScoreIBLL.GetScoreStatList(queryJson);
+            
+            return Success(data);
+        }
     }
 }

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

@@ -741,5 +741,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         }
 
         #endregion
+
+        [HttpGet]
+        public ActionResult StuScoreStat()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreStatList(string queryJson)
+        {
+            //Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuScoreNotPassIBLL.GetScoreStatList(queryJson);
+
+            return Success(data);
+        }
     }
 }

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

@@ -642,6 +642,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
 
         #endregion
+        [HttpGet]
+        public ActionResult StuScoreStat()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreStatList(string queryJson)
+        {
+            //Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuScoreNotPassTwoIBLL.GetScoreStatList(queryJson);
 
+            return Success(data);
+        }
     }
 }

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

@@ -40,7 +40,7 @@
 
     .tableBox {
         height: 661px;
-        width: 33%;
+        width: 100%;
         float: left;
         margin-left: 0.2%;
         border: 1px solid #000;
@@ -156,9 +156,9 @@
             })
 
         })
-        for (var i = tableNum; i < 3; i++) {
-            html += '<div class="tableBox"><table class="table" cellspacing="0" cellpadding="0"></table></div>';
-        }
+        //for (var i = tableNum; i < 3; i++) {
+        //    html += '<div class="tableBox"><table class="table" cellspacing="0" cellpadding="0"></table></div>';
+        //}
 
         AddPrintContent(html, flag);
     };

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

@@ -0,0 +1,107 @@
+@{
+    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="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="DeptNo" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="Grade" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="ClassNo" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="LessonType" type="lrselect" class="lr-select"></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="Stat" 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>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/StuScoreStat.js")

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

@@ -0,0 +1,159 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-14 11:02
+ * 描  述：考试成绩同步
+ */
+var selectedRow;
+var queryJson = {};
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            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 () {
+                var p = {};
+                p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+                p.Semester = $('#Semester').lrselectGet();
+                p.DeptNo = $('#DeptNo').lrselectGet();
+                p.Grade = $('#Grade').lrselectGet();
+                p.ClassNo = $('#ClassNo').lrselectGet();
+                p.LessonNo = $('#LessonNo').lrselectGet();
+                p.LessonType = $('#LessonType').lrselectGet();
+                p.Stat = $('#Stat').lrselectGet();
+                page.search(p);
+            });
+        },
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreStatList',
+                headData: [
+                    { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" },
+                    { label: '学期', name: 'Semester', width: 100, align: "left" },
+                    {
+                        label: "系所", name: "DeptNo", width: 200, 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: 'Grade', width: 100, align: "left" },
+                    {
+                        label: "班级", name: "ClassNo", width: 300, 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: "LessonTypeId", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType',
+                                key: value,
+                                keyId: 'ltid',
+                                callback: function (_data) {
+                                    callback(_data['lessontypename']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "课程名称", name: "LessonName", width: 200, align: "left" },
+                    { label: "代课教师编号", name: "EmpNo", width: 100, align: "left" },
+                    { label: "代课教师姓名", name: "EmpName", width: 100, align: "left" },
+                    { label: "录入教师编号", name: "ModifyUserId", width: 100, align: "left" },
+                    { label: "录入教师姓名", name: "ModifyUserName", width: 100, align: "left" },
+
+                    { label: '状态', name: 'StrStat', width: 100, align: "left" },
+                    
+                ],
+                mainId: 'ScoreId',
+                isPage: false
+            });
+            page.search();
+        },
+        bindSelect: function () {
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetAcademicYearNoData',
+                value: 'value',
+                text: 'text',
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text',
+            });
+            $('#DeptNo').lrDataSourceSelect({
+                placeholder: "系部", code: 'CdDeptInfo', value: 'deptno', text: 'deptname',
+                
+            });
+            $('#Grade').lrselect({
+                placeholder: "年级",
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text',
+                maxHeight: 200
+            });
+            $('#LessonType').lrDataSourceSelect({
+                placeholder: "课程类型", code: 'CdLessonType', value: 'ltid', text: 'lessontypename'
+            });
+            //课程
+            $('#LessonNo').lrselect({
+                placeholder: "课程",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataOfAllWithNo',
+                value: 'value',
+                text: 'text',
+            });
+            //班级
+            $('#ClassNo').lrselect({
+                placeholder: "班级",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetClassNoData',
+                value: 'value',
+                text: 'text'
+            });
+
+            $('#Stat').lrDataItemSelect({ placeholder: "完成状态", code: 'CompleteStat' });
+            
+        },
+        
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+    };
+   
+    page.init();
+}

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

@@ -0,0 +1,107 @@
+@{
+    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="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="DeptNo" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="Grade" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="ClassNo" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="LessonType" type="lrselect" class="lr-select"></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="Stat" 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>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/StuScoreStat.js")

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

@@ -0,0 +1,159 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-14 11:02
+ * 描  述：考试成绩同步
+ */
+var selectedRow;
+var queryJson = {};
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            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 () {
+                var p = {};
+                p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+                p.Semester = $('#Semester').lrselectGet();
+                p.DeptNo = $('#DeptNo').lrselectGet();
+                p.Grade = $('#Grade').lrselectGet();
+                p.ClassNo = $('#ClassNo').lrselectGet();
+                p.LessonNo = $('#LessonNo').lrselectGet();
+                p.LessonType = $('#LessonType').lrselectGet();
+                p.Stat = $('#Stat').lrselectGet();
+                page.search(p);
+            });
+        },
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetScoreStatList',
+                headData: [
+                    { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" },
+                    { label: '学期', name: 'Semester', width: 100, align: "left" },
+                    {
+                        label: "系所", name: "DeptNo", width: 200, 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: 'Grade', width: 100, align: "left" },
+                    {
+                        label: "班级", name: "ClassNo", width: 300, 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: "LessonTypeId", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType',
+                                key: value,
+                                keyId: 'ltid',
+                                callback: function (_data) {
+                                    callback(_data['lessontypename']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "课程名称", name: "LessonName", width: 200, align: "left" },
+                    { label: "代课教师编号", name: "EmpNo", width: 100, align: "left" },
+                    { label: "代课教师姓名", name: "EmpName", width: 100, align: "left" },
+                    { label: "录入教师编号", name: "ModifyUserId", width: 100, align: "left" },
+                    { label: "录入教师姓名", name: "ModifyUserName", width: 100, align: "left" },
+
+                    { label: '状态', name: 'StrStat', width: 100, align: "left" },
+                    
+                ],
+                mainId: 'ScoreId',
+                isPage: false
+            });
+            page.search();
+        },
+        bindSelect: function () {
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetAcademicYearNoData',
+                value: 'value',
+                text: 'text',
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text',
+            });
+            $('#DeptNo').lrDataSourceSelect({
+                placeholder: "系部", code: 'CdDeptInfo', value: 'deptno', text: 'deptname',
+                
+            });
+            $('#Grade').lrselect({
+                placeholder: "年级",
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text',
+                maxHeight: 200
+            });
+            $('#LessonType').lrDataSourceSelect({
+                placeholder: "课程类型", code: 'CdLessonType', value: 'ltid', text: 'lessontypename'
+            });
+            //课程
+            $('#LessonNo').lrselect({
+                placeholder: "课程",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataOfAllWithNo',
+                value: 'value',
+                text: 'text',
+            });
+            //班级
+            $('#ClassNo').lrselect({
+                placeholder: "班级",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetClassNoData',
+                value: 'value',
+                text: 'text'
+            });
+
+            $('#Stat').lrDataItemSelect({ placeholder: "完成状态", code: 'CompleteStat' });
+            
+        },
+        
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+    };
+   
+    page.init();
+}

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

@@ -0,0 +1,107 @@
+@{
+    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="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="DeptNo" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="Grade" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="ClassNo" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="LessonType" type="lrselect" class="lr-select"></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="Stat" 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>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/StuScoreStat.js")

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

@@ -0,0 +1,159 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-06-14 11:02
+ * 描  述：考试成绩同步
+ */
+var selectedRow;
+var queryJson = {};
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            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 () {
+                var p = {};
+                p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
+                p.Semester = $('#Semester').lrselectGet();
+                p.DeptNo = $('#DeptNo').lrselectGet();
+                p.Grade = $('#Grade').lrselectGet();
+                p.ClassNo = $('#ClassNo').lrselectGet();
+                p.LessonNo = $('#LessonNo').lrselectGet();
+                p.LessonType = $('#LessonType').lrselectGet();
+                p.Stat = $('#Stat').lrselectGet();
+                page.search(p);
+            });
+        },
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/GetScoreStatList',
+                headData: [
+                    { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" },
+                    { label: '学期', name: 'Semester', width: 100, align: "left" },
+                    {
+                        label: "系所", name: "DeptNo", width: 200, 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: 'Grade', width: 100, align: "left" },
+                    {
+                        label: "班级", name: "ClassNo", width: 300, 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: "LessonTypeId", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType',
+                                key: value,
+                                keyId: 'ltid',
+                                callback: function (_data) {
+                                    callback(_data['lessontypename']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "课程名称", name: "LessonName", width: 200, align: "left" },
+                    { label: "代课教师编号", name: "EmpNo", width: 100, align: "left" },
+                    { label: "代课教师姓名", name: "EmpName", width: 100, align: "left" },
+                    { label: "录入教师编号", name: "ModifyUserId", width: 100, align: "left" },
+                    { label: "录入教师姓名", name: "ModifyUserName", width: 100, align: "left" },
+
+                    { label: '状态', name: 'StrStat', width: 100, align: "left" },
+                    
+                ],
+                mainId: 'ScoreId',
+                isPage: false
+            });
+            page.search();
+        },
+        bindSelect: function () {
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/GetAcademicYearNoData',
+                value: 'value',
+                text: 'text',
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text',
+            });
+            $('#DeptNo').lrDataSourceSelect({
+                placeholder: "系部", code: 'CdDeptInfo', value: 'deptno', text: 'deptname',
+                
+            });
+            $('#Grade').lrselect({
+                placeholder: "年级",
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text',
+                maxHeight: 200
+            });
+            $('#LessonType').lrDataSourceSelect({
+                placeholder: "课程类型", code: 'CdLessonType', value: 'ltid', text: 'lessontypename'
+            });
+            //课程
+            $('#LessonNo').lrselect({
+                placeholder: "课程",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataOfAllWithNo',
+                value: 'value',
+                text: 'text',
+            });
+            //班级
+            $('#ClassNo').lrselect({
+                placeholder: "班级",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetClassNoData',
+                value: 'value',
+                text: 'text'
+            });
+
+            $('#Stat').lrDataItemSelect({ placeholder: "完成状态", code: 'CompleteStat' });
+            
+        },
+        
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+    };
+   
+    page.init();
+}

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

@@ -1060,14 +1060,17 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\IndexUnpassTwoOfElective.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\InputScoreIndexOfElectiveInTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\InputScoreIndexOfElective.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\StuScoreStat.js" />
     <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\StuScoreNotPass\SlowIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\StuScoreStat.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\InputScoreIndexInTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\InputScoreIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\InputScoreIndexImport.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreOnline\Monitor.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScore\StuScoreStat.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\StuScoreRank.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\SlowIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\StuScoreQueryIndexRow.js" />
@@ -8359,6 +8362,9 @@
     <Content Include="Areas\PersonnelManagement\Views\TimeTable\PkImportForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeLessonTerm\EmptyByConditionFormNew.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\ResourceFile\FileStatistic.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScore\StuScoreStat.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\StuScoreStat.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\StuScoreStat.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.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassroomInfo/ClassroomInfoEntity.cs

@@ -93,13 +93,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region  扩展字段
-
+        [NotMapped]
         public string StrCheckMark { get { return CheckMark == true ? "启用" : "未启用"; } }
 
+        [NotMapped]
         public string StrClassroomBuildingNo { get; set; }
 
+        [NotMapped]
         public string StrCompany { get;set; }
 
+        [NotMapped]
         public string StrClassroomType { get;set;}
         #endregion
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs

@@ -1228,5 +1228,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public IEnumerable<StuScoreEntity> GetScoreStatList(string queryJson)
+        {
+            try
+            {
+                return stuScoreService.GetScoreStatList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs

@@ -426,7 +426,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         [NotMapped]
         public string LessonSortName { get; set; }
-
+        [NotMapped]
+        public string LessonTypeId { get; set; }
         [NotMapped]
         public string LessonTypeName { get; set; }
         /// <summary>
@@ -460,6 +461,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [NotMapped]
         public string MoveType { get; set; }
 
+        /// <summary>
+        /// 成绩录入状态
+        /// </summary>
+        [NotMapped]
+        public string StrStat { get { return CheckMark == "1" ? "完成" : "未完成"; } }
     }
 }
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs

@@ -274,5 +274,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         IEnumerable<WebHelper.YearGrade> GetLessonNoDataFromStuNo(string academicYearNo, string semester, string stuNo);
         IEnumerable<StuScoreEntity> GetScoreListStuNo(string StuNo);
+
+        IEnumerable<StuScoreEntity> GetScoreStatList(string queryJson);
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs

@@ -2863,5 +2863,75 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                 }
             }
         }
+
+
+        public IEnumerable<StuScoreEntity> GetScoreStatList(string queryJson)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+
+                var sql = $"select a.ScoreId,a.AcademicYearNo, a.Semester, a.EmpNo, a.ModifyUserId, a.ModifyUserName, b.EmpName, a.LessonNo, a.DeptNo, a.ClassNo, a.LessonName, a.Grade, a.CheckMark,d.LessonTypeName,d.LTId as LessonTypeId from StuScore a left join EmpInfo b on a.EmpNo=b.EmpNo left join LessonInfo c on a.LessonNo=c.LessonNo left join CdLessonType d on c.LessonTypeId=d.LTId where 1=1 ";
+
+
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    var xn = queryParam["AcademicYearNo"].ToString();
+                    sql = sql + $" and a.AcademicYearNo='{xn}' ";
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    var xq = queryParam["Semester"].ToString();
+                    sql = sql + $" and a.Semester='{xq}' ";
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    var xb = queryParam["DeptNo"].ToString();
+                    sql = sql + $" and a.DeptNo='{xb}' ";
+                }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    var nj = queryParam["Grade"].ToString();
+                    sql = sql + $" and a.Grade='{nj}' ";
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    var bj = queryParam["ClassNo"].ToString();
+                    sql = sql + $" and a.ClassNo='{bj}' ";
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    var kc = queryParam["LessonNo"].ToString();
+                    sql = sql + $" and a.LessonNo='{kc}' ";
+                }
+                if (!queryParam["LessonType"].IsEmpty())
+                {
+                    var kclx = queryParam["LessonType"].ToString();
+                    sql = sql + $" and d.LTId='{kclx}' ";
+                }
+                var ls = this.BaseRepository("CollegeMIS").FindList<StuScoreEntity>(sql).GroupBy(x => new { x.ClassNo, x.LessonNo }).Select(x => new StuScoreEntity { ClassNo = x.Key.ClassNo, LessonNo = x.Key.LessonNo, LessonName = x.FirstOrDefault().LessonName, AcademicYearNo = x.FirstOrDefault().AcademicYearNo, Semester = x.FirstOrDefault().Semester, DeptNo = x.FirstOrDefault().DeptNo, Grade = x.FirstOrDefault().Grade, LessonTypeName = x.FirstOrDefault().LessonTypeName, EmpName = x.FirstOrDefault().EmpName, EmpNo = x.FirstOrDefault().EmpNo, ModifyUserId = x.FirstOrDefault().ModifyUserId, ModifyUserName = x.FirstOrDefault().ModifyUserName, LessonTypeId=x.FirstOrDefault().LessonTypeId,ScoreId=x.FirstOrDefault().ScoreId, CheckMark = x.All(a => a.CheckMark == "1") ? "1" : "0" });
+
+
+                if (!queryParam["Stat"].IsEmpty())
+                {
+                    var zt = queryParam["Stat"].ToString();
+                    ls=ls.Where(x=>x.CheckMark==zt);
+                }
+
+
+                return ls;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs

@@ -613,5 +613,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
         #endregion
+
+        public IEnumerable<StuScoreEntity> GetScoreStatList(string queryJson)
+        {
+            try
+            {
+                return stuScoreNotPassService.GetScoreStatList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs

@@ -181,5 +181,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         void DoSlow(string keyValue, int status);
         #endregion
+
+
+        IEnumerable<StuScoreEntity> GetScoreStatList(string queryJson);
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs

@@ -1319,5 +1319,74 @@ order by bb.ScoreId";
 
         #endregion
 
+        public IEnumerable<StuScoreEntity> GetScoreStatList(string queryJson)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+
+                var sql = $"select a.ScoreId,a.AcademicYearNo, a.Semester, a.EmpNo, a.ModifyUserId, a.ModifyUserName, b.EmpName, a.LessonNo, a.DeptNo, a.ClassNo, a.LessonName, a.Grade, a.CheckMark,d.LessonTypeName,d.LTId as LessonTypeId from StuScoreNotPass a left join EmpInfo b on a.EmpNo=b.EmpNo left join LessonInfo c on a.LessonNo=c.LessonNo left join CdLessonType d on c.LessonTypeId=d.LTId where 1=1 ";
+
+
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    var xn = queryParam["AcademicYearNo"].ToString();
+                    sql = sql + $" and a.AcademicYearNo='{xn}' ";
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    var xq = queryParam["Semester"].ToString();
+                    sql = sql + $" and a.Semester='{xq}' ";
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    var xb = queryParam["DeptNo"].ToString();
+                    sql = sql + $" and a.DeptNo='{xb}' ";
+                }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    var nj = queryParam["Grade"].ToString();
+                    sql = sql + $" and a.Grade='{nj}' ";
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    var bj = queryParam["ClassNo"].ToString();
+                    sql = sql + $" and a.ClassNo='{bj}' ";
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    var kc = queryParam["LessonNo"].ToString();
+                    sql = sql + $" and a.LessonNo='{kc}' ";
+                }
+                if (!queryParam["LessonType"].IsEmpty())
+                {
+                    var kclx = queryParam["LessonType"].ToString();
+                    sql = sql + $" and d.LTId='{kclx}' ";
+                }
+                var ls = this.BaseRepository("CollegeMIS").FindList<StuScoreEntity>(sql).GroupBy(x => new { x.ClassNo, x.LessonNo }).Select(x => new StuScoreEntity { ClassNo = x.Key.ClassNo, LessonNo = x.Key.LessonNo, LessonName = x.FirstOrDefault().LessonName, AcademicYearNo = x.FirstOrDefault().AcademicYearNo, Semester = x.FirstOrDefault().Semester, DeptNo = x.FirstOrDefault().DeptNo, Grade = x.FirstOrDefault().Grade, LessonTypeName = x.FirstOrDefault().LessonTypeName, EmpName = x.FirstOrDefault().EmpName, EmpNo = x.FirstOrDefault().EmpNo, ModifyUserId = x.FirstOrDefault().ModifyUserId, ModifyUserName = x.FirstOrDefault().ModifyUserName, LessonTypeId = x.FirstOrDefault().LessonTypeId, ScoreId = x.FirstOrDefault().ScoreId, CheckMark = x.All(a => a.CheckMark == "1") ? "1" : "0" });
+
+
+                if (!queryParam["Stat"].IsEmpty())
+                {
+                    var zt = queryParam["Stat"].ToString();
+                    ls = ls.Where(x => x.CheckMark == zt);
+                }
+
+
+                return ls;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs

@@ -587,5 +587,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
 
         #endregion
+
+        public IEnumerable<StuScoreEntity> GetScoreStatList(string queryJson)
+        {
+            try
+            {
+                return stuScoreNotPassTwoService.GetScoreStatList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs

@@ -168,5 +168,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         (DataTable failDt, int snum, int fnum) ExecuteImportExcelForNotPassTwo(DataTable dt, string fileGuid,
             string queryJson);
         #endregion
+
+
+        IEnumerable<StuScoreEntity> GetScoreStatList(string queryJson);
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs

@@ -1325,5 +1325,74 @@ order by bb.ScoreId";
         }
 
         #endregion
+
+        public IEnumerable<StuScoreEntity> GetScoreStatList(string queryJson)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+
+                var sql = $"select a.ScoreId,a.AcademicYearNo, a.Semester, a.EmpNo, a.ModifyUserId, a.ModifyUserName, b.EmpName, a.LessonNo, a.DeptNo, a.ClassNo, a.LessonName, a.Grade, a.CheckMark,d.LessonTypeName,d.LTId as LessonTypeId from StuScoreNotPassTwo a left join EmpInfo b on a.EmpNo=b.EmpNo left join LessonInfo c on a.LessonNo=c.LessonNo left join CdLessonType d on c.LessonTypeId=d.LTId where 1=1 ";
+
+
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    var xn = queryParam["AcademicYearNo"].ToString();
+                    sql = sql + $" and a.AcademicYearNo='{xn}' ";
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    var xq = queryParam["Semester"].ToString();
+                    sql = sql + $" and a.Semester='{xq}' ";
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    var xb = queryParam["DeptNo"].ToString();
+                    sql = sql + $" and a.DeptNo='{xb}' ";
+                }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    var nj = queryParam["Grade"].ToString();
+                    sql = sql + $" and a.Grade='{nj}' ";
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    var bj = queryParam["ClassNo"].ToString();
+                    sql = sql + $" and a.ClassNo='{bj}' ";
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    var kc = queryParam["LessonNo"].ToString();
+                    sql = sql + $" and a.LessonNo='{kc}' ";
+                }
+                if (!queryParam["LessonType"].IsEmpty())
+                {
+                    var kclx = queryParam["LessonType"].ToString();
+                    sql = sql + $" and d.LTId='{kclx}' ";
+                }
+                var ls = this.BaseRepository("CollegeMIS").FindList<StuScoreEntity>(sql).GroupBy(x => new { x.ClassNo, x.LessonNo }).Select(x => new StuScoreEntity { ClassNo = x.Key.ClassNo, LessonNo = x.Key.LessonNo, LessonName = x.FirstOrDefault().LessonName, AcademicYearNo = x.FirstOrDefault().AcademicYearNo, Semester = x.FirstOrDefault().Semester, DeptNo = x.FirstOrDefault().DeptNo, Grade = x.FirstOrDefault().Grade, LessonTypeName = x.FirstOrDefault().LessonTypeName, EmpName = x.FirstOrDefault().EmpName, EmpNo = x.FirstOrDefault().EmpNo, ModifyUserId = x.FirstOrDefault().ModifyUserId, ModifyUserName = x.FirstOrDefault().ModifyUserName, LessonTypeId = x.FirstOrDefault().LessonTypeId, ScoreId = x.FirstOrDefault().ScoreId, CheckMark = x.All(a => a.CheckMark == "1") ? "1" : "0" });
+
+
+                if (!queryParam["Stat"].IsEmpty())
+                {
+                    var zt = queryParam["Stat"].ToString();
+                    ls = ls.Where(x => x.CheckMark == zt);
+                }
+
+
+                return ls;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧校园",
     "appid" : "__UNI__7C24C09",
     "description" : "智慧校园移动端",
-    "versionName" : "2.2.0.240311",
-    "versionCode" : 20201,
+    "versionName" : "2.2.0.240428",
+    "versionCode" : 20202,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {