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
82528a8d
Commit
82528a8d
authored
Feb 10, 2023
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二次分配满勤天数BUG修复
parent
6d9254d7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
performance/Performance.Services/RedistributionService.cs
+2
-2
No files found.
performance/Performance.Services/RedistributionService.cs
View file @
82528a8d
...
@@ -478,6 +478,7 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
...
@@ -478,6 +478,7 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
{
{
int
secondId
=
overrideMode
==
EmployeeSource
.
PrevSecondAllot
?
prevSecondAllot
.
Id
:
second
.
Id
;
int
secondId
=
overrideMode
==
EmployeeSource
.
PrevSecondAllot
?
prevSecondAllot
.
Id
:
second
.
Id
;
var
history
=
_agheadsourceRepository
.
GetEntity
(
t
=>
t
.
SecondId
==
secondId
);
var
history
=
_agheadsourceRepository
.
GetEntity
(
t
=>
t
.
SecondId
==
secondId
);
var
daysFullAttendance
=
history
?.
DaysFullAttendance
??
(
allot
.
Month
>=
1
&&
allot
.
Month
<=
12
?
DateTime
.
DaysInMonth
(
allot
.
Year
,
allot
.
Month
)
:
30
);
if
(
history
==
null
&&
prevSecondAllot
!=
null
&&
secondId
!=
prevSecondAllot
.
Id
)
if
(
history
==
null
&&
prevSecondAllot
!=
null
&&
secondId
!=
prevSecondAllot
.
Id
)
history
=
_agheadsourceRepository
.
GetEntity
(
t
=>
t
.
SecondId
==
prevSecondAllot
.
Id
);
history
=
_agheadsourceRepository
.
GetEntity
(
t
=>
t
.
SecondId
==
prevSecondAllot
.
Id
);
...
@@ -488,11 +489,10 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
...
@@ -488,11 +489,10 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
head
.
AddOrUpdate
(
nameof
(
ag_headsource
.
SeniorityTitlesAccountedPerformance
),
history
?.
SeniorityTitlesAccountedPerformance
??
titleRatio
);
head
.
AddOrUpdate
(
nameof
(
ag_headsource
.
SeniorityTitlesAccountedPerformance
),
history
?.
SeniorityTitlesAccountedPerformance
??
titleRatio
);
head
.
AddOrUpdate
(
nameof
(
ag_headsource
.
Workload_Ratio_Default
),
history
?.
Workload_Ratio_Default
??
workloadRatio
);
head
.
AddOrUpdate
(
nameof
(
ag_headsource
.
Workload_Ratio_Default
),
history
?.
Workload_Ratio_Default
??
workloadRatio
);
var
daysFullAttendance
=
allot
.
Month
>=
1
&&
allot
.
Month
<=
12
?
DateTime
.
DaysInMonth
(
allot
.
Year
,
allot
.
Month
)
:
30
;
head
.
AddOrUpdate
(
nameof
(
ag_headsource
.
DaysFullAttendance
),
daysFullAttendance
);
head
.
AddOrUpdate
(
nameof
(
ag_headsource
.
DaysFullAttendance
),
daysFullAttendance
);
// 多工作量加载
// 多工作量加载
var
status
=
(
new
int
[]
{
(
int
)
SecondAllotStatus
.
WaitReview
,
(
int
)
SecondAllotStatus
.
PassAudit
})
;
var
status
=
new
int
[]
{
(
int
)
SecondAllotStatus
.
WaitReview
,
(
int
)
SecondAllotStatus
.
PassAudit
}
;
var
headDynamic
=
_agworktypesourceRepository
.
GetEntities
(
t
=>
t
.
SecondId
==
secondId
)
??
new
List
<
ag_worktype_source
>();
var
headDynamic
=
_agworktypesourceRepository
.
GetEntities
(
t
=>
t
.
SecondId
==
secondId
)
??
new
List
<
ag_worktype_source
>();
if
(!
headDynamic
.
Any
()
&&
prevSecondAllot
!=
null
&&
secondId
!=
prevSecondAllot
.
Id
)
if
(!
headDynamic
.
Any
()
&&
prevSecondAllot
!=
null
&&
secondId
!=
prevSecondAllot
.
Id
)
...
...
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