From df72e78f61a7c59a716b1cd8455ebd7372784a17 Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Thu, 27 Aug 2020 17:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E4=BF=AE=E8=AF=BE=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=80=89=E8=AF=BE=E4=B8=93=E4=B8=9A?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/OpenLessonPlanOfElective/MergeIndex.js   | 14 +++++++++++++-
 .../ElectiveMajor/ElectiveMajorEntity.cs           |  5 +++++
 .../OpenLessonPlanOfElectiveEntity.cs              |  6 ++++++
 .../OpenLessonPlanOfElectiveService.cs             |  5 +++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js
index 93e7635e7..055f0fb1b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js	
@@ -217,7 +217,19 @@ var bootstrap = function ($, learun) {
                     { label: "已报人数", name: "StuNumOfApply", width: 60, align: "left" },
                     { label: "通过人数", name: "StuNum", width: 60, align: "left" },
                     { label: "已报人数(预)", name: "StuNumOfApplyPre", width: 80, align: "left" },
-                    { label: "通过人数(预)", name: "StuNumPre", width: 80, align: "left" }
+                    { label: "通过人数(预)", name: "StuNumPre", width: 80, align: "left" },
+                    {
+                        label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left",formatter: function (cellvalue,row) {
+                            var str = "";
+                            for (var i = 0; i < row.ElectiveMajorList.length; i++) {
+                                str += row.ElectiveMajorList[i].Grade + "级" + row.ElectiveMajorList[i].MajorName;
+                                if (i != row.ElectiveMajorList.length - 1) {
+                                    str += ",";
+                                }
+                            }
+                            return str;
+                        }
+                    }
                 ],
                 mainId: 'Id',
                 isPage: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorEntity.cs
index 07051fc5d..aa1b3ddbc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorEntity.cs	
@@ -69,6 +69,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region  扩展字段
+        [NotMapped]
+        public string MajorNo { get; set; }
+        [NotMapped]
+        public string MajorName { get; set; }
+
         #endregion
     }
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs
index 378ba783c..3f3730287 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs	
@@ -1,5 +1,6 @@
 using Learun.Util;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Learun.Application.TwoDevelopment.EducationalAdministration
@@ -221,6 +222,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [NotMapped] public string LessonNo2 { get; set; }
         [NotMapped] public string EmpNo2 { get; set; }
+        /// <summary>
+        /// 选课专业列表
+        /// </summary>
+        [NotMapped]
+        public List<ElectiveMajorEntity> ElectiveMajorList { get; set; }
         #endregion
     }
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs
index 4b2ba21b6..a4b0ca115 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs	
@@ -362,6 +362,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     item.StuNumOfApply = aa.Where(x => (x.Status == 1 || x.Status == 2)).Count();
                     //审核通过人数
                     item.StuNum = aa.Where(x => x.Status == 2).Count();
+                    //选课专业
+                    var strSql2 = new StringBuilder();
+                    strSql2.Append("select e.Id,e.OLPOEId,e.MajorId,e.Grade,m.MajorNo,m.MajorName from ElectiveMajor e left join CdMajor m on e.MajorId=m.ID where e.OLPOEId='" + item.Id + "' and e.MajorId is not null and e.Grade is not null ");
+                    item.ElectiveMajorList = this.BaseRepository("CollegeMIS").FindList<ElectiveMajorEntity>(strSql2.ToString()).OrderBy(x => x.MajorNo).ThenBy(x => x.Grade).ToList();
 
                     //模式一：预选课
                     var aaa = this.BaseRepository("CollegeMIS").FindList<StuSelectLessonListOfElectivePreEntity>(x => x.OLPEId == item.Id);
@@ -370,6 +374,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     //审核通过人数
                     item.StuNumPre = aaa.Where(x => x.Status == 2).Count();
 
+
                 }
 
                 return list;