From 21d2de4e62a3b4fe1aa6fd8bdbb71b12b7e61672 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 14 Dec 2021 14:42:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A1=94=E9=87=8C=E6=9C=A8=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeExamTermNew/ArrangeExamTermNew.js | 2 +- .../Views/LR_Content/script/pushmessage.js | 2 +- .../ArrangeExamTermNewApi.cs | 2 +- .../ArrangeExamTermNewBLL.cs | 26 ------- .../ArrangeExamTermNewIBLL.cs | 1 - .../ArrangeExamTermNewService.cs | 75 ------------------- 6 files changed, 3 insertions(+), 105 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNew.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNew.js index 5b036cad9..f8aed1e5c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNew.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNew.js @@ -31,7 +31,7 @@ } var baseUser = JSON.parse(localStorage.userinfo); - _postParam.queryJson = JSON.stringify({ ClassDiredctorNo: baseUser.baseinfo.account }); + _postParam.queryJson = JSON.stringify({ EmpNo: baseUser.baseinfo.account }); learun.httpget(config.webapi + '/learun/ask/testlist', _postParam, (data) => { $page.find('.lr-badge').text('0'); if (data) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/pushmessage.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/pushmessage.js index 78746c499..6ef23bcb3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/pushmessage.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/pushmessage.js @@ -1,6 +1,6 @@ (function ($, learun) { "use strict"; - + var isLoaded = 0; learun._im = { init: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ArrangeExamTermNewApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ArrangeExamTermNewApi.cs index f9ea5053c..9e63736a4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ArrangeExamTermNewApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ArrangeExamTermNewApi.cs @@ -33,7 +33,7 @@ namespace Learun.Application.WebApi.Modules public Response GetPageList(dynamic _) { ReqPageParam parameter = this.GetReqData(); - var data = AeTerm.GetTeachList(parameter.pagination, parameter.queryJson); + var data = AeTerm.GetPageList(parameter.pagination, parameter.queryJson); var jsonData = new { rows = data, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewBLL.cs index 4ca4c09ae..c64338fe1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewBLL.cs @@ -235,31 +235,5 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion - - /// - /// 手机端 - /// - /// 分页参数 - /// 查询参数 - /// - public IEnumerable GetTeachList(Pagination pagination, string queryJson) - { - try - { - return arrangeExamTermNewService.GetTeachList(pagination, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewIBLL.cs index d1fab5ebd..d1b5ef022 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewIBLL.cs @@ -55,6 +55,5 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration List GetClassTree(); IEnumerable GetPageListForClass(Pagination pagination, string queryJson); IEnumerable GetPageListForLesson(Pagination pagination, string queryJson); - IEnumerable GetTeachList(Pagination pagination, string queryJson); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewService.cs index cbd2e428a..553eb510a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeExamTermNew/ArrangeExamTermNewService.cs @@ -412,80 +412,5 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - - /// - /// 手机端查询条件 - /// - /// 分页参数 - /// 条件参数 - /// - public IEnumerable GetTeachList(Pagination pagination, string queryJson) - { - try - { - var strSql = new StringBuilder(); - - - - strSql.Append("select* from ArrangeExamTerm AET "); - strSql.Append(" left join(select ClassDiredctorNo, classno from[CollegeMIS_塔里木].dbo.Classinfo) CI on CI.ClassNo = AET.ClassNo "); - var queryParam = queryJson.ToJObject(); - var dp = new DynamicParameters(new { }); - if (!queryParam["AcademicYearNo"].IsEmpty()) - { - strSql.Append(" and t.AcademicYearNo=@AcademicYearNo "); - dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); - } - if (!queryParam["Semester"].IsEmpty()) - { - strSql.Append(" and t.Semester=@Semester "); - dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); - } - if (!queryParam["EmpNo"].IsEmpty()) - { - strSql.Append(" and t.EmpNo=@EmpNo "); - dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); - } - - if (!queryParam["LessonNo"].IsEmpty()) - { - strSql.Append(" and t.LessonNo=@LessonNo "); - dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String); - } - if (!queryParam["ClassNo"].IsEmpty()) - { - strSql.Append(" and t.ClassNo=@ClassNo "); - dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String); - } - if (!queryParam["ClassRoomNo"].IsEmpty()) - { - strSql.Append(" and t.ClassRoomNo=@ClassRoomNo "); - dp.Add("ClassRoomNo", queryParam["ClassRoomNo"].ToString(), DbType.String); - } - if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) - { - dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); - dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); - strSql.Append(" AND ( ExamDate >= @startTime AND ExamDate <= @endTime ) "); - } - if (!queryParam["ClassDiredctorNo"].IsEmpty()) - { - strSql.Append(" and t.ClassDiredctorNo=@ClassDiredctorNo "); - dp.Add("ClassDiredctorNo", queryParam["ClassDiredctorNo"].ToString(), DbType.String); - } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } } }