From c6805c44730c008e1986e78552e17175d9da18a1 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Sat, 29 Aug 2020 15:06:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E4=BF=AE=E8=AF=BE=E9=80=89=E8=AF=BE?= =?UTF-8?q?=EF=BC=9A=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B8=8E=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E8=AF=BE=E7=A8=8B=20=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=90=8D=E7=A7=B0=E7=9B=B8=E5=90=8C=E6=95=99?= =?UTF-8?q?=E5=B8=88=E7=9A=84=E8=AF=BE=E7=A8=8B=EF=BC=9B=20=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1api=EF=BC=9A=E7=BC=93=E5=AD=98=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E5=B9=B4=E7=BA=A7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Mobile.jsproj | 12 ++++-- .../Learun.Application.Mobile.sln | 8 +--- .../OpenLessonPlanOfElectiveStudentPre.js | 2 +- .../Learun.Application.Web.csproj | 3 ++ .../PublishProfiles/FolderProfile2.pubxml | 18 ++++++++ .../Modules/Index.cs | 2 +- .../Modules/WeixinApi.cs | 6 ++- .../PublishProfiles/FolderProfile.pubxml | 2 +- .../OpenLessonPlanOfElectiveService.cs | 42 +++++++++++-------- 9 files changed, 62 insertions(+), 33 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile2.pubxml diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/Learun.Application.Mobile.jsproj b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/Learun.Application.Mobile.jsproj index 755775da8..5f73ed22a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/Learun.Application.Mobile.jsproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/Learun.Application.Mobile.jsproj @@ -44,10 +44,14 @@ b9943e88-bf67-46ec-a4d8-d0c81d5846c4 - Learun.Application.Mobile - SourceGear Vault Visual Studio 2005 Client:{1EA47954-8515-402d-82D9-B5C332120A8D} - http://123.57.209.16:8090/VaultService - 1~a7250b02-76e9-4d74-aa27-f5cdf7719296 + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/Learun.Application.Mobile.sln b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/Learun.Application.Mobile.sln index 7294cb377..1cc894368 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/Learun.Application.Mobile.sln +++ b/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 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/OpenLessonPlanOfElectiveStudentPre.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/OpenLessonPlanOfElectiveStudentPre.js index a26bdbf6b..773b795ec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/OpenLessonPlanOfElectiveStudentPre.js +++ b/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'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 906e796f4..3ed2d0aee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -6490,6 +6490,7 @@ + @@ -6545,6 +6546,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile2.pubxml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile2.pubxml new file mode 100644 index 000000000..910e8b37e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile2.pubxml @@ -0,0 +1,18 @@ + + + + + FileSystem + FileSystem + Release + Any CPU + + True + False + D:\Job-release\DigitalCampus-release + True + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Index.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Index.cs index 96b441e6e..dddccc760 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Index.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Index.cs @@ -15,7 +15,7 @@ namespace Learun.Application.WebApi : base() { Get["/"] = MainIndex; - Get["/index.html"] = MainIndex + Get["/index.html"] = MainIndex; Get["/bgimg"] = BgImg; } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs index 6458396c0..831876e87 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile.pubxml b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile.pubxml index 016662bfb..8192386c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile.pubxml +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile.pubxml @@ -12,7 +12,7 @@ True False - D:\Job-release\CGPIweb-release + D:\Job-release\DigitalCampusApi-release True \ No newline at end of file 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 a4b0ca115..39ea03a47 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 @@ -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(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(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()) {