1

Learun.Framework.Ultimate V7/Learun.Application.Mobile/Learun.Application.Mobile.jsproj

@@ -44,10 +44,14 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>b9943e88-bf67-46ec-a4d8-d0c81d5846c4</ProjectGuid>
-    <SccProjectName>Learun.Application.Mobile</SccProjectName>
-    <SccProvider>SourceGear Vault Visual Studio 2005 Client:{1EA47954-8515-402d-82D9-B5C332120A8D}</SccProvider>
-    <SccAuxPath>http://123.57.209.16:8090/VaultService</SccAuxPath>
-    <SccLocalPath>1~a7250b02-76e9-4d74-aa27-f5cdf7719296</SccLocalPath>
+    <SccProjectName>
+    </SccProjectName>
+    <SccProvider>
+    </SccProvider>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccLocalPath>
+    </SccLocalPath>
   </PropertyGroup>
   <ItemGroup>
     <ProjectCapability Include="UseFileGlobs" />

Learun.Framework.Ultimate V7/Learun.Application.Mobile/Learun.Application.Mobile.sln

@@ -56,11 +56,7 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DE155D09-06B5-4BCA-8433-365A2FC796CF}
 	EndGlobalSection
-	GlobalSection(VaultVsipSolution-v2) = preSolution
-		VaultHost = http://123.57.209.16:8090/VaultService
-		VaultRepositoryID = 1
-		VaultRepositoryGUID = a7250b02-76e9-4d74-aa27-f5cdf7719296
-		ProjectCount = 1
-		ProjectRelativeDiskPath1 = Learun.Application.Mobile.jsproj
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {DE155D09-06B5-4BCA-8433-365A2FC796CF}
 	EndGlobalSection
 EndGlobal

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/OpenLessonPlanOfElectiveStudentPre.js

@@ -45,7 +45,7 @@
             //    _postParam.queryJson = JSON.stringify(multipleData);
             //}
             if (true) {
-                _postParam.queryJson = JSON.stringify({ StuNo: JSON.parse(localStorage.userinfo).baseinfo.account, StuMajorNo: JSON.parse(localStorage.userinfo).baseinfo.majorno });
+                _postParam.queryJson = JSON.stringify({ StuNo: JSON.parse(localStorage.userinfo).baseinfo.account, StuMajorNo: JSON.parse(localStorage.userinfo).baseinfo.majorno, StuGrade: JSON.parse(localStorage.userinfo).baseinfo.grade });
             }
             learun.httpget(config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/pagelist', _postParam, (data) => {
                 $page.find('.lr-badge').text('0');

Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile2.pubxml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
+自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>D:\Job-release\DigitalCampus-release</publishUrl>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>

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

@@ -46,7 +46,7 @@ namespace Learun.Application.WebApi.Modules
         public Response GetImg(dynamic _)
         {
             string code = Request.Query["code"];
-            string rootPath = ConfigurationManager.AppSettings["AnnexesFile"]+"\\";
+            string rootPath = ConfigurationManager.AppSettings["AnnexesFile"] + "\\";
             string midPath = "Content/images/logo";
             try
             {
@@ -60,7 +60,7 @@ namespace Learun.Application.WebApi.Modules
                     switch (code)
                     {
                         case "default":
-                            return new GenericFileResponse(Path.Combine(rootPath, midPath, "default.png"), "image/jpeg"); 
+                            return new GenericFileResponse(Path.Combine(rootPath, midPath, "default.png"), "image/jpeg");
                         case "accordion":
                             return new GenericFileResponse(Path.Combine(rootPath, midPath, "accordion.png"), "image/jpeg");
                         case "windows":
@@ -140,6 +140,7 @@ namespace Learun.Application.WebApi.Modules
                         var studententity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(userEntity.F_Account);
                         if (studententity != null)
                         {
+                            res.userInfo.grade = studententity.Grade;
                             var majorinfo = majorIbll.GetCdMajorEntityByMajorNo(studententity.MajorNo);
                             if (majorinfo != null)
                             {
@@ -213,6 +214,7 @@ namespace Learun.Application.WebApi.Modules
                 var studententity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(userEntity.F_Account);
                 if (studententity != null)
                 {
+                    res.userInfo.grade = studententity.Grade;
                     var majorinfo = majorIbll.GetCdMajorEntityByMajorNo(studententity.MajorNo);
                     if (majorinfo != null)
                     {

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile.pubxml

@@ -12,7 +12,7 @@
     <SiteUrlToLaunchAfterPublish />
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>D:\Job-release\CGPIweb-release</publishUrl>
+    <publishUrl>D:\Job-release\DigitalCampusApi-release</publishUrl>
     <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
 </Project>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs

@@ -90,17 +90,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-
-                var strSql = new StringBuilder();
-                strSql.Append(@"select b.*,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id 
-	                              left join StuSelectLessonListOfElective c on b.Id=c.OLPEId and c.StuNo=@StuNo
-                                  left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo
-	                               where 1=1 and a.MajorId is not null and a.Grade is not null ");
                 //学号
                 if (!queryParam["StuNo"].IsEmpty())
                 {
                     dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
                 }
+                //教学工作安排中“选课”工作设置的学年学期
+                var now = DateTime.Now;
+                var EADateArrangeEntityAboutElective = this.BaseRepository("CollegeMIS").FindEntity<EADateArrangeEntity>(x => x.WorkName == "选课" && x.MakeDate <= now && x.EndDate >= now && x.CheckMark == "1");
+
+                var strSql = new StringBuilder();
+                strSql.Append(@"select b.*,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id 
+	                              left join StuSelectLessonListOfElective c on b.Id=c.OLPEId and c.StuNo=@StuNo
+                                  left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo
+	                               where not exists ( ");
+                //不显示与已选课程 相同课程名称相同教师的课程
+                strSql.Append(" select * from StuSelectLessonListOfElective s where s.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and s.Semester='" + EADateArrangeEntityAboutElective.Semester + "' and s.StuNo=@StuNo and s.Status <>3 and s.LessonName=b.LessonName and s.EmpNo=b.EmpNo and s.OLPEId!=b.Id ");
+                strSql.Append(" ) ");
+                strSql.Append(" and a.MajorId is not null and a.Grade is not null ");
+                strSql.Append(" AND b.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and b.Semester='" + EADateArrangeEntityAboutElective?.Semester + "' ");
                 if (!queryParam["StuMajorNo"].IsEmpty())
                 {
                     dp.Add("StuMajorNo", queryParam["StuMajorNo"].ToString(), DbType.String);
@@ -119,18 +127,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     strSql.Append(" and a.Grade='' ");
                 }
-                //教学工作安排中“选课”工作设置的学年学期
-                var now = DateTime.Now;
-                var EADateArrangeEntityAboutElective = this.BaseRepository("CollegeMIS").FindEntity<EADateArrangeEntity>(x => x.WorkName == "选课" && x.MakeDate <= now && x.EndDate >= now && x.CheckMark == "1");
-                if (EADateArrangeEntityAboutElective != null)
-                {
-                    strSql.Append(" AND b.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and b.Semester='" + EADateArrangeEntityAboutElective?.Semester + "'");
-                    strSql.Append(" and b.LessonName not in(select LessonName from StuSelectLessonListOfElective where AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and Semester='" + EADateArrangeEntityAboutElective?.Semester + "' and StuNo='" + queryParam["StuNo"].ToString() + "' and Status<>3)");
-                }
-                else
-                {
-                    strSql.Append(" AND b.AcademicYearNo='' and b.Semester=''");
-                }
+                //不显示与已选课程 相同课程名称的课程
+                //if (EADateArrangeEntityAboutElective != null)
+                //{
+                //    strSql.Append(" AND b.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and b.Semester='" + EADateArrangeEntityAboutElective?.Semester + "'");
+                //    strSql.Append(" and b.LessonName not in(select LessonName from StuSelectLessonListOfElective where AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and Semester='" + EADateArrangeEntityAboutElective?.Semester + "' and StuNo='" + queryParam["StuNo"].ToString() + "' and Status<>3)");
+                //}
+                //else
+                //{
+                //    strSql.Append(" AND b.AcademicYearNo='' and b.Semester=''");
+                //}
 
                 if (!queryParam["EmpName"].IsEmpty())
                 {