Bladeren bron

增加教室接口

金隅分支
dao 7 maanden geleden
bovenliggende
commit
9be5c2e7e3
6 gewijzigde bestanden met toevoegingen van 36 en 4 verwijderingen
  1. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
  2. +7
    -0
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs
  3. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config
  4. +6
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs
  5. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs
  6. +18
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config Bestand weergeven

@@ -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" />


+ 7
- 0
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs Bestand weergeven

@@ -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();


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config Bestand weergeven

@@ -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" />


+ 6
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs Bestand weergeven

@@ -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);


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs Bestand weergeven

@@ -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);


+ 18
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs Bestand weergeven

@@ -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


Laden…
Annuleren
Opslaan