Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
Education
Commits
b5ee6362
Commit
b5ee6362
authored
Apr 27, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Plain Diff
页面修改
parents
7dcf1383
0d337e2c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
4 deletions
+56
-4
RB_Class_Time.cs
Edu.Model/Entity/Course/RB_Class_Time.cs
+7
-0
ClassModule.cs
Edu.Module.Course/ClassModule.cs
+19
-2
ClassController.cs
Edu.WebApi/Controllers/Course/ClassController.cs
+30
-2
No files found.
Edu.Model/Entity/Course/RB_Class_Time.cs
View file @
b5ee6362
...
@@ -54,5 +54,12 @@ namespace Edu.Model.Entity.Course
...
@@ -54,5 +54,12 @@ namespace Edu.Model.Entity.Course
/// 课堂随拍图片
/// 课堂随拍图片
/// </summary>
/// </summary>
public
string
SuiPai
{
get
;
set
;
}
public
string
SuiPai
{
get
;
set
;
}
/// <summary>
/// 课堂视频
/// </summary>
public
string
VideoUrl
{
get
;
set
;
}
}
}
}
}
Edu.Module.Course/ClassModule.cs
View file @
b5ee6362
...
@@ -1555,7 +1555,7 @@ namespace Edu.Module.Course
...
@@ -1555,7 +1555,7 @@ namespace Edu.Module.Course
if
(
FinishMinutes
>
0
)
if
(
FinishMinutes
>
0
)
{
{
//完成课时数
//完成课时数
classHours
=
Convert
.
ToInt32
((
FinishMinutes
+
Convert
.
ToDecimal
(
nowHours
))
/
BasicMinutes
);
classHours
=
Convert
.
ToInt32
((
FinishMinutes
+
Convert
.
ToDecimal
(
nowHours
))
/
BasicMinutes
);
}
}
else
else
{
{
...
@@ -1572,7 +1572,8 @@ namespace Edu.Module.Course
...
@@ -1572,7 +1572,8 @@ namespace Edu.Module.Course
/// <param name="SuiPai"></param>
/// <param name="SuiPai"></param>
/// <param name="Id"></param>
/// <param name="Id"></param>
/// <returns></returns>
/// <returns></returns>
public
bool
UpdateTimeSuiPai
(
string
SuiPai
,
int
Id
)
{
public
bool
UpdateTimeSuiPai
(
string
SuiPai
,
int
Id
)
{
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
{
{
...
@@ -1597,6 +1598,22 @@ namespace Edu.Module.Course
...
@@ -1597,6 +1598,22 @@ namespace Edu.Module.Course
};
};
return
class_TimeRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Class_Time_ViewModel
.
ClassTimeId
),
Id
));
return
class_TimeRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Class_Time_ViewModel
.
ClassTimeId
),
Id
));
}
}
/// <summary>
/// 更新课堂视频
/// </summary>
/// <param name="SuiPai"></param>
/// <param name="Id"></param>
/// <returns></returns>
public
bool
UpdateTimeClassVideo
(
string
videoUrl
,
int
Id
)
{
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
{
{
nameof
(
RB_Class_Time_ViewModel
.
VideoUrl
),
videoUrl
},
};
return
class_TimeRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Class_Time_ViewModel
.
ClassTimeId
),
Id
));
}
#
endregion
#
endregion
}
}
}
}
Edu.WebApi/Controllers/Course/ClassController.cs
View file @
b5ee6362
...
@@ -704,6 +704,10 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -704,6 +704,10 @@ namespace Edu.WebApi.Controllers.Course
if
(
signModel
!=
null
&&
signModel
.
ClassCheckId
>
0
)
if
(
signModel
!=
null
&&
signModel
.
ClassCheckId
>
0
)
{
{
item
.
ClassCheckId
=
signModel
.
ClassCheckId
;
item
.
ClassCheckId
=
signModel
.
ClassCheckId
;
<<<<<<<
HEAD
=======
//item.StudyNum = signModel.StudyNum;
>>>>>>>
0d337
e2c30a339e5ce3b2c8c34b28c7a32a2bdee
item
.
Group_Id
=
signModel
.
Group_Id
;
item
.
Group_Id
=
signModel
.
Group_Id
;
item
.
CreateTime
=
signModel
.
CreateTime
;
item
.
CreateTime
=
signModel
.
CreateTime
;
item
.
CreateBy
=
base
.
UserInfo
.
Id
;
item
.
CreateBy
=
base
.
UserInfo
.
Id
;
...
@@ -1251,12 +1255,36 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -1251,12 +1255,36 @@ namespace Edu.WebApi.Controllers.Course
{
{
return
ApiResult
.
Failed
(
"已下课,请勿重复操作"
);
return
ApiResult
.
Failed
(
"已下课,请勿重复操作"
);
}
}
extModel
.
ClassStatus
=
oldModel
.
ClassStatus
+
1
;
//
extModel.ClassStatus = oldModel.ClassStatus + 1;
bool
retult
=
classModule
.
UpdateTimeClassStatus
(
extModel
.
ClassStatus
,
extModel
.
ClassTimeId
);
bool
retult
=
classModule
.
UpdateTimeClassStatus
(
extModel
.
ClassStatus
,
extModel
.
ClassTimeId
);
return
retult
?
ApiResult
.
Success
(
"课堂状态更新成功"
)
:
ApiResult
.
Failed
(
"课堂状态更新失败"
);
return
retult
?
ApiResult
.
Success
(
"课堂状态更新成功"
)
:
ApiResult
.
Failed
(
"课堂状态更新失败"
);
}
}
/// <summary>
/// 更新上课视频
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
UpdateTimeClassVideo
()
{
var
extModel
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
RB_Class_Time_ViewModel
>(
RequestParm
.
Msg
.
ToString
());
if
(
extModel
.
ClassTimeId
==
0
)
{
return
ApiResult
.
Failed
(
"请传入上课时间Id"
);
}
var
oldModel
=
classModule
.
GetClassTimeListRepository
(
new
RB_Class_Time_ViewModel
{
ClassTimeId
=
extModel
.
ClassTimeId
,
Group_Id
=
base
.
UserInfo
.
Group_Id
}).
FirstOrDefault
();
if
(
oldModel
==
null
||
oldModel
.
ClassTimeId
==
0
)
{
return
ApiResult
.
Failed
(
"上课计划不存在"
);
}
if
(
string
.
IsNullOrWhiteSpace
(
extModel
.
VideoUrl
))
{
return
ApiResult
.
Failed
(
"请传入视频地址"
);
}
// extModel.ClassStatus = oldModel.ClassStatus + 1;
bool
retult
=
classModule
.
UpdateTimeClassVideo
(
extModel
.
VideoUrl
,
extModel
.
ClassTimeId
);
return
retult
?
ApiResult
.
Success
(
"课堂视频更新成功"
)
:
ApiResult
.
Failed
(
"课堂视频更新失败"
);
}
#
endregion
#
endregion
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment