Skip to content

E
Education
Commit 7d6d41ae authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 8871d8de 60496e2a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
Edu.Module.Course/ClassModule.cs
View file @ 7d6d41ae
...@@ -741,6 +741,10 @@ namespace Edu.Module.Course ...@@ -741,6 +741,10 @@ namespace Edu.Module.Course
{ {
dayClassHours = dayMinutes / model.ClassHourMinute; dayClassHours = dayMinutes / model.ClassHourMinute;
} }
else
{
dayClassHours = dayMinutes / class_ConfigRepository.GetBasicMinutesRepository(model.Group_Id);
}
return dayClassHours; return dayClassHours;
} }
......
Edu.WebApi/appsettings.json
View file @ 7d6d41ae
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ", "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient", "DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ", "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient", "FinanceConnectionPName": "MySql.Data.MySqlClient",
"DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ", "DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DataStatisticsConnectionPName": "MySql.Data.MySqlClient", "DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment