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
be536d3f
Commit
be536d3f
authored
Mar 24, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
在行政科室计算时行政工勤后勤适配
parent
1f5649ee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
1 deletions
+30
-1
performance/Performance.Services/AllotCompute/ProcessComputService.cs
+1
-1
performance/Performance.Services/UnitTypeUtil.cs
+29
-0
No files found.
performance/Performance.Services/AllotCompute/ProcessComputService.cs
View file @
be536d3f
...
...
@@ -381,7 +381,7 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
dept
.
Income
=
empolyees
.
Sum
(
w
=>
w
.
PerforTotal
??
0
);
dept
.
NeedSecondAllot
=
empolyees
.
Any
(
w
=>
w
.
NeedSecondAllot
==
"是"
)
?
"是"
:
"否"
;
if
(
resAccount
?.
UnitType
==
UnitType
.
行政后勤
.
ToString
(
)
&&
resAccount
?.
NeedSecondAllot
==
"是"
)
if
(
UnitTypeUtil
.
IsOffice
(
resAccount
?.
UnitType
)
&&
resAccount
?.
NeedSecondAllot
==
"是"
)
{
dept
.
ScoringAverage
=
resAccount
?.
ScoringAverage
==
null
?
0
:
resAccount
.
ScoringAverage
;
dept
.
AdjustFactor
=
(
isBudget
?
adjust
:
resAccount
?.
AdjustFactor
)
??
1
;
...
...
performance/Performance.Services/UnitTypeUtil.cs
0 → 100644
View file @
be536d3f
using
Performance.DtoModels
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Performance.Services
{
public
class
UnitTypeUtil
{
/// <summary>
/// 是否是行政后勤/工勤
/// </summary>
/// <param name="unit"></param>
/// <returns></returns>
public
static
bool
IsOffice
(
int
unit
)
{
return
unit
==
(
int
)
UnitType
.
行政后勤
;
}
/// <summary>
/// 是否是行政后勤/工勤
/// </summary>
/// <param name="unit"></param>
/// <returns></returns>
public
static
bool
IsOffice
(
string
unit
)
{
return
!
string
.
IsNullOrEmpty
(
unit
)
&&
(
unit
==
"行政后勤"
||
unit
==
"行政工勤"
);
}
}
}
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