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
3f4b013a
Commit
3f4b013a
authored
Jun 07, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增返回不公示绩效
parent
df5a481b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
41 additions
and
2 deletions
+41
-2
performance/Performance.Api/Controllers/ComputeController.cs
+1
-0
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
+11
-1
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
+5
-0
performance/Performance.DtoModels/Response/ComputeResponse.cs
+5
-0
performance/Performance.DtoModels/Response/DeptResponse.cs
+5
-1
performance/Performance.EntityModels/Other/view_per_apr_amount.cs
+14
-0
performance/Performance.Services/ComputeService.cs
+0
-0
No files found.
performance/Performance.Api/Controllers/ComputeController.cs
View file @
3f4b013a
...
@@ -305,6 +305,7 @@ public ApiResponse AllComputeByPM([FromBody] ComputerRequest request)
...
@@ -305,6 +305,7 @@ public ApiResponse AllComputeByPM([FromBody] ComputerRequest request)
AdjustLaterOtherFee
=
t
.
Sum
(
s
=>
s
.
AdjustLaterOtherFee
),
AdjustLaterOtherFee
=
t
.
Sum
(
s
=>
s
.
AdjustLaterOtherFee
),
ShouldGiveFee
=
t
.
Sum
(
s
=>
s
.
ShouldGiveFee
),
ShouldGiveFee
=
t
.
Sum
(
s
=>
s
.
ShouldGiveFee
),
OthePerfor
=
t
.
Sum
(
s
=>
s
.
OthePerfor
),
OthePerfor
=
t
.
Sum
(
s
=>
s
.
OthePerfor
),
HideOtherPerfor
=
t
.
Sum
(
s
=>
s
.
HideOtherPerfor
),
NightWorkPerfor
=
t
.
Sum
(
s
=>
s
.
NightWorkPerfor
),
NightWorkPerfor
=
t
.
Sum
(
s
=>
s
.
NightWorkPerfor
),
RealGiveFee
=
t
.
Sum
(
s
=>
s
.
RealGiveFee
),
RealGiveFee
=
t
.
Sum
(
s
=>
s
.
RealGiveFee
),
ReservedRatio
=
t
.
Sum
(
s
=>
s
.
ReservedRatio
),
ReservedRatio
=
t
.
Sum
(
s
=>
s
.
ReservedRatio
),
...
...
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
View file @
3f4b013a
...
@@ -2900,6 +2900,11 @@
...
@@ -2900,6 +2900,11 @@
医院其他绩效
医院其他绩效
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.DtoModels.ComputeResponse.HideOtherPerfor"
>
<summary>
不公示其他绩效
</summary>
</member>
<member
name=
"P:Performance.DtoModels.ComputeResponse.NightWorkPerfor"
>
<member
name=
"P:Performance.DtoModels.ComputeResponse.NightWorkPerfor"
>
<summary>
<summary>
夜班费
夜班费
...
@@ -3186,7 +3191,12 @@
...
@@ -3186,7 +3191,12 @@
</member>
</member>
<member
name=
"P:Performance.DtoModels.DeptResponse.AprPerforAmount"
>
<member
name=
"P:Performance.DtoModels.DeptResponse.AprPerforAmount"
>
<summary>
<summary>
其他绩效
医院其他绩效
</summary>
</member>
<member
name=
"P:Performance.DtoModels.DeptResponse.HideAprOtherPerforAmount"
>
<summary>
不公示其他绩效
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.DtoModels.DirectorResponse.TypeName"
>
<member
name=
"P:Performance.DtoModels.DirectorResponse.TypeName"
>
...
...
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
View file @
3f4b013a
...
@@ -7444,6 +7444,11 @@
...
@@ -7444,6 +7444,11 @@
核算单元
核算单元
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.EntityModels.view_per_total_amount.PersonnelNumber"
>
<summary>
工号
</summary>
</member>
<member
name=
"P:Performance.EntityModels.view_per_total_amount.Amount"
>
<member
name=
"P:Performance.EntityModels.view_per_total_amount.Amount"
>
<summary>
<summary>
医院其他绩效
医院其他绩效
...
...
performance/Performance.DtoModels/Response/ComputeResponse.cs
View file @
3f4b013a
...
@@ -65,6 +65,11 @@ public ComputeResponse(string source, string accountingUnit, string employeeName
...
@@ -65,6 +65,11 @@ public ComputeResponse(string source, string accountingUnit, string employeeName
public
Nullable
<
decimal
>
OthePerfor
{
get
;
set
;
}
public
Nullable
<
decimal
>
OthePerfor
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 不公示其他绩效
/// </summary>
public
Nullable
<
decimal
>
HideOtherPerfor
{
get
;
set
;
}
/// <summary>
/// 夜班费
/// 夜班费
/// </summary>
/// </summary>
public
Nullable
<
decimal
>
NightWorkPerfor
{
get
;
set
;
}
public
Nullable
<
decimal
>
NightWorkPerfor
{
get
;
set
;
}
...
...
performance/Performance.DtoModels/Response/DeptResponse.cs
View file @
3f4b013a
...
@@ -174,8 +174,12 @@ public class DeptResponse
...
@@ -174,8 +174,12 @@ public class DeptResponse
public
Nullable
<
decimal
>
AssessLaterManagementFee
{
get
;
set
;
}
public
Nullable
<
decimal
>
AssessLaterManagementFee
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 其他绩效
///
医院
其他绩效
/// </summary>
/// </summary>
public
Nullable
<
decimal
>
AprPerforAmount
{
get
;
set
;
}
public
Nullable
<
decimal
>
AprPerforAmount
{
get
;
set
;
}
/// <summary>
/// 不公示其他绩效
/// </summary>
public
Nullable
<
decimal
>
HideAprOtherPerforAmount
{
get
;
set
;
}
}
}
}
}
performance/Performance.EntityModels/Other/view_per_apr_amount.cs
View file @
3f4b013a
...
@@ -13,6 +13,17 @@ public class view_per_apr_amount : per_apr_amount
...
@@ -13,6 +13,17 @@ public class view_per_apr_amount : per_apr_amount
}
}
public
class
view_per_total_amount
public
class
view_per_total_amount
{
{
public
view_per_total_amount
()
{
}
public
view_per_total_amount
(
string
unitType
,
string
accountingUnit
,
string
personnelNumber
,
decimal
amount
,
bool
use
=
false
)
{
UnitType
=
unitType
;
AccountingUnit
=
accountingUnit
;
PersonnelNumber
=
personnelNumber
;
Amount
=
amount
;
Use
=
use
;
}
/// <summary>
/// <summary>
/// 核算单元组别
/// 核算单元组别
/// </summary>
/// </summary>
...
@@ -21,6 +32,9 @@ public class view_per_total_amount
...
@@ -21,6 +32,9 @@ public class view_per_total_amount
/// 核算单元
/// 核算单元
/// </summary>
/// </summary>
public
string
AccountingUnit
{
get
;
set
;
}
public
string
AccountingUnit
{
get
;
set
;
}
/// <summary>
/// 工号
/// </summary>
public
string
PersonnelNumber
{
get
;
set
;
}
public
string
PersonnelNumber
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 医院其他绩效
/// 医院其他绩效
...
...
performance/Performance.Services/ComputeService.cs
View file @
3f4b013a
This diff is collapsed.
Click to expand it.
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