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
30c19983
Commit
30c19983
authored
Aug 22, 2023
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1 甲鹤试听课调整
parent
a8994290
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
107 additions
and
92 deletions
+107
-92
TeachingRewardsModule.cs
Edu.Module.Course/TeachingRewardsModule.cs
+23
-20
FinanceModule.cs
Edu.Module.Finance/FinanceModule.cs
+84
-72
No files found.
Edu.Module.Course/TeachingRewardsModule.cs
View file @
30c19983
...
...
@@ -614,6 +614,8 @@ namespace Edu.Module.Course
if
(
stlist
.
Any
())
{
//每次试听课 算一个课时
foreach
(
var
item
in
stlist
)
{
if
(
item
.
ClassHourFee
>
0
)
{
stDateList
.
Add
(
new
RB_Teaching_BonusDetail_ViewModel
()
{
BonusId
=
bonusId
,
...
...
@@ -637,6 +639,7 @@ namespace Edu.Module.Course
});
}
}
}
#
endregion
...
...
Edu.Module.Finance/FinanceModule.cs
View file @
30c19983
...
...
@@ -3194,6 +3194,8 @@ namespace Edu.Module.Finance
decimal
ClassHourMinute
=
configModel
.
BasicMinutes
;
//课时分钟数
decimal
Hours
=
Math
.
Round
(
1
*
ClassHourMinute
/
60
,
2
,
MidpointRounding
.
AwayFromZero
);
//小时
foreach
(
var
item
in
rclist
)
{
if
(
item
.
ClassHourFee
>
0
)
{
DateList
.
Add
(
new
RB_Teaching_BonusDetail_ViewModel
{
Date
=
item
.
ClassDate
,
...
...
@@ -3213,6 +3215,7 @@ namespace Edu.Module.Finance
});
}
}
}
//查询期间 学生的上课总课时 + 合同课时单价
var
sTimeList
=
class_CheckRepository
.
GetStudentHoursList
(
groupId
,
userIds
,
startMonth
,
endMonth
);
...
...
@@ -3372,6 +3375,8 @@ namespace Edu.Module.Finance
decimal
ClassHourMinute
=
configModel
.
BasicMinutes
;
//课时分钟数
decimal
Hours
=
Math
.
Round
(
1
*
ClassHourMinute
/
60
,
2
,
MidpointRounding
.
AwayFromZero
);
//小时
foreach
(
var
item
in
rclist
)
{
if
(
item
.
ClassHourFee
>
0
)
{
DateList
.
Add
(
new
RB_Teaching_BonusDetail_ViewModel
{
...
...
@@ -3392,6 +3397,7 @@ namespace Edu.Module.Finance
});
}
}
}
DateList
=
DateList
.
OrderBy
(
x
=>
x
.
Date
).
ToList
();
...
...
@@ -3587,6 +3593,8 @@ namespace Edu.Module.Finance
decimal
ClassHourMinute
=
configModel
.
BasicMinutes
;
//课时分钟数
decimal
Hours
=
Math
.
Round
(
1
*
ClassHourMinute
/
60
,
2
,
MidpointRounding
.
AwayFromZero
);
//小时
foreach
(
var
item
in
rclist
)
{
if
(
item
.
ClassHourFee
>
0
)
{
RList
.
Add
(
new
RB_Teaching_BonusDetail_ViewModel
{
...
...
@@ -3611,6 +3619,7 @@ namespace Edu.Module.Finance
});
}
}
}
RList
=
RList
.
OrderBy
(
x
=>
x
.
Date
).
ToList
();
...
...
@@ -3740,6 +3749,8 @@ namespace Edu.Module.Finance
decimal
ClassHourMinute
=
configModel
.
BasicMinutes
;
//课时分钟数
decimal
Hours
=
Math
.
Round
(
1
*
ClassHourMinute
/
60
,
2
,
MidpointRounding
.
AwayFromZero
);
//小时
foreach
(
var
item
in
rclist
)
{
if
(
item
.
ClassHourFee
>
0
)
{
RList
.
Add
(
new
RB_Teaching_BonusDetail_ViewModel
{
...
...
@@ -3764,6 +3775,7 @@ namespace Edu.Module.Finance
});
}
}
}
RList
=
RList
.
OrderBy
(
x
=>
x
.
Date
).
ToList
();
...
...
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