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
52226d1b
Commit
52226d1b
authored
Aug 02, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
a46c05c7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
RB_Order_GuestRepository.cs
Edu.Repository/Course/RB_Order_GuestRepository.cs
+1
-1
ClassController.cs
Edu.WebApi/Controllers/Course/ClassController.cs
+7
-1
OrderController.cs
Edu.WebApi/Controllers/Course/OrderController.cs
+1
-1
StuController.cs
Edu.WebApi/Controllers/Course/StuController.cs
+5
-2
No files found.
Edu.Repository/Course/RB_Order_GuestRepository.cs
View file @
52226d1b
...
...
@@ -670,7 +670,7 @@ WHERE 1=1 and A.Status=0 and class.Status=0 and class.ClassStatus <>4 and b.Or
}
if
(
demodel
.
School_Id
>
-
1
)
{
builder
.
AppendFormat
(
$@" AND
A.
{
nameof
(
RB_Order_Guest_Extend
.
School_Id
)}
=
{
demodel
.
School_Id
}
"
);
builder
.
AppendFormat
(
$@" AND
class.
{
nameof
(
RB_Class_ViewModel
.
School_Id
)}
=
{
demodel
.
School_Id
}
"
);
}
if
(
demodel
.
CourseId
>
0
)
{
...
...
Edu.WebApi/Controllers/Course/ClassController.cs
View file @
52226d1b
...
...
@@ -136,7 +136,13 @@ namespace Edu.WebApi.Controllers.Course
Teacher_Id
=
base
.
ParmJObj
.
GetInt
(
"Teacher_Id"
),
IsQuerySurplusPlan
=
base
.
ParmJObj
.
GetInt
(
"IsQuerySurplusPlan"
)
};
query
.
School_Id
=
base
.
ParmJObj
.
GetInt
(
"SchoolId"
,
-
1
);
query
.
School_Id
=
-
1
;
var
schoolId
=
base
.
ParmJObj
.
GetStringValue
(
"SchoolId"
);
if
(!
string
.
IsNullOrEmpty
(
schoolId
))
{
query
.
School_Id
=
base
.
ParmJObj
.
GetInt
(
"SchoolId"
,
-
1
);
}
query
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
var
list
=
classModule
.
GetClassListModule
(
query
);
...
...
Edu.WebApi/Controllers/Course/OrderController.cs
View file @
52226d1b
...
...
@@ -50,12 +50,12 @@ namespace Edu.WebApi.Controllers.Course
JoinStartTime
=
base
.
ParmJObj
.
GetStringValue
(
"JoinStartTime"
),
JoinEndTime
=
base
.
ParmJObj
.
GetStringValue
(
"JoinEndTime"
)
};
dmodel
.
School_Id
=
-
1
;
var
schoolId
=
base
.
ParmJObj
.
GetStringValue
(
"School_Id"
);
if
(!
string
.
IsNullOrEmpty
(
schoolId
))
{
dmodel
.
School_Id
=
base
.
ParmJObj
.
GetInt
(
"School_Id"
);
}
dmodel
.
Group_Id
=
userInfo
.
Group_Id
;
var
list
=
orderModule
.
GetClassPruductListModule
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
count
,
dmodel
);
pageModel
.
Count
=
Convert
.
ToInt32
(
count
);
...
...
Edu.WebApi/Controllers/Course/StuController.cs
View file @
52226d1b
...
...
@@ -279,10 +279,8 @@ namespace Edu.WebApi.Controllers.Course
public
ApiResult
GetAllStudentPage
()
{
var
pageModel
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
Msg
.
ToString
());
var
model
=
new
RB_Order_Guest_Extend
{
// School_Id = base.ParmJObj.GetInt("School_Id", -1),
CourseId
=
base
.
ParmJObj
.
GetInt
(
"CourseId"
,
0
),
ClassId
=
base
.
ParmJObj
.
GetInt
(
"ClassId"
,
0
),
GuestName
=
base
.
ParmJObj
.
GetStringValue
(
"GuestName"
),
...
...
@@ -293,6 +291,11 @@ namespace Edu.WebApi.Controllers.Course
EarlyWarning
=
(
Common
.
Enum
.
Course
.
GuestClassHoursEarlyWarningEnum
)
base
.
ParmJObj
.
GetInt
(
"EarlyWarning"
,
0
),
};
model
.
School_Id
=
-
1
;
var
schoolId
=
base
.
ParmJObj
.
GetStringValue
(
"School_Id"
);
if
(!
string
.
IsNullOrEmpty
(
schoolId
))
{
model
.
School_Id
=
base
.
ParmJObj
.
GetInt
(
"School_Id"
);
}
try
{
string
OrderTime
=
base
.
ParmJObj
.
GetStringValue
(
"OrderTime"
);
...
...
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