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
87ed3d97
Commit
87ed3d97
authored
Apr 27, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
e1c6451e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
101 additions
and
9 deletions
+101
-9
Class_LessonPlan_ViewModel.cs
Edu.Model/ViewModel/Course/Class_LessonPlan_ViewModel.cs
+12
-0
RB_Class_LessonComment_ViewModel.cs
...odel/ViewModel/Course/RB_Class_LessonComment_ViewModel.cs
+5
-0
RB_Class_LessonCommentRepository.cs
Edu.Repository/Course/RB_Class_LessonCommentRepository.cs
+4
-0
RB_Class_PlanRepository.cs
Edu.Repository/Course/RB_Class_PlanRepository.cs
+2
-2
ClassController.cs
Edu.WebApi/Controllers/Course/ClassController.cs
+78
-7
No files found.
Edu.Model/ViewModel/Course/Class_LessonPlan_ViewModel.cs
View file @
87ed3d97
...
...
@@ -96,6 +96,18 @@ namespace Edu.Model.ViewModel.Course
/// 上课时间
/// </summary>
public
string
DayTime
{
get
;
set
;
}
/// <summary>
/// 上课结束时间
/// </summary>
public
string
ClassEndTime
{
get
;
set
;
}
/// <summary>
/// 是否可以更新课后总结
/// </summary>
public
int
IsEditSummary
{
get
;
set
;
}
#
endregion
...
...
Edu.Model/ViewModel/Course/RB_Class_LessonComment_ViewModel.cs
View file @
87ed3d97
...
...
@@ -17,5 +17,10 @@ namespace Edu.Model.ViewModel.Course
/// 创建人
/// </summary>
public
string
CreateByName
{
get
;
set
;
}
/// <summary>
/// 老师id
/// </summary>
public
int
TeacherId
{
get
;
set
;
}
}
}
Edu.Repository/Course/RB_Class_LessonCommentRepository.cs
View file @
87ed3d97
...
...
@@ -43,6 +43,10 @@ namespace Edu.Repository.Course
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Class_LessonComment_ViewModel
.
LessonPlanId
),
query
.
LessonPlanId
);
}
if
(
query
.
CreateBy
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Class_LessonComment_ViewModel
.
CreateBy
),
query
.
CreateBy
);
}
}
builder
.
Append
(
" ORDER BY CreateTime DESC "
);
return
Get
<
RB_Class_LessonComment_ViewModel
>(
builder
.
ToString
()).
ToList
();
...
...
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @
87ed3d97
...
...
@@ -332,9 +332,9 @@ WHERE 1=1
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Class_Plan_ViewModel
.
School_Id
),
query
.
School_Id
);
}
if
(
query
.
Teacher
_
Id
>
0
)
if
(
query
.
TeacherId
>
0
)
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Class_Plan_ViewModel
.
Teacher
_Id
),
query
.
Teacher_
Id
);
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Class_Plan_ViewModel
.
Teacher
Id
),
query
.
Teacher
Id
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
QClassIds
))
{
...
...
Edu.WebApi/Controllers/Course/ClassController.cs
View file @
87ed3d97
...
...
@@ -541,7 +541,7 @@ namespace Edu.WebApi.Controllers.Course
data
.
RoomName
,
TotalHour
=
Convert
.
ToInt32
(
totalMinutes
/
60
),
ClassNum
=
Convert
.
ToInt32
(
totalMinutes
/
45
),
DefaultMinutes
=
totalMinutes
,
DefaultMinutes
=
totalMinutes
,
ClassDate
=
data
.
ClassDate
.
ToString
(
"yyyy-MM-dd"
),
GuestList
=
guestList
});
...
...
@@ -631,10 +631,10 @@ namespace Edu.WebApi.Controllers.Course
MonthStr
=
item
.
ClassDate
.
ToString
(
"MM"
),
DayStr
=
item
.
ClassDate
.
ToString
(
"dd"
),
YearStr
=
item
.
ClassDate
.
ToString
(
"yyyy"
),
CheckNum
=
checkList
.
Count
(),
CheckList
=
checkList
.
Select
(
qitem
=>
new
{
qitem
.
GuestName
}),
NoCheckNum
=
noCheckList
.
Count
(),
NoCheckList
=
noCheckList
.
Select
(
qitem
=>
new
{
qitem
.
GuestName
}),
CheckNum
=
checkList
.
Count
(),
CheckList
=
checkList
.
Select
(
qitem
=>
new
{
qitem
.
GuestName
}),
NoCheckNum
=
noCheckList
.
Count
(),
NoCheckList
=
noCheckList
.
Select
(
qitem
=>
new
{
qitem
.
GuestName
}),
ColorType
=
item
.
TeacherId
!=
item
.
Teacher_Id
?
1
:
(
totalNum
==
noCheckList
.
Count
()
?
2
:
3
),
};
resultList
.
Add
(
planCheckObj
);
...
...
@@ -856,6 +856,31 @@ namespace Edu.WebApi.Controllers.Course
query
.
UpdateTime
=
System
.
DateTime
.
Now
;
query
.
CreateTime
=
System
.
DateTime
.
Now
;
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
ClassEndTime
))
{
if
(
Convert
.
ToDateTime
(
query
.
ClassEndTime
)
>
System
.
DateTime
.
Now
)
{
return
ApiResult
.
Failed
(
"当前还未下课不能填写课后总结"
);
}
}
if
(
query
.
LessonPlanList
!=
null
&&
query
.
LessonPlanList
.
Any
())
{
int
totalInfo
=
0
;
foreach
(
var
item
in
query
.
LessonPlanList
)
{
totalInfo
+=
item
.
LessonPlanDetailsList
.
Where
(
x
=>
!
string
.
IsNullOrWhiteSpace
(
x
.
Summary
)).
Count
();
}
if
(
totalInfo
==
0
)
{
return
ApiResult
.
Failed
(
"课后总结请至少填写一项"
);
}
}
else
{
return
ApiResult
.
Failed
(
"老师教案信息为空必须更新"
);
}
bool
flag
=
classModule
.
UpdateClassLessPlan
(
query
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
...
...
@@ -896,6 +921,7 @@ namespace Edu.WebApi.Controllers.Course
model
.
RestTime
=
endTime
.
Subtract
(
startTime
).
TotalMilliseconds
.
ToString
();
planTiemList
.
ForEach
(
x
=>
x
.
NewPlanDateTime
=
planDate
.
ClassDate
.
ToString
(
"yyyy-MM-dd"
)
+
" "
+
x
.
EndTime
);
model
.
DayTime
=
model
.
DayTime
+
"~"
+
planTiemList
.
Max
(
x
=>
Convert
.
ToDateTime
(
x
.
NewPlanDateTime
)).
ToString
(
"HH:mm"
);
model
.
ClassEndTime
=
planTiemList
.
Max
(
x
=>
Convert
.
ToDateTime
(
x
.
NewPlanDateTime
)).
ToString
(
"yyyy-MM-dd HH:mm:00"
);
}
var
lessonPlanList
=
classModule
.
GetLessonPlanListRepository
(
extModel
);
model
.
ClassId
=
extModel
.
ClassId
;
...
...
@@ -936,6 +962,9 @@ namespace Edu.WebApi.Controllers.Course
}
item
.
LessonPlanProjectsList
=
projectList
.
Where
(
x
=>
x
.
LessonPlanId
==
item
.
LessonPlanId
).
ToList
();
// item.LessonPlanProjectsList.ForEach(x => x.ProjectContentList = (string.IsNullOrWhiteSpace(x.ProjectContent) ? new List<string>() : Common.Plugin.JsonHelper.DeserializeObject<List<string>>(x.ProjectContent)));
model
.
IsEditSummary
+=
item
.
LessonPlanDetailsList
.
Where
(
x
=>
!
string
.
IsNullOrWhiteSpace
(
x
.
Summary
)).
Count
();
}
}
else
...
...
@@ -1132,9 +1161,7 @@ namespace Edu.WebApi.Controllers.Course
var
query
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
RB_Class_LessonComment_ViewModel
>(
RequestParm
.
Msg
.
ToString
());
query
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
query
.
CreateBy
=
base
.
UserInfo
.
Id
;
query
.
CreateTime
=
System
.
DateTime
.
Now
;
if
(
query
.
Score
==
0
)
{
return
ApiResult
.
Failed
(
"请选择评分"
);
...
...
@@ -1145,8 +1172,52 @@ namespace Edu.WebApi.Controllers.Course
}
bool
flag
=
classModule
.
SetLessonComment
(
query
);
if
(
flag
)
{
Common
.
Message
.
PushMessageModel
model
=
new
Common
.
Message
.
PushMessageModel
()
{
CategoryId
=
0
,
Content
=
query
.
Comment
,
CoverImg
=
""
,
CreateByName
=
base
.
UserInfo
.
AccountName
,
JumpUrl
=
$"/course/prepareclassDetails?ClassId=
{
query
.
ClassId
}
&ClassPlanId=
{
query
.
ClassPlanId
}
"
,
SendTime
=
DateTime
.
Now
,
SendType
=
0
,
Title
=
"教案评论"
,
Platform
=
2
,
ReceiveId
=
query
.
TeacherId
.
ToString
(),
};
Common
.
Message
.
MessageHelper
.
SendMessage
(
model
);
}
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
/// <summary>
/// 判断当前用户是否已评论当前教案
/// </summary>
/// <returns></returns>
public
ApiResult
GetNowUserLessonComment
()
{
var
query
=
new
RB_Class_LessonComment_ViewModel
()
{
ClassPlanId
=
base
.
ParmJObj
.
GetInt
(
"ClassPlanId"
),
ClassId
=
base
.
ParmJObj
.
GetInt
(
"ClassId"
),
};
query
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
query
.
CreateBy
=
base
.
UserInfo
.
Id
;
var
list
=
classModule
.
GetLessonCommentList
(
query
);
if
(
list
!=
null
&&
list
.
Any
())
{
return
ApiResult
.
Success
(
""
,
data
:
new
{
Score
=
-
1
});
}
else
{
return
ApiResult
.
Success
(
""
,
data
:
new
{
Score
=
5
});
}
}
#
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