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
05dfdead
Commit
05dfdead
authored
Sep 06, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
7a323319
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
163 additions
and
44 deletions
+163
-44
ScrollClassModule.cs
Edu.Module.Course/ScrollClassModule.cs
+157
-27
ScrollController.cs
Edu.WebApi/Controllers/Course/ScrollController.cs
+4
-16
UserController.cs
Edu.WebApi/Controllers/User/UserController.cs
+2
-1
No files found.
Edu.Module.Course/ScrollClassModule.cs
View file @
05dfdead
This diff is collapsed.
Click to expand it.
Edu.WebApi/Controllers/Course/ScrollController.cs
View file @
05dfdead
...
...
@@ -291,7 +291,7 @@ namespace Edu.WebApi.Controllers.Course
string
Date
=
base
.
ParmJObj
.
GetStringValue
(
"Date"
);
//日期
int
TeacherId
=
base
.
ParmJObj
.
GetInt
(
"TeacherId"
,
0
);
//老师ID
int
courseId
=
base
.
ParmJObj
.
GetInt
(
"CourseId"
,
0
);
//课程ID
var
robj
=
scrollClassModule
.
GetCanTeacherClassTimeList
(
Date
,
TeacherId
,
courseId
,
userInfo
.
Group_Id
);
var
robj
=
scrollClassModule
.
GetCanTeacherClassTimeList
Module
(
Date
,
TeacherId
,
courseId
,
userInfo
.
Group_Id
);
return
ApiResult
.
Success
(
""
,
robj
);
}
...
...
@@ -846,7 +846,7 @@ namespace Edu.WebApi.Controllers.Course
demodel
.
CreateTime
=
DateTime
.
Now
;
demodel
.
UpdateBy
=
userInfo
.
Id
;
demodel
.
UpdateTime
=
DateTime
.
Now
;
string
msg
=
scrollClassModule
.
SetAdminScrollAppointment
_
V2
(
demodel
,
out
int
AppointId
);
string
msg
=
scrollClassModule
.
SetAdminScrollAppointment
Module
V2
(
demodel
,
out
int
AppointId
);
if
(
msg
==
""
)
{
return
ApiResult
.
Success
(
""
,
AppointId
);
...
...
@@ -878,14 +878,10 @@ namespace Edu.WebApi.Controllers.Course
Status
=
0
,
Group_Id
=
userInfo
.
Group_Id
,
CreateBy
=
userInfo
.
Id
,
UpdateBy
=
userInfo
.
Id
};
string
chooseStuListStr
=
base
.
ParmJObj
.
GetStringValue
(
"ChooseStuList"
);
List
<
RB_Scroll_Appointment_ViewModel
>
list
=
new
List
<
RB_Scroll_Appointment_ViewModel
>();
if
(!
string
.
IsNullOrEmpty
(
chooseStuListStr
))
{
JArray
jArray
=
JArray
.
Parse
(
chooseStuListStr
);
...
...
@@ -912,10 +908,7 @@ namespace Edu.WebApi.Controllers.Course
{
return
ApiResult
.
ParamIsNull
(
message
:
"请选择学员"
);
}
if
(
demodel
.
TeacherId
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递老师编号ID"
);
}
if
(
string
.
IsNullOrEmpty
(
demodel
.
ShiftSort
))
{
return
ApiResult
.
ParamIsNull
(
"请传递上课时段"
);
...
...
@@ -928,10 +921,6 @@ namespace Edu.WebApi.Controllers.Course
{
return
ApiResult
.
ParamIsNull
(
"请传递学生ID"
);
}
//if (demodel.CourseGradeId <= 0 && demodel.CourseGradeNo <= 0)
//{
// return ApiResult.ParamIsNull("请传递上课的等级");
//}
#
region
验证是否连续的时段
List
<
int
>
SortList
=
JsonHelper
.
DeserializeObject
<
List
<
int
>>(
"["
+
demodel
.
ShiftSort
+
"]"
);
...
...
@@ -947,11 +936,10 @@ namespace Edu.WebApi.Controllers.Course
}
#
endregion
string
msg
=
""
;
foreach
(
var
item
in
list
)
{
msg
+=
scrollClassModule
.
SetAdminScrollAppointment
_
V2
(
item
,
out
int
AppointId
);
msg
+=
scrollClassModule
.
SetAdminScrollAppointment
Module
V2
(
item
,
out
int
AppointId
);
}
if
(
msg
==
""
)
{
...
...
Edu.WebApi/Controllers/User/UserController.cs
View file @
05dfdead
...
...
@@ -2605,7 +2605,8 @@ namespace Edu.WebApi.Controllers.User
qitem
.
Dept_Id
,
qitem
.
DeptName
,
qitem
.
Post_Id
,
qitem
.
PostName
qitem
.
PostName
,
qitem
.
AccountId
,
}));
}
...
...
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