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
780da62d
Commit
780da62d
authored
3 years ago
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
a74cd15e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
CustomerStudentModule.cs
Edu.Module.Customer/CustomerStudentModule.cs
+1
-1
CustomerStudentController.cs
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
+14
-14
No files found.
Edu.Module.Customer/CustomerStudentModule.cs
View file @
780da62d
...
...
@@ -84,7 +84,7 @@ namespace Edu.Module.Customer
}
if
(
oldModel
.
Remark
!=
model
.
Remark
)
{
logContent
+=
string
.
Format
(
"备注:由【{0}】=>【{1}】,
,
"
,
oldModel
.
Remark
,
model
.
Remark
);
logContent
+=
string
.
Format
(
"备注:由【{0}】=>【{1}】,"
,
oldModel
.
Remark
,
model
.
Remark
);
}
if
(
oldModel
.
Feedback
!=
model
.
Feedback
)
{
...
...
This diff is collapsed.
Click to expand it.
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
View file @
780da62d
...
...
@@ -37,13 +37,19 @@ namespace Edu.WebApi.Controllers.Customer
StuId
=
base
.
ParmJObj
.
GetInt
(
"StuId"
),
};
query
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
var
list
=
customerStudentModule
.
GetStudentAppointmentPageModule
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
rowsCount
,
query
);
foreach
(
var
item
in
list
)
var
data
=
customerStudentModule
.
GetStudentAppointmentPageModule
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
rowsCount
,
query
);
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
,
CreateTime
=
Common
.
ConvertHelper
.
FormatTimeStr2
(
item
.
CreateTime
),
CreateByName
,
});
}
pageModel
.
Count
=
rowsCount
;
pageModel
.
PageData
=
list
;
...
...
@@ -196,6 +202,8 @@ namespace Edu.WebApi.Controllers.Customer
}
list
.
Add
(
new
{
item
.
Id
,
item
.
StuId
,
item
.
SchoolName
,
item
.
ReceptionPersionName
,
item
.
Remark
,
...
...
@@ -280,15 +288,7 @@ namespace Edu.WebApi.Controllers.Customer
foreach
(
var
item
in
data
)
{
string
CreateByName
=
""
;
if
(
item
.
CreateType
>
1
)
{
CreateByName
=
UserReidsCache
.
GetUserLoginInfo
(
item
.
CreateBy
)?.
AccountName
??
""
;
}
else
{
CreateByName
=
UserReidsCache
.
GetAppletCustomerLoginInfo
(
item
.
CreateBy
)?.
CustomerName
??
""
;
}
CreateByName
=
UserReidsCache
.
GetUserLoginInfo
(
item
.
CreateBy
)?.
AccountName
??
""
;
list
.
Add
(
new
{
item
.
LogId
,
...
...
This diff is collapsed.
Click to expand it.
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