Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
148ac0e2
Commit
148ac0e2
authored
Apr 28, 2020
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加字段确定预算年限
parent
903d85ac
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
11 deletions
+26
-11
performance/Performance.Api/Controllers/BudgetController.cs
+4
-3
performance/Performance.EntityModels/Entity/per_budget_amount.cs
+6
-1
performance/Performance.EntityModels/Entity/per_budget_ratio.cs
+6
-1
performance/Performance.Services/BudgetService.cs
+10
-6
No files found.
performance/Performance.Api/Controllers/BudgetController.cs
View file @
148ac0e2
...
...
@@ -42,14 +42,15 @@ public ApiResponse<List<BudgetResponse>> Query([FromBody]BudgetRequest request)
/// <summary>
/// 保存预算管理数据
/// </summary>
/// <param name="mainYear"></param>
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
[
Route
(
"save"
)]
public
ApiResponse
Save
([
FromBody
]
List
<
BudgetResponse
>
request
)
[
Route
(
"save
/{mainYear}
"
)]
public
ApiResponse
Save
(
int
mainYear
,
[
FromBody
]
List
<
BudgetResponse
>
request
)
{
var
userId
=
claim
.
GetUserId
();
var
result
=
budgetService
.
SaveBudgetData
(
request
,
userId
);
var
result
=
budgetService
.
SaveBudgetData
(
mainYear
,
request
,
userId
);
return
result
?
new
ApiResponse
(
ResponseType
.
OK
,
"保存成功"
)
:
new
ApiResponse
(
ResponseType
.
Fail
,
"保存失败"
);
}
...
...
performance/Performance.EntityModels/Entity/per_budget_amount.cs
View file @
148ac0e2
...
...
@@ -27,7 +27,12 @@ public class per_budget_amount
public
int
HospitalId
{
get
;
set
;
}
/// <summary>
///
/// 根据该年份测算下一年
/// </summary>
public
int
MainYear
{
get
;
set
;
}
/// <summary>
/// 实际年份、预算年份
/// </summary>
public
int
Year
{
get
;
set
;
}
...
...
performance/Performance.EntityModels/Entity/per_budget_ratio.cs
View file @
148ac0e2
...
...
@@ -27,7 +27,12 @@ public class per_budget_ratio
public
int
HospitalId
{
get
;
set
;
}
/// <summary>
///
/// 根据该年份测算下一年
/// </summary>
public
int
MainYear
{
get
;
set
;
}
/// <summary>
/// 实际年份、预算年份
/// </summary>
public
int
Year
{
get
;
set
;
}
...
...
performance/Performance.Services/BudgetService.cs
View file @
148ac0e2
...
...
@@ -37,9 +37,8 @@ public class BudgetService : IAutoInjection
/// <returns></returns>
public
List
<
BudgetResponse
>
QueryBudgetByYear
(
int
hospitalid
,
int
year
)
{
var
nextYear
=
year
+
1
;
var
amounts
=
perbudgetamountRepository
.
GetEntities
(
t
=>
t
.
HospitalId
==
hospitalid
&&
new
List
<
int
>
{
year
,
nextYear
}.
Contains
(
t
.
Year
));
var
ratios
=
perbudgetratioRepository
.
GetEntities
(
t
=>
t
.
HospitalId
==
hospitalid
&&
new
List
<
int
>
{
year
,
nextYear
}.
Contains
(
t
.
Year
));
var
amounts
=
perbudgetamountRepository
.
GetEntities
(
t
=>
t
.
HospitalId
==
hospitalid
&&
t
.
MainYear
==
year
);
var
ratios
=
perbudgetratioRepository
.
GetEntities
(
t
=>
t
.
HospitalId
==
hospitalid
&&
t
.
MainYear
==
year
);
var
result
=
Mapper
.
Map
<
List
<
BudgetResponse
>>(
amounts
);
if
(
result
==
null
)
return
Mapper
.
Map
<
List
<
BudgetResponse
>>(
ratios
);
...
...
@@ -56,14 +55,19 @@ public List<BudgetResponse> QueryBudgetByYear(int hospitalid, int year)
/// <param name="request"></param>
/// <param name="userId"></param>
/// <returns></returns>
public
bool
SaveBudgetData
(
List
<
BudgetResponse
>
request
,
int
userId
)
public
bool
SaveBudgetData
(
int
mainYear
,
List
<
BudgetResponse
>
request
,
int
userId
)
{
if
(
request
==
null
||
!
request
.
Any
(
t
=>
t
.
Type
==
1
)
||
!
request
.
Any
(
t
=>
t
.
Type
==
2
))
throw
new
PerformanceException
(
"提交数据中含无效数据"
);
var
entity
=
perbudgetamountRepository
.
GetEntities
(
w
=>
w
.
HospitalId
==
request
.
First
().
HospitalId
&&
w
.
MainYear
==
mainYear
);
if
(
entity
!=
null
&&
entity
.
Any
())
throw
new
PerformanceException
(
$"
{
mainYear
}
年数据已存在"
);
var
amounts
=
Mapper
.
Map
<
List
<
per_budget_amount
>>(
request
.
Where
(
t
=>
t
.
Type
==
1
));
amounts
.
ForEach
(
t
=>
{
t
.
MainYear
=
mainYear
;
t
.
CreateTime
=
DateTime
.
Now
;
t
.
CreateUser
=
userId
;
});
...
...
@@ -72,6 +76,7 @@ public bool SaveBudgetData(List<BudgetResponse> request, int userId)
var
ratios
=
Mapper
.
Map
<
List
<
per_budget_ratio
>>(
request
.
Where
(
t
=>
t
.
Type
==
2
));
ratios
.
ForEach
(
t
=>
{
t
.
MainYear
=
mainYear
;
t
.
CreateTime
=
DateTime
.
Now
;
t
.
CreateUser
=
userId
;
});
...
...
@@ -174,8 +179,7 @@ public List<per_budget_result> QueryResultByYear(int hospitalid, int year)
/// <returns></returns>
public
List
<
BudgetRatioResponse
>
QueryBudgetRatio
(
int
hospitalid
,
int
year
)
{
var
nextYear
=
year
+
1
;
var
ratios
=
perbudgetratioRepository
.
GetEntities
(
t
=>
t
.
HospitalId
==
hospitalid
&&
new
List
<
int
>
{
year
,
nextYear
}.
Contains
(
t
.
Year
));
var
ratios
=
perbudgetratioRepository
.
GetEntities
(
t
=>
t
.
HospitalId
==
hospitalid
&&
t
.
MainYear
==
year
);
if
(
ratios
!=
null
&&
ratios
.
Any
())
{
...
...
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