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
f7f676b8
Commit
f7f676b8
authored
Feb 11, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
cfec307d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
RB_Customer_Category_Extend.cs
Edu.Model/ViewModel/Customer/RB_Customer_Category_Extend.cs
+5
-0
CustomerModule.cs
Edu.Module.Customer/CustomerModule.cs
+10
-0
B2BCustomerController.cs
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
+3
-3
No files found.
Edu.Model/ViewModel/Customer/RB_Customer_Category_Extend.cs
View file @
f7f676b8
...
...
@@ -34,5 +34,10 @@ namespace Edu.Model.ViewModel.Customer
/// 是否查询全部
/// </summary>
public
int
IsQueryAll
{
get
;
set
;
}
/// <summary>
/// 创建人
/// </summary>
public
string
CreateByName
{
get
;
set
;
}
}
}
Edu.Module.Customer/CustomerModule.cs
View file @
f7f676b8
...
...
@@ -521,6 +521,15 @@ namespace Edu.Module.Customer
if
(
list
!=
null
&&
list
.
Count
>
0
)
{
string
Ids
=
string
.
Join
(
","
,
list
.
Select
(
qitem
=>
qitem
.
CategoryId
));
string
userIds
=
string
.
Join
(
","
,
list
.
Where
(
qitem
=>
qitem
.
CreateBy
>
0
).
Select
(
qitem
=>
qitem
.
CreateBy
));
var
empList
=
new
List
<
Employee_ViewModel
>();
if
(!
string
.
IsNullOrEmpty
(
userIds
))
{
empList
=
accountRepository
.
GetEmployeeListRepository
(
new
Employee_ViewModel
()
{
QIds
=
userIds
});
}
List
<
RB_Customer_Extend
>
customerLinkList
=
new
List
<
RB_Customer_Extend
>();
List
<
RB_Customer_Extend
>
StuNumList
=
new
List
<
RB_Customer_Extend
>();
List
<
RB_Customer_Extend
>
OrderNumList
=
new
List
<
RB_Customer_Extend
>();
...
...
@@ -551,6 +560,7 @@ namespace Edu.Module.Customer
item
.
OrderCount
=
orderList
?.
Sum
(
qitem
=>
qitem
.
OrderNum
)
??
0
;
item
.
OrderSales
=
orderList
?.
Sum
(
qitem
=>
qitem
.
OrderSales
)
??
0
;
item
.
StudentCount
=
stuList
?.
Sum
(
qitem
=>
qitem
.
StuNum
)??
0
;
item
.
CreateByName
=
empList
?.
FirstOrDefault
(
qitem
=>
qitem
.
Id
==
item
.
CreateBy
)?.
EmployeeName
??
""
;
}
}
return
list
;
...
...
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
View file @
f7f676b8
...
...
@@ -923,12 +923,12 @@ namespace Edu.WebApi.Controllers.Customer
List
<
object
>
result
=
new
List
<
object
>();
foreach
(
var
item
in
list
)
{
string
CreateByName
=
UserReidsCache
.
GetUserLoginInfo
(
item
.
CreateBy
)?.
AccountName
??
""
;
result
.
Add
(
new
{
item
.
CategoryId
,
item
.
CategoryName
,
CreateByName
,
CreateByName
=
item
.
CreateByName
,
item
.
CatetoryType
,
item
.
LinkManCount
,
item
.
StudentCount
,
...
...
@@ -993,7 +993,7 @@ namespace Edu.WebApi.Controllers.Customer
new
ExcelColumn
(
item
.
StudentCount
.
ToString
()),
new
ExcelColumn
(
item
.
OrderCount
.
ToString
()),
new
ExcelColumn
(
Common
.
ConvertHelper
.
FormatTime
(
item
.
CreateTime
)),
new
ExcelColumn
(
UserReidsCache
.
GetUserLoginInfo
(
item
.
CreateBy
)?.
AccountName
??
""
),
new
ExcelColumn
(
item
.
CreateByName
),
}
};
slist
.
Add
(
dataRow
);
...
...
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