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
9d67ccb2
Commit
9d67ccb2
authored
Jul 27, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
7a9e8275
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ActivityModule.cs
Edu.Module.Finance/ActivityModule.cs
+1
-1
RB_Activity_PeriodsDetailRepository.cs
...epository/Activity/RB_Activity_PeriodsDetailRepository.cs
+1
-1
ActivityController.cs
Edu.WebApi/Controllers/Finance/ActivityController.cs
+1
-1
No files found.
Edu.Module.Finance/ActivityModule.cs
View file @
9d67ccb2
...
@@ -300,7 +300,7 @@ namespace Edu.Module.Finance
...
@@ -300,7 +300,7 @@ namespace Edu.Module.Finance
/// </summary>
/// </summary>
/// <param name="dmodel"></param>
/// <param name="dmodel"></param>
/// <returns></returns>
/// <returns></returns>
public
decimal
Get
Sell
CommissionStatistics
(
RB_Activity_PeriodsDetail_ViewModel
dmodel
)
public
decimal
Get
Activity
CommissionStatistics
(
RB_Activity_PeriodsDetail_ViewModel
dmodel
)
{
{
return
activity_PeriodsDetailRepository
.
GetSellCommissionStatistics
(
dmodel
);
return
activity_PeriodsDetailRepository
.
GetSellCommissionStatistics
(
dmodel
);
}
}
...
...
Edu.Repository/Activity/RB_Activity_PeriodsDetailRepository.cs
View file @
9d67ccb2
...
@@ -209,7 +209,7 @@ from RB_Activity_PeriodsDetail r where {where} group by r.UserId,r.Depart_Id,r.S
...
@@ -209,7 +209,7 @@ from RB_Activity_PeriodsDetail r where {where} group by r.UserId,r.Depart_Id,r.S
where
+=
$@" and r.
{
nameof
(
RB_Activity_PeriodsDetail_ViewModel
.
DSUserName
)}
like '%
{
demodel
.
DSUserName
}
%'"
;
where
+=
$@" and r.
{
nameof
(
RB_Activity_PeriodsDetail_ViewModel
.
DSUserName
)}
like '%
{
demodel
.
DSUserName
}
%'"
;
}
}
string
sql
=
$@" select sum(r.CommissionMoney) from RB_
Sell_Commission_Details
r where
{
where
}
"
;
string
sql
=
$@" select sum(r.CommissionMoney) from RB_
Activity_PeriodsDetail
r where
{
where
}
"
;
var
obj
=
ExecuteScalar
(
sql
);
var
obj
=
ExecuteScalar
(
sql
);
return
obj
==
null
?
0
:
Convert
.
ToDecimal
(
obj
);
return
obj
==
null
?
0
:
Convert
.
ToDecimal
(
obj
);
}
}
...
...
Edu.WebApi/Controllers/Finance/ActivityController.cs
View file @
9d67ccb2
...
@@ -249,7 +249,7 @@ namespace Edu.WebApi.Controllers.Finance
...
@@ -249,7 +249,7 @@ namespace Edu.WebApi.Controllers.Finance
dmodel
.
Group_Id
=
userInfo
.
Group_Id
;
dmodel
.
Group_Id
=
userInfo
.
Group_Id
;
var
list
=
activityModule
.
GetActivityCommissionStatisticsPageList
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
count
,
dmodel
);
var
list
=
activityModule
.
GetActivityCommissionStatisticsPageList
(
pageModel
.
PageIndex
,
pageModel
.
PageSize
,
out
long
count
,
dmodel
);
decimal
TotalMoney
=
activityModule
.
Get
Sell
CommissionStatistics
(
dmodel
);
decimal
TotalMoney
=
activityModule
.
Get
Activity
CommissionStatistics
(
dmodel
);
pageModel
.
Count
=
Convert
.
ToInt32
(
count
);
pageModel
.
Count
=
Convert
.
ToInt32
(
count
);
pageModel
.
PageData
=
new
pageModel
.
PageData
=
new
{
{
...
...
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