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
9af20fb5
Commit
9af20fb5
authored
Mar 22, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
简易报表调整
parent
5ede0e80
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
6 deletions
+21
-6
RB_StudyAbroad_ViewModel.cs
Edu.Model/ViewModel/StudyAbroad/RB_StudyAbroad_ViewModel.cs
+4
-0
FinanceModule.cs
Edu.Module.Finance/FinanceModule.cs
+13
-5
FinanceController.cs
Edu.WebApi/Controllers/Finance/FinanceController.cs
+4
-1
No files found.
Edu.Model/ViewModel/StudyAbroad/RB_StudyAbroad_ViewModel.cs
View file @
9af20fb5
...
@@ -49,5 +49,9 @@ namespace Edu.Model.ViewModel.StudyAbroad
...
@@ -49,5 +49,9 @@ namespace Edu.Model.ViewModel.StudyAbroad
/// 审核类型(1-主管审核,2-部门负责人审核)
/// 审核类型(1-主管审核,2-部门负责人审核)
/// </summary>
/// </summary>
public
int
AuditType
{
get
;
set
;
}
public
int
AuditType
{
get
;
set
;
}
public
int
AuditState
{
get
;
set
;
}
public
int
AuditManId
{
get
;
set
;
}
}
}
}
}
Edu.Module.Finance/FinanceModule.cs
View file @
9af20fb5
...
@@ -428,10 +428,10 @@ namespace Edu.Module.Finance
...
@@ -428,10 +428,10 @@ namespace Edu.Module.Finance
//统计
//统计
var
Statistics
=
edu_RevenueReportRepository
.
GetRevenueReportStatistics
(
dmodel
);
var
Statistics
=
edu_RevenueReportRepository
.
GetRevenueReportStatistics
(
dmodel
);
if
(
count
>
0
)
{
if
(
count
>
0
)
{
Statistics
.
MaoLiRate
/=
count
;
Statistics
.
MaoLiRate
=
Math
.
Round
(
Statistics
.
MaoLiRate
/
count
,
2
,
MidpointRounding
.
AwayFromZero
)
;
Statistics
.
AverageIncome
/=
count
;
Statistics
.
AverageIncome
=
Math
.
Round
(
Statistics
.
AverageIncome
/
count
,
2
,
MidpointRounding
.
AwayFromZero
)
;
Statistics
.
AverageCost
/=
count
;
Statistics
.
AverageCost
=
Math
.
Round
(
Statistics
.
AverageCost
/
count
,
2
,
MidpointRounding
.
AwayFromZero
)
;
Statistics
.
AverageProfit
/=
count
;
Statistics
.
AverageProfit
=
Math
.
Round
(
Statistics
.
AverageProfit
/
count
,
2
,
MidpointRounding
.
AwayFromZero
)
;
}
}
list
.
Add
(
Statistics
);
list
.
Add
(
Statistics
);
return
list
;
return
list
;
...
@@ -1040,7 +1040,15 @@ namespace Edu.Module.Finance
...
@@ -1040,7 +1040,15 @@ namespace Edu.Module.Finance
public
List
<
RB_SimpleReport_Extend
>
GetEasyReportList
(
RB_SimpleReport_Extend
model
)
public
List
<
RB_SimpleReport_Extend
>
GetEasyReportList
(
RB_SimpleReport_Extend
model
)
{
{
var
list
=
edu_simpleReportRepository
.
GetList
(
model
);
var
list
=
edu_simpleReportRepository
.
GetList
(
model
);
var
clist
=
costtypeRepository
.
GetList
(
new
RB_Costtype_Extend
()
{
RB_Group_Id
=
model
.
Rb_Group_Id
});
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
()
{
});
}
foreach
(
var
item
in
list
)
foreach
(
var
item
in
list
)
{
{
if
(
item
.
Abstract
==
"工资"
)
if
(
item
.
Abstract
==
"工资"
)
...
...
Edu.WebApi/Controllers/Finance/FinanceController.cs
View file @
9af20fb5
...
@@ -720,10 +720,13 @@ namespace Edu.WebApi.Controllers.Finance
...
@@ -720,10 +720,13 @@ namespace Edu.WebApi.Controllers.Finance
string
ClassState
=
"结课"
;
string
ClassState
=
"结课"
;
if
(
item
.
ClassState
==
1
)
{
ClassState
=
"未开班"
;
}
if
(
item
.
ClassState
==
1
)
{
ClassState
=
"未开班"
;
}
else
if
(
item
.
ClassState
==
2
)
{
ClassState
=
"学习中"
;
}
else
if
(
item
.
ClassState
==
2
)
{
ClassState
=
"学习中"
;
}
if
(
item
.
Id
==
-
1
)
{
ClassState
=
""
;
}
ExcelDataSource
datarow
=
new
ExcelDataSource
()
ExcelDataSource
datarow
=
new
ExcelDataSource
()
{
{
ExcelRows
=
new
List
<
ExcelColumn
>(
30
)
{
ExcelRows
=
new
List
<
ExcelColumn
>(
30
)
{
new
ExcelColumn
(
value
:
item
.
SchoolName
){
},
new
ExcelColumn
(
value
:
item
.
Id
==
-
1
?
"合计"
:
item
.
SchoolName
){
},
new
ExcelColumn
(
value
:
item
.
ClassId
.
ToString
()){
},
new
ExcelColumn
(
value
:
item
.
ClassId
.
ToString
()){
},
new
ExcelColumn
(
value
:
item
.
ClassName
){
},
new
ExcelColumn
(
value
:
item
.
ClassName
){
},
new
ExcelColumn
(
value
:
item
.
ClassBeginsStr
){
},
new
ExcelColumn
(
value
:
item
.
ClassBeginsStr
){
},
...
...
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