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
0e43e273
Commit
0e43e273
authored
Mar 17, 2021
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
特殊核算单元新增合并列
parent
388ed038
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletions
+12
-1
performance/Performance.Services/ExtractExcelService/ExtractDtos/SpecialUnitColumns.cs
+4
-0
performance/Performance.Services/ExtractExcelService/SheetDataWrite/SpecialUnitDataWrite.cs
+8
-1
No files found.
performance/Performance.Services/ExtractExcelService/ExtractDtos/SpecialUnitColumns.cs
View file @
0e43e273
...
...
@@ -17,5 +17,9 @@ public class SpecialUnitColumns
public
const
string
TargetFactor
=
"量化指标绩效分值"
;
public
const
string
AdjustFactor
=
"调节系数"
;
public
const
string
AssessBefore
=
"考核前绩效"
;
public
const
string
Avg
=
"人均"
;
}
}
performance/Performance.Services/ExtractExcelService/SheetDataWrite/SpecialUnitDataWrite.cs
View file @
0e43e273
...
...
@@ -320,7 +320,14 @@ private void AddMergedRegion(ISheet sheet, List<SpecialCellRange> ranges, List<s
if
(
columns
==
null
||
!
columns
.
Any
())
return
;
if
(
ranges
==
null
||
!
ranges
.
Any
())
return
;
var
columnIndexs
=
new
string
[]
{
SpecialUnitColumns
.
Department
,
SpecialUnitColumns
.
PeopleNumber
,
SpecialUnitColumns
.
AdjustFactor
}.
Select
(
t
=>
columns
.
IndexOf
(
t
));
var
columnIndexs
=
new
string
[]
{
SpecialUnitColumns
.
Department
,
SpecialUnitColumns
.
PeopleNumber
,
SpecialUnitColumns
.
AdjustFactor
,
SpecialUnitColumns
.
AssessBefore
,
SpecialUnitColumns
.
Avg
}.
Select
(
t
=>
columns
.
IndexOf
(
t
));
if
(
columnIndexs
==
null
||
!
columnIndexs
.
Any
(
t
=>
t
>
-
1
))
return
;
foreach
(
var
index
in
columnIndexs
.
Where
(
t
=>
t
>
-
1
))
...
...
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