Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
7c02aa53
Commit
7c02aa53
authored
Apr 17, 2019
by
kevin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_mysql' of
https://gitee.com/Memorydoc/atms
into dev_mysql
parents
93233248
bc4a9981
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
ReportServiceImpl.java
.../pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
+3
-3
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @
7c02aa53
...
...
@@ -2602,7 +2602,7 @@ public class ReportServiceImpl extends BaseService {
ebitCellData1
.
setCreateTime
(
new
Date
());
ebitCellData1
.
setCol
(
k
);
ebitCellData1
.
setRow
(
j
);
ebitCellData1
.
setData
(
getCellStringValue
(
sheet
.
getRow
(
j
).
getCell
(
k
))
.
equals
(
""
)
==
true
?
"0"
:
getCellStringValue
(
sheet
.
getRow
(
j
).
getCell
(
k
))
);
ebitCellData1
.
setData
(
getCellStringValue
(
sheet
.
getRow
(
j
).
getCell
(
k
)));
ebitCellDataList
.
add
(
ebitCellData1
);
}
//这里只保存两列{}
}
...
...
@@ -2775,9 +2775,9 @@ public class ReportServiceImpl extends BaseService {
for
(
EbitCellData
ebitCellData
:
entry
.
getValue
())
{
if
(
m
==
ebitCellData
.
getRow
())
{
try
{
sheetAt
.
getRow
(
m
).
getCell
(
_index
+
1
).
setCellValue
(
ebitCellData
.
getData
());
sheetAt
.
getRow
(
m
).
getCell
(
_index
+
1
).
setCellValue
(
ebitCellData
.
getData
()
.
equals
(
""
)==
true
?
"0"
:
ebitCellData
.
getData
()
);
}
catch
(
Exception
e
)
{
sheetAt
.
getRow
(
m
).
createCell
(
_index
+
1
).
setCellValue
(
ebitCellData
.
getData
());
sheetAt
.
getRow
(
m
).
createCell
(
_index
+
1
).
setCellValue
(
ebitCellData
.
getData
()
.
equals
(
""
)==
true
?
"0"
:
ebitCellData
.
getData
()
);
}
}
}
...
...
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