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
d10b274f
Commit
d10b274f
authored
Dec 10, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
62d718da
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
6 deletions
+18
-6
RB_Visitor_ReserveRepository.cs
Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs
+4
-0
CustomerStudentController.cs
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
+12
-5
VisitorReserveController.cs
Edu.WebApi/Controllers/Duty/VisitorReserveController.cs
+2
-1
No files found.
Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs
View file @
d10b274f
...
@@ -79,6 +79,10 @@ WHERE 1=1
...
@@ -79,6 +79,10 @@ WHERE 1=1
{
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Visitor_Reserve_Extend
.
CreateBy
),
query
.
CreateBy
);
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Visitor_Reserve_Extend
.
CreateBy
),
query
.
CreateBy
);
}
}
if
(
query
.
Visitor_Id
>
0
)
{
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Visitor_Reserve_Extend
.
Visitor_Id
),
query
.
Visitor_Id
);
}
}
}
return
GetPage
<
RB_Visitor_Reserve_Extend
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
return
GetPage
<
RB_Visitor_Reserve_Extend
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
}
}
...
...
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
View file @
d10b274f
...
@@ -135,13 +135,20 @@ namespace Edu.WebApi.Controllers.Customer
...
@@ -135,13 +135,20 @@ namespace Edu.WebApi.Controllers.Customer
StuId
=
base
.
ParmJObj
.
GetInt
(
"StuId"
),
StuId
=
base
.
ParmJObj
.
GetInt
(
"StuId"
),
};
};
query
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
query
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
var
list
=
customerStudentModule
.
GetStudentFollowPageModule
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
rowsCount
,
query
);
var
data
=
customerStudentModule
.
GetStudentFollowPageModule
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
rowsCount
,
query
);
foreach
(
var
item
in
list
)
List
<
object
>
list
=
new
List
<
object
>();
foreach
(
var
item
in
data
)
{
{
if
(
item
.
CreateBy
>
0
)
string
CreateByName
=
UserReidsCache
.
GetUserLoginInfo
(
item
.
CreateBy
)?.
AccountName
??
""
;
list
.
Add
(
new
{
{
// item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
item
.
Id
,
}
item
.
StuId
,
item
.
Remark
,
item
.
CreateBy
,
CreateTime
=
Common
.
ConvertHelper
.
FormatTimeStr2
(
item
.
CreateTime
),
CreateByName
,
});
}
}
pageModel
.
Count
=
rowsCount
;
pageModel
.
Count
=
rowsCount
;
pageModel
.
PageData
=
list
;
pageModel
.
PageData
=
list
;
...
...
Edu.WebApi/Controllers/Duty/VisitorReserveController.cs
View file @
d10b274f
...
@@ -47,7 +47,8 @@ namespace Edu.WebApi.Controllers.Duty
...
@@ -47,7 +47,8 @@ namespace Edu.WebApi.Controllers.Duty
Q_ReserveStatus
=
base
.
ParmJObj
.
GetStringValue
(
"Q_ReserveStatus"
),
Q_ReserveStatus
=
base
.
ParmJObj
.
GetStringValue
(
"Q_ReserveStatus"
),
VisitorName
=
base
.
ParmJObj
.
GetStringValue
(
"VisitorName"
),
VisitorName
=
base
.
ParmJObj
.
GetStringValue
(
"VisitorName"
),
Id
=
base
.
ParmJObj
.
GetInt
(
"Id"
),
Id
=
base
.
ParmJObj
.
GetInt
(
"Id"
),
IsQueryAll
=
base
.
ParmJObj
.
GetInt
(
"IsQueryAll"
)
IsQueryAll
=
base
.
ParmJObj
.
GetInt
(
"IsQueryAll"
),
Visitor_Id
=
base
.
ParmJObj
.
GetInt
(
"Visitor_Id"
),
};
};
if
(
query
.
IsQueryAll
!=
1
)
if
(
query
.
IsQueryAll
!=
1
)
{
{
...
...
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