【修改】选修重修名单；

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

@@ -103,6 +103,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+
+        /// <summary>
+        /// 二次补考成绩查看【选修课】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexUnpassTwoOfElective()
+        {
+            return View();
+        }
+        
         /// <summary>
         /// 二次补考成绩查看
         /// </summary>
@@ -209,9 +220,30 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据【选修课】
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListForUnpassOfElective(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuScoreNotPassTwoIBLL.GetPageListForUnpassOfElective(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
         #endregion
 
-            #region  提交数据
+        #region  提交数据
 
         /// <summary>
         /// 删除实体数据

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

@@ -2,7 +2,7 @@
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
  * 日  期：2021-12-16 10:14
- * 描  述：长阳迎新
+ * 描  述：二次补考成绩查看
  */
 var refreshGirdData;
 var bootstrap = function ($, learun) {

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

@@ -0,0 +1,66 @@
+@{
+    ViewBag.Title = "选修二次补考成绩查看";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">年级</div>
+                                    <div id="grade"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">课程</div>
+                                    <div id="LessonNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">教室</div>
+                                    <div id="ClassRoomNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">节次</div>
+                                    <div id="LessonSection"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_Init" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;初始化二次补考成绩</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwoOfElective.js")

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

@@ -0,0 +1,182 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-12-16 10:14
+ * 描  述：选修二次补考成绩查看
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 260, 400);
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
+            //年级
+            $('#grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text'
+            });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
+                    var deptno = "";
+                    if (val) {
+                        deptno = val.deptno;
+                    }
+                    $('#MajorNo').lrselectRefresh({
+                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
+                        text: "MajorName",
+                        value: "MajorNo"
+                    })
+                }
+            });
+            $('#MajorNo').lrDataSourceSelect({
+                code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
+                    function (val) {
+                        var majorNo = '';
+                        if (val) {
+                            majorNo = val.MajorNo;
+                        }
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl +
+                                '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' +
+                                majorNo,
+                            text: "ClassName",
+                            value: "ClassNo"
+                        });
+                        $('#LessonNo').lrselectRefresh({
+                            url: top.$.rootUrl +
+                                '/EducationalAdministration/LessonInfo/GetLessonByMajorNo?majorNo=' +
+                                majorNo,
+                            text: "LessonName",
+                            value: "LessonNo"
+                        });
+                    }
+            });
+            $('#ClassNo').lrDataSourceSelect({
+                code: 'bjsj', value: 'classno', text: 'classname'
+            });
+
+            //课程
+            $('#LessonNo').lrselect({
+                placeholder: "请选择课程",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetElectiveLessonNoDataOfAllWithNo',
+                value: 'value',
+                text: 'text',
+                select: function (item) {
+                    if (!!item) {
+                        $("#ClassRoomNo").lrselectRefresh({
+                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetElectiveClassRoomNoDataOfAll?lessonNo=' + item.value,
+                        });
+                    } else {
+                        $("#ClassRoomNo").lrselectRefresh({
+                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetElectiveClassRoomNoDataOfAll',
+                        });
+                    }
+                }
+            });
+            //教室
+            $('#ClassRoomNo').lrselect({
+                placeholder: "请选择教室",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetElectiveClassRoomNoDataOfAll',
+                value: 'value',
+                text: 'text',
+                select: function (item) {
+                    if (!!item) {
+                        $("#LessonSection").lrselectRefresh({
+                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetElectiveLessonSectionDataOfAll?classRoomNo=' + item.value,
+                        });
+                    } else {
+                        $("#LessonSection").lrselectRefresh({
+                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetElectiveLessonSectionDataOfAll',
+                        });
+                    }
+                }
+            });
+            //节次
+            $('#LessonSection').lrselect({
+                placeholder: "请选择节次",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetElectiveLessonSectionDataOfAll',
+                value: 'value',
+                text: 'text'
+            });
+
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 初始化补考成绩
+            $('#lr_Init').on('click', function () {
+                learun.layerConfirm('是否确认初始化二次补考成绩！', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/InitScoreOfElective', function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/GetPageListForUnpassOfElective',
+                headData: [
+                    {
+                        label: "学号", name: "stuno", width: 100, align: "left"
+                    },
+                    {
+                        label: "姓名", name: "stuname", width: 150, align: "left"
+                    },
+                    { label: "课程", name: "LessonName", width: 150, align: "left" },
+                    { label: "任课老师", name: "EmpName", width: 100, align: "left" },
+                    { label: "考试年级", name: "Grade", width: 100, align: "left" },
+                    {
+                        label: "学年", name: "AcademicYearNo", width: 80, align: "left"
+                    },
+                    { label: "学期", name: "Semester", width: 80, align: "left" },
+                    { label: "班级", name: "classname", width: 100, align: "left" },
+                    { label: "教室", name: "ClassRoomName", width: 100, align: "left" },
+                    { label: "节次", name: "LessonSection", width: 100, align: "left" },
+                    { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" },
+                    { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" },
+                    { label: "成绩", name: "Score2", width: 150, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'Grade desc,LessonNo,ClassRoomNo,LessonSection',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -1003,6 +1003,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfThree.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfTwo.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\SoonGraduateIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\IndexUnpassTwoOfElective.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" />
@@ -8142,6 +8143,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\IndexUnpassOfElective.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\InputScoreIndexOfElective.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPass\InputScoreIndexOfElectiveInTeacher.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\IndexUnpassTwoOfElective.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/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs

@@ -89,6 +89,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        /// <summary>
+        /// 获取二次补考成绩查看【选修课】
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public IEnumerable<NotPassEntity> GetPageListForUnpassOfElective(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return stuScoreNotPassTwoService.GetPageListForUnpassOfElective(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取StuScoreNotPassTwo表实体数据
         /// <param name="keyValue">主键</param>

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

@@ -260,6 +260,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         [Column("F_SCHOOLID")]
         public string F_SchoolId { get; set; }
+        /// <summary>
+        /// 节次
+        /// </summary>
+        /// <returns></returns>
+        [Column("LESSONSECTION")]
+        public string LessonSection { get; set; }
+        /// <summary>
+        /// 教室编号
+        /// </summary>
+        /// <returns></returns>
+        [Column("CLASSROOMNO")]
+        public string ClassRoomNo { get; set; }
+        /// <summary>
+        /// 教室名称
+        /// </summary>
+        /// <returns></returns>
+        [Column("CLASSROOMNAME")]
+        public string ClassRoomName { get; set; }
 
         #endregion
 

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

@@ -35,6 +35,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         StuScoreNotPassTwoEntity GetStuScoreNotPassTwoEntity(string keyValue);
 
+        /// <summary>
+        /// 获取二次补考成绩查看【选修课】
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        IEnumerable<NotPassEntity> GetPageListForUnpassOfElective(Pagination pagination, string queryJson);
         /// <summary>
         /// 获取列表数据
         /// <summary>

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

@@ -353,6 +353,93 @@ and (b.EduSystem is null or b.EduSystem != '6') ");
             }
         }
 
+        /// <summary>
+        /// 获取二次补考成绩查看【选修课】
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public IEnumerable<NotPassEntity> GetPageListForUnpassOfElective(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                var strSql = new StringBuilder();
+
+                //新
+                strSql.Append(@"select ISNULL(ssnpt.Score,0) as BKScore,ssnpt.CheckMark as IsSubmit,c.classname,a.*,CONVERT(varchar,a.OrdinaryScore) as OrdinaryScore2,CONVERT(varchar,a.TermEndScore) as TermEndScore2,CONVERT(varchar,a.Score) as Score2,b.MoveType,b.StudyModality,e.EmpName  
+from StuScoreNotPass a 
+left join StuScoreNotPassTwo ssnpt on ssnpt.StuNo=a.StuNo and ssnpt.AcademicYearNo=a.AcademicYearNo and ssnpt.Semester=a.Semester and ssnpt.LessonNo=a.LessonNo and ssnpt.LessonSection=a.LessonSection and ssnpt.ClassRoomNo=a.ClassRoomNo   
+left join ClassInfo c on c.ClassNo=a.ClassNo
+left join StuInfoBasic b on b.StuNo=a.StuNo
+left join EmpInfo e on e.EmpNo=a.EmpNo
+where 1=1 and a.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus =1)
+and a.LessonSortNo='2'
+and a.Score<60
+and b.StuId is not null
+and (b.EduSystem is null or b.EduSystem != '6') ");
+
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    strSql.Append($" and a.Semester ='{queryParam["Semester"].ToString().Trim()}'");
+                }
+                if (!queryParam["grade"].IsEmpty())
+                {
+                    strSql.Append($" and a.grade ='{queryParam["grade"].ToString()}'");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    strSql.Append($" and a.DeptNo ='{queryParam["DeptNo"].ToString()}'");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    strSql.Append($" and a.MajorNo ='{queryParam["MajorNo"].ToString()}'");
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    strSql.Append($" and a.LessonNo ='{queryParam["LessonNo"].ToString()}'");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'");
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    strSql.Append($" and a.EmpNo ='{queryParam["EmpNo"].ToString()}'");
+                }
+                if (!queryParam["CheckMark"].IsEmpty())
+                {
+                    strSql.Append($" and ssnpt.CheckMark ='{queryParam["CheckMark"].ToString()}'");
+                }
+                if (!queryParam["LessonSection"].IsEmpty())
+                {
+                    strSql.Append($" and a.LessonSection ='{queryParam["LessonSection"].ToString()}'");
+                }
+                if (!queryParam["ClassRoomNo"].IsEmpty())
+                {
+                    strSql.Append($" and a.ClassRoomNo ='{queryParam["ClassRoomNo"].ToString()}'");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<NotPassEntity>(strSql.ToString(), pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 二次补考成绩查看
         /// </summary>