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
b7f09dcf
Commit
b7f09dcf
authored
Sep 01, 2023
by
wyc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
管理绩效详情加载重复修复
parent
f5c84b87
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
performance/Performance.Services/ComputeService.UniteDeptDetail.cs
+7
-6
No files found.
performance/Performance.Services/ComputeService.UniteDeptDetail.cs
View file @
b7f09dcf
...
@@ -400,7 +400,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
...
@@ -400,7 +400,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
#
endregion
#
endregion
// 应用用户设置的显示规则
// 应用用户设置的显示规则
RecursionUseSettings
(
response
.
DetailItems
,
settings
,
userInfo
.
IsSecondAdmin
,
allot
);
RecursionUseSettings
(
response
.
DetailItems
,
settings
,
userInfo
.
IsSecondAdmin
,
allot
);
response
.
DetailItems
=
response
.
DetailItems
.
Where
(
w
=>
w
.
Display
).
OrderBy
(
w
=>
w
.
Sort
).
ToList
();
response
.
DetailItems
=
response
.
DetailItems
.
Where
(
w
=>
w
.
Display
).
OrderBy
(
w
=>
w
.
Sort
).
ToList
();
return
response
;
return
response
;
}
}
...
@@ -474,7 +474,8 @@ void RecursionUseSettings(List<DeptDetailItem> detailItems, List<UniteDeptDetail
...
@@ -474,7 +474,8 @@ void RecursionUseSettings(List<DeptDetailItem> detailItems, List<UniteDeptDetail
{
{
row
.
Remove
(
item
.
Title
);
row
.
Remove
(
item
.
Title
);
}
}
}
else
if
(
item
.
Display
==
UniteDept
.
DisplayRule
.
总额下发后显示
.
ToString
())
}
else
if
(
item
.
Display
==
UniteDept
.
DisplayRule
.
总额下发后显示
.
ToString
())
{
{
row
.
Remove
(
item
.
Title
);
row
.
Remove
(
item
.
Title
);
}
}
...
@@ -968,7 +969,7 @@ public List<UniteDeptDetailItem> GetEmpDetailSetting(int allotId)
...
@@ -968,7 +969,7 @@ public List<UniteDeptDetailItem> GetEmpDetailSetting(int allotId)
#
region
管理绩效
#
region
管理绩效
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
核算人数
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
核算人数
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
人均绩效
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
人均绩效
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
基础绩效系数
.
ToString
()
});
//
response.Add(new UniteDeptDetailItem { Title = ManagementDept.TitleManage.基础绩效系数.ToString() });
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
实际人均
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
实际人均
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
效率绩效人数
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
效率绩效人数
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
效率系数
.
ToString
(),
Format
=
UniteDept
.
Format
.
两位小数
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
效率系数
.
ToString
(),
Format
=
UniteDept
.
Format
.
两位小数
.
ToString
()
});
...
@@ -983,7 +984,7 @@ public List<UniteDeptDetailItem> GetEmpDetailSetting(int allotId)
...
@@ -983,7 +984,7 @@ public List<UniteDeptDetailItem> GetEmpDetailSetting(int allotId)
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
考核前绩效
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
考核前绩效
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
出勤率
.
ToString
(),
Format
=
UniteDept
.
Format
.
整数百分比
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
出勤率
.
ToString
(),
Format
=
UniteDept
.
Format
.
整数百分比
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
考核得分率
.
ToString
(),
Format
=
UniteDept
.
Format
.
整数百分比
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
考核得分率
.
ToString
(),
Format
=
UniteDept
.
Format
.
整数百分比
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
医院奖罚
.
ToString
()
});
//
response.Add(new UniteDeptDetailItem { Title = ManagementDept.TitleManage.医院奖罚.ToString() });
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
调节系数
.
ToString
(),
Format
=
UniteDept
.
Format
.
整数百分比
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
调节系数
.
ToString
(),
Format
=
UniteDept
.
Format
.
整数百分比
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
绩效合计
.
ToString
()
});
response
.
Add
(
new
UniteDeptDetailItem
{
Title
=
ManagementDept
.
TitleManage
.
绩效合计
.
ToString
()
});
#
endregion
#
endregion
...
@@ -1130,7 +1131,7 @@ public List<UniteDeptDetailResponse> EmpDetail(EmpDetailRequest request, int use
...
@@ -1130,7 +1131,7 @@ public List<UniteDeptDetailResponse> EmpDetail(EmpDetailRequest request, int use
var
ignore
=
_configuration
.
GetSection
(
"UniteDeptDetailIgnore"
).
Get
<
string
[
]>
()
??
Array
.
Empty
<
string
>();
var
ignore
=
_configuration
.
GetSection
(
"UniteDeptDetailIgnore"
).
Get
<
string
[
]>
()
??
Array
.
Empty
<
string
>();
var
persheet
=
_perforPerSheetRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
resCompute
.
AllotID
)
??
new
List
<
per_sheet
>();
var
persheet
=
_perforPerSheetRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
resCompute
.
AllotID
)
??
new
List
<
per_sheet
>();
var
headers
=
_perforImheaderRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
resCompute
.
AllotID
)
??
new
List
<
im_header
>();
var
headers
=
_perforImheaderRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
resCompute
.
AllotID
)
??
new
List
<
im_header
>();
var
basicData
=
_perforImDataRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
resCompute
.
AllotID
&&
t
.
AccountingUnit
==
resCompute
.
AccountingUnit
&&
t
.
JobNumber
==
resCompute
.
JobNumber
)
??
new
List
<
im_data
>();
var
basicData
=
_perforImDataRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
resCompute
.
AllotID
&&
t
.
AccountingUnit
==
resCompute
.
AccountingUnit
&&
t
.
JobNumber
==
resCompute
.
JobNumber
)
??
new
List
<
im_data
>();
var
employee
=
_perforImemployeeclinicRepository
.
GetEntity
(
t
=>
t
.
AllotID
==
resCompute
.
AllotID
&&
t
.
AccountingUnit
==
resCompute
.
AccountingUnit
&&
t
.
UnitType
==
resCompute
.
UnitType
&&
t
.
PersonnelNumber
==
resCompute
.
JobNumber
);
var
employee
=
_perforImemployeeclinicRepository
.
GetEntity
(
t
=>
t
.
AllotID
==
resCompute
.
AllotID
&&
t
.
AccountingUnit
==
resCompute
.
AccountingUnit
&&
t
.
UnitType
==
resCompute
.
UnitType
&&
t
.
PersonnelNumber
==
resCompute
.
JobNumber
);
...
@@ -1287,7 +1288,7 @@ public List<UniteDeptDetailResponse> EmpDetail(EmpDetailRequest request, int use
...
@@ -1287,7 +1288,7 @@ public List<UniteDeptDetailResponse> EmpDetail(EmpDetailRequest request, int use
RecursionUseSettings
(
response
.
DetailItems
,
settings
,
userInfo
.
IsSecondAdmin
,
allot
);
RecursionUseSettings
(
response
.
DetailItems
,
settings
,
userInfo
.
IsSecondAdmin
,
allot
);
response
.
DetailItems
=
response
.
DetailItems
.
Where
(
w
=>
array
.
Contains
(
w
.
Sort
)).
ToList
();
response
.
DetailItems
=
response
.
DetailItems
.
Where
(
w
=>
array
.
Contains
(
w
.
Sort
)).
ToList
();
response
.
DetailItems
=
response
.
DetailItems
.
OrderBy
(
w
=>
w
.
Sort
).
ToList
();
response
.
DetailItems
=
response
.
DetailItems
.
Where
(
w
=>
w
.
Display
).
OrderBy
(
w
=>
w
.
Sort
).
ToList
();
responses
.
Add
(
response
);
responses
.
Add
(
response
);
}
}
return
responses
;
return
responses
;
...
...
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