Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
e7b24ac1
Commit
e7b24ac1
authored
Apr 30, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'MVP1.6.3' into develop
parents
948118f5
5f274b0b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+8
-8
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
e7b24ac1
...
...
@@ -218,13 +218,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
dataRow
=
0
;
dataRowFlag
=
true
;
idCardNullNum
=
0
;
// 循环当前sheet的每行内容
if
(
Common
.
isNotNull
(
maxColumn
))
{
rowLastCellNum
=
maxColumn
;
}
else
{
rowLastCellNum
=
sheetAt
.
getLastRowNum
();
}
for
(
int
rowNum
=
0
;
rowNum
<=
rowLastCellNum
;
rowNum
++)
{
for
(
int
rowNum
=
0
;
rowNum
<=
sheetAt
.
getLastRowNum
();
rowNum
++)
{
nullColumn
=
-
1
;
preNullColumn
=
-
1
;
...
...
@@ -236,7 +230,13 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
columnList
=
new
ArrayList
<>();
row
=
sheetAt
.
getRow
(
rowNum
);
if
(
row
!=
null
)
{
for
(
int
cellNum
=
0
;
cellNum
<
row
.
getLastCellNum
();
cellNum
++)
{
// 循环当前sheet的每行内容
if
(
Common
.
isNotNull
(
maxColumn
))
{
rowLastCellNum
=
maxColumn
;
}
else
{
rowLastCellNum
=
row
.
getLastCellNum
();
}
for
(
int
cellNum
=
0
;
cellNum
<
rowLastCellNum
;
cellNum
++)
{
columnVo
=
new
ExcelColumnVo
();
try
{
cell
=
row
.
getCell
(
cellNum
);
...
...
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