From 53a6bb3d8928d0a5407ddfc9457d0b4404a28d5f Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Fri, 8 Jan 2021 18:02:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../www/pages/studentCheck/studentCheck.js | 3 +-
.../XmlConfig/database.config | 8 +-
.../Modules/TimeTable.cs | 5 +-
.../XmlConfig/database.config | 8 +-
...i.csproj.50308.19.2020-01-17.09-46-40.9504 | 453 ------------------
...eb.config.14182.1.2019-11-06.15-13-35.0033 | 106 ----
...eb.config.44638.3.2020-01-06.09-55-40.0785 | 106 ----
...eb.config.44638.3.2020-01-17.09-46-40.9504 | 118 -----
.../OpenLessonPlanOfElectiveService.cs | 2 +-
.../StuAttendance/StuAttendanceBLL.cs | 4 +-
.../StuAttendance/StuAttendanceIBLL.cs | 2 +-
.../StuAttendance/StuAttendanceService.cs | 17 +-
12 files changed, 32 insertions(+), 800 deletions(-)
delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Learun.Application.WebApi.csproj.50308.19.2020-01-17.09-46-40.9504
delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.14182.1.2019-11-06.15-13-35.0033
delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-06.09-55-40.0785
delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-17.09-46-40.9504
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentCheck/studentCheck.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentCheck/studentCheck.js
index ab5596ddb..3766ea43a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentCheck/studentCheck.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentCheck/studentCheck.js
@@ -85,7 +85,8 @@
};
function studentCheckData(Monday, Sunday) {
var studCheckList = $('.studCheckList');
- learun.httpget(config.webapi + "learun/adms/timetable/StuLessonInfo", {}, (data) => {
+ var param = { StartDate: Monday, EndDate: Sunday };
+ learun.httpget(config.webapi + "learun/adms/timetable/StuLessonInfo", param, (data) => {
console.log(data);
$.each(data, function (i, n) {
var html = '';
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
index 489b3b61f..11a2e6672 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
@@ -13,12 +13,12 @@
-->
-
-
-
+
-
-
+
-
+
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.14182.1.2019-11-06.15-13-35.0033 b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.14182.1.2019-11-06.15-13-35.0033
deleted file mode 100644
index ac5e85f83..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.14182.1.2019-11-06.15-13-35.0033
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-06.09-55-40.0785 b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-06.09-55-40.0785
deleted file mode 100644
index 971aa796c..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-06.09-55-40.0785
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-17.09-46-40.9504 b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-17.09-46-40.9504
deleted file mode 100644
index 1c74b3183..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/_sgbak/Web.config.44638.3.2020-01-17.09-46-40.9504
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 c2ec1f140..6bd019da2 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
@@ -105,7 +105,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
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(" 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 + "' ");
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceBLL.cs
index 58eff4892..79e18b6ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceBLL.cs
@@ -130,11 +130,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
- public List GetStuLessonInfo(string account)
+ public List GetStuLessonInfo(string account,string startTime,string endTime)
{
try
{
- return stuAttendanceService.GetStuLessonInfo(account);
+ return stuAttendanceService.GetStuLessonInfo(account,startTime,endTime);
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceIBLL.cs
index 9bc079a8c..f6ec07035 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceIBLL.cs
@@ -70,7 +70,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
///
void SaveEntity(string keyValue, StuAttendanceEntity entity);
- List GetStuLessonInfo(string account);
+ List GetStuLessonInfo(string account,string startTime,string endTime);
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceService.cs
index 53b7a38c2..b7d9910d9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceService.cs
@@ -237,11 +237,24 @@ and t.Status=2");
}
}
- internal List GetStuLessonInfo(string account)
+ internal List GetStuLessonInfo(string account,string starTime,string endTime)
{
try
{
- return this.BaseRepository("CollegeMIS").FindList(a => a.StuNo == account).ToList();
+ var expression = LinqExtensions.True();
+ expression = expression.And(a => a.StuNo == account);
+ if (!string.IsNullOrEmpty(starTime))
+ {
+ var aTime = starTime.ToDate();
+ expression = expression.And(a => a.LessonDate >= aTime);
+ }
+
+ if (!string.IsNullOrEmpty(endTime))
+ {
+ var bTime = endTime.ToDate();
+ expression = expression.And(a => a.LessonDate <= bTime);
+ }
+ return this.BaseRepository("CollegeMIS").FindList(expression).ToList();
}
catch (Exception ex)
{