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
1c2f87a7
Commit
1c2f87a7
authored
Feb 22, 2021
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二次绩效其他模板添加字段管理津贴,单项奖励,重点专科分配
parent
808bb028
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
1 deletions
+19
-1
performance/Performance.EntityModels/Entity/ag_othersource.cs
+16
-1
performance/Performance.Services/SecondAllotService.cs
+3
-0
No files found.
performance/Performance.EntityModels/Entity/ag_othersource.cs
View file @
1c2f87a7
...
@@ -57,7 +57,7 @@ public class ag_othersource
...
@@ -57,7 +57,7 @@ public class ag_othersource
public
Nullable
<
decimal
>
WorkPerformance
{
get
;
set
;
}
public
Nullable
<
decimal
>
WorkPerformance
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 科室单项奖励
/// 科室单项奖励
(只读)
/// </summary>
/// </summary>
public
Nullable
<
decimal
>
DeptReward
{
get
;
set
;
}
public
Nullable
<
decimal
>
DeptReward
{
get
;
set
;
}
...
@@ -90,5 +90,20 @@ public class ag_othersource
...
@@ -90,5 +90,20 @@ public class ag_othersource
/// 预留金额
/// 预留金额
/// </summary>
/// </summary>
public
Nullable
<
decimal
>
ReservedAmount
{
get
;
set
;
}
public
Nullable
<
decimal
>
ReservedAmount
{
get
;
set
;
}
/// <summary>
/// 管理津贴
/// </summary>
public
Nullable
<
decimal
>
ManagementAllowance
{
get
;
set
;
}
/// <summary>
/// 单项奖励
/// </summary>
public
Nullable
<
decimal
>
IndividualReward
{
get
;
set
;
}
/// <summary>
/// 重点专科分配
/// </summary>
public
Nullable
<
decimal
>
AllocationOfKeySpecialty
{
get
;
set
;
}
}
}
}
}
performance/Performance.Services/SecondAllotService.cs
View file @
1c2f87a7
...
@@ -1671,6 +1671,9 @@ public List<ag_othersource> OtherSave(int secondId, List<ag_othersource> request
...
@@ -1671,6 +1671,9 @@ public List<ag_othersource> OtherSave(int secondId, List<ag_othersource> request
existEntities
.
First
(
t
=>
t
.
Id
==
item
.
Id
).
OtherPerformance
=
item
.
OtherPerformance
;
existEntities
.
First
(
t
=>
t
.
Id
==
item
.
Id
).
OtherPerformance
=
item
.
OtherPerformance
;
existEntities
.
First
(
t
=>
t
.
Id
==
item
.
Id
).
NightWorkPerformance
=
item
.
NightWorkPerformance
;
existEntities
.
First
(
t
=>
t
.
Id
==
item
.
Id
).
NightWorkPerformance
=
item
.
NightWorkPerformance
;
existEntities
.
First
(
t
=>
t
.
Id
==
item
.
Id
).
RealAmount
=
item
.
RealAmount
;
existEntities
.
First
(
t
=>
t
.
Id
==
item
.
Id
).
RealAmount
=
item
.
RealAmount
;
existEntities
.
First
(
t
=>
t
.
Id
==
item
.
Id
).
ManagementAllowance
=
item
.
ManagementAllowance
;
existEntities
.
First
(
t
=>
t
.
Id
==
item
.
Id
).
IndividualReward
=
item
.
IndividualReward
;
existEntities
.
First
(
t
=>
t
.
Id
==
item
.
Id
).
AllocationOfKeySpecialty
=
item
.
AllocationOfKeySpecialty
;
}
}
perforAgothersourceRepository
.
UpdateRange
(
existEntities
.
ToArray
());
perforAgothersourceRepository
.
UpdateRange
(
existEntities
.
ToArray
());
...
...
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