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
d063889a
Commit
d063889a
authored
Jul 14, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
保存后则不再设置默认值
parent
438754fa
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletions
+7
-1
performance/Performance.Services/RedistributionService.cs
+7
-1
No files found.
performance/Performance.Services/RedistributionService.cs
View file @
d063889a
...
@@ -97,6 +97,9 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
...
@@ -97,6 +97,9 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
// 先占位,更加选择加载指定范围数据
// 先占位,更加选择加载指定范围数据
// 加载方式分 保存,上次,字典,测算表
// 加载方式分 保存,上次,字典,测算表
var
loadEmployees
=
LoadEmployees
(
allot
,
second
,
overrideMode
,
out
bool
isSave
);
var
loadEmployees
=
LoadEmployees
(
allot
,
second
,
overrideMode
,
out
bool
isSave
);
// 保存后则不再设置默认值
if
(!
isSave
)
{
// 设置固定信息默认值
// 设置固定信息默认值
foreach
(
var
item
in
loadEmployees
)
foreach
(
var
item
in
loadEmployees
)
{
{
...
@@ -104,6 +107,7 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
...
@@ -104,6 +107,7 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
item
.
ActualAttendance
=
item
.
ActualAttendance
??
DateTime
.
DaysInMonth
(
allot
.
Year
,
allot
.
Month
);
// 出勤
item
.
ActualAttendance
=
item
.
ActualAttendance
??
DateTime
.
DaysInMonth
(
allot
.
Year
,
allot
.
Month
);
// 出勤
item
.
TitleCoefficient
=
item
.
TitleCoefficient
??
1
;
// 职称系数
item
.
TitleCoefficient
=
item
.
TitleCoefficient
??
1
;
// 职称系数
}
}
}
// 加载已保存工作量数据
// 加载已保存工作量数据
handson
.
Data
=
LoadWorkload
(
allot
,
second
,
loadEmployees
,
isSave
);
handson
.
Data
=
LoadWorkload
(
allot
,
second
,
loadEmployees
,
isSave
);
...
@@ -359,8 +363,10 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
...
@@ -359,8 +363,10 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
/// <summary>
/// <summary>
/// 按指定方式加载人员数据
/// 按指定方式加载人员数据
/// </summary>
/// </summary>
/// <param name="secondId"></param>
/// <param name="allot"></param>
/// <param name="second"></param>
/// <param name="mode"></param>
/// <param name="mode"></param>
/// <param name="isSave">true 保存 false 未保存</param>
/// <returns></returns>
/// <returns></returns>
private
List
<
ag_bodysource
>
LoadEmployees
(
per_allot
allot
,
ag_secondallot
second
,
EmployeeSource
mode
,
out
bool
isSave
)
private
List
<
ag_bodysource
>
LoadEmployees
(
per_allot
allot
,
ag_secondallot
second
,
EmployeeSource
mode
,
out
bool
isSave
)
{
{
...
...
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