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
9c7c862b
Commit
9c7c862b
authored
Oct 16, 2020
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
5.1清除数据 、 特殊核算sheet无合并单元格,跳过合并插入
parent
62c730d3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
performance/Performance.Services/DFExtractService.cs
+5
-2
No files found.
performance/Performance.Services/DFExtractService.cs
View file @
9c7c862b
...
...
@@ -531,6 +531,9 @@ public string AlllotExecute(string email, sys_hospital hospital, List<sys_hospit
ClearData
(
sheet
,
2
,
3
,
endCellNum
:
4
);
SupplySpecialUnit
(
sheet
,
sheetRead
,
specials
,
extracts
,
lastAllot
,
false
);
break
;
case
SheetType
.
AccountExtra
:
ClearData
(
sheet
,
2
,
3
);
break
;
}
logManage
.
ReturnTheLog
(
Allot
.
ID
,
GroupName
,
2
,
"写入数据"
,
$"sheet“
{
sheet
.
SheetName
}
”已完成数据写入"
);
}
...
...
@@ -586,8 +589,8 @@ private List<ex_result> QueryData(sys_hospitalconfig config, per_allot allot, st
CreateTime
=
CreateTime
,
}).
ToList
();
}
return
data
;
}
return
data
;
}
/// <summary>
...
...
@@ -1574,7 +1577,7 @@ private void WriteSpecialCellValue(Dictionary<string, Func<ex_special, List<im_s
int
index
=
beginrow
??
merges
.
Min
(
t
=>
t
.
FirstRow
);
for
(
int
i
=
index
;
i
<
sheet
.
LastRowNum
+
1
;
i
++)
{
if
(!
merges
.
Any
(
t
=>
i
>=
t
.
FirstRow
&&
i
<=
t
.
LastRow
))
if
(
merges
.
Count
>
0
&&
!
merges
.
Any
(
t
=>
i
>=
t
.
FirstRow
&&
i
<=
t
.
LastRow
))
{
string
value
=
""
;
var
firstrow
=
sheet
.
GetRow
(
i
);
...
...
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