From 9be5c2e7e3179fabe478372e87196b74ed91e302 Mon Sep 17 00:00:00 2001
From: dao <qq804260@live.cn>
Date: Wed, 24 Apr 2024 09:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=99=E5=AE=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XmlConfig/database.config                  |  4 ++--
 .../Modules/Arrangelesson.cs                   |  7 +++++++
 .../XmlConfig/database.config                  |  4 ++--
 .../ArrangeLessonTerm/ArrangeLessonTermBLL.cs  |  6 ++++++
 .../ArrangeLessonTerm/ArrangeLessonTermIBLL.cs |  1 +
 .../ArrangeLessonTermService.cs                | 18 ++++++++++++++++++
 6 files changed, 36 insertions(+), 4 deletions(-)

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 9f83be252..8a423d8fb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
   <!--本机-->
-  <add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS_金隅;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
+  <add name="BaseDb" connectionString="Server=8.141.155.183,53314;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=8.141.155.183,53314;Initial Catalog=CollegeMIS_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <!--126-->
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs
index dec1e172c..54654eca2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs	
@@ -42,6 +42,7 @@ namespace Learun.Application.WebApi.Modules
             Get["/allschool"] = GetAllSchools;
             Get["/allclasslesson"] = GetAllClassLesson;
             Get["/allelelectivelesson"] = GetAllElectiveLesson;
+            Get["/allclassroom"] = GetAllClassRoom;
 
             //以下接口不往ArrangeLessonSync里记录已传数据
             Get["/schoolNotRecord"] = GetSchoolsNotRecord;
@@ -177,6 +178,12 @@ namespace Learun.Application.WebApi.Modules
             var result = cdMajorIbll.GetAllList();
             return Success(result);
         }
+        public Response GetAllClassRoom(dynamic _)
+        {
+            
+            var result = arrangeLessonTermIBLL.GetClassrooms();
+            return Success(result);
+        }
         private Response GetLessonTypes(dynamic _)
         {
             var result = arrangeLessonTermIBLL.GetLessonTypes();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config
index a30b65def..e6c8946df 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
   <!--本机-->
-  <add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS_金隅;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
+  <add name="BaseDb" connectionString="Server=8.141.155.183,53314;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=8.141.155.183,53314;Initial Catalog=CollegeMIS_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs
index d3c1b684a..dbc60c38c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs	
@@ -218,6 +218,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             var data = arrangeLessonTermService.GetClassrooms(academicYearNo, semester);
             return data;
         }
+
+        public IEnumerable<ClassroomInfoEntity> GetClassrooms()
+        {
+            var data = arrangeLessonTermService.GetClassrooms();
+            return data;
+        }
         public IEnumerable<ClassroomInfoEntity> GetClassroomsNotRecord(string academicYearNo, string semester)
         {
             var data = arrangeLessonTermService.GetClassroomsNotRecord(academicYearNo, semester);
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs
index 0e921fd08..32b1c93b3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs	
@@ -24,6 +24,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         IEnumerable<CdMajorEntity> GetMajorsNotRecord(string academicYearNo, string semester);
         IEnumerable<ClassroomInfoEntity> GetClassrooms(string academicYearNo, string semester);
         IEnumerable<ClassroomInfoEntity> GetClassroomsNotRecord(string academicYearNo, string semester);
+        IEnumerable<ClassroomInfoEntity> GetClassrooms();
         IEnumerable<CdClassTypeEntity> GetClassType();
         IEnumerable<LessonInfoEntity> GetLessons(string academicYearNo, string semester);
         IEnumerable<LessonInfoEntity> GetLessonsNotRecord(string academicYearNo, string semester);
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs
index fb3f19b0a..e3a408967 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs	
@@ -1293,6 +1293,24 @@ WHERE   (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + ent
                 throw;
             }
         }
+
+        public IEnumerable<ClassroomInfoEntity> GetClassrooms()
+        {
+            try
+            {
+                //数据
+                var db = BaseRepository("CollegeMIS");
+                var data = db.FindList<ClassroomInfoEntity>("select * from ClassroomInfo where CheckMark=1 ");
+                
+                return data;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+        }
+
         public IEnumerable<ClassroomInfoEntity> GetClassroomsNotRecord(string academicYearNo, string semester)
         {
             try