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
cf452582
Commit
cf452582
authored
Oct 23, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
微调
parent
6f8372ce
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
performance/Performance.Api/Controllers/CollectController.cs
+1
-1
performance/Performance.Services/PerExcelService/ExcelReadConfig.cs
+1
-1
No files found.
performance/Performance.Api/Controllers/CollectController.cs
View file @
cf452582
...
...
@@ -71,7 +71,7 @@ public ApiResponse GetCollectSheet(int hospitalId)
var
regex
=
new
Regex
(
"^[0-9]"
);
var
userId
=
claim
.
GetUserId
();
var
result
=
collectService
.
GetCollectSheet
(
hospitalId
,
userId
)
.
Where
(
w
=>
!
collectService
.
retain
.
Contains
(
w
.
HeadName
))
?
.
Where
(
w
=>
!
collectService
.
retain
.
Contains
(
w
.
HeadName
))
?.
Select
(
w
=>
new
{
w
.
SheetType
,
w
.
SheetName
})
.
Distinct
()
.
ToList
();
...
...
performance/Performance.Services/PerExcelService/ExcelReadConfig.cs
View file @
cf452582
...
...
@@ -68,7 +68,7 @@ public class ExcelReadConfig
new
ColumnInfo
(
nameof
(
PerDataLogisticsEmployee
.
PostCoefficient
),
"岗位系数"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataLogisticsEmployee
.
Attendance
),
"出勤率"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataLogisticsEmployee
.
OthePerfor
),
"其他绩效"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataLogisticsEmployee
.
AdjustLaterOtherFee
),
"调节后其他绩效"
,
true
),
//
new ColumnInfo(nameof(PerDataLogisticsEmployee.AdjustLaterOtherFee), "调节后其他绩效", true),
};
public
static
ColumnInfo
[]
AccountBaisc
{
get
;
set
;
}
=
new
ColumnInfo
[]
...
...
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