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
5befc369
Commit
5befc369
authored
Mar 22, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
9af20fb5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
10 deletions
+22
-10
RB_Course_Preferential.cs
Edu.Model/Entity/Course/RB_Course_Preferential.cs
+10
-0
RB_StudyaBroad_Preferential.cs
Edu.Model/Entity/StudyAbroad/RB_StudyaBroad_Preferential.cs
+11
-1
FinanceModule.cs
Edu.Module.Finance/FinanceModule.cs
+1
-9
No files found.
Edu.Model/Entity/Course/RB_Course_Preferential.cs
View file @
5befc369
...
...
@@ -106,5 +106,15 @@ namespace Edu.Model.Entity.Course
/// 状态
/// </summary>
public
DateStateEnum
Status
{
get
;
set
;
}
/// <summary>
/// 教育返佣类型(0-百分比,1-固定金额)
/// </summary>
public
int
EduCommissionType
{
get
;
set
;
}
/// <summary>
/// 教育同行佣金
/// </summary>
public
decimal
EduCommissionMoney
{
get
;
set
;
}
}
}
Edu.Model/Entity/StudyAbroad/RB_StudyaBroad_Preferential.cs
View file @
5befc369
...
...
@@ -108,5 +108,15 @@ namespace Edu.Model.Entity.StudyAbroad
/// 状态
/// </summary>
public
DateStateEnum
Status
{
get
;
set
;
}
}
/// <summary>
/// 教育返佣类型(0-百分比,1-固定金额)
/// </summary>
public
int
EduCommissionType
{
get
;
set
;
}
/// <summary>
/// 教育同行佣金
/// </summary>
public
decimal
EduCommissionMoney
{
get
;
set
;
}
}
}
Edu.Module.Finance/FinanceModule.cs
View file @
5befc369
...
...
@@ -1040,15 +1040,7 @@ namespace Edu.Module.Finance
public
List
<
RB_SimpleReport_Extend
>
GetEasyReportList
(
RB_SimpleReport_Extend
model
)
{
var
list
=
edu_simpleReportRepository
.
GetList
(
model
);
var
clist
=
new
List
<
RB_Costtype_Extend
>();
if
(
model
.
Year
>
2021
)
{
clist
=
costtypeRepository
.
GetList
(
new
RB_Costtype_Extend
()
{
RB_Group_Id
=
model
.
Rb_Group_Id
});
}
else
{
clist
=
costtypeRepository
.
GetList
(
new
RB_Costtype_Extend
()
{
});
}
var
clist
=
costtypeRepository
.
GetList
(
new
RB_Costtype_Extend
()
{
RB_Group_Id
=
model
.
Rb_Group_Id
});
foreach
(
var
item
in
list
)
{
if
(
item
.
Abstract
==
"工资"
)
...
...
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