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
9381f831
Commit
9381f831
authored
Oct 31, 2018
by
sherlock
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock
parents
10a6241f
9dbb14aa
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
TemplateGroupServiceImpl.java
...c/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
+2
-2
DataSourceExtendsMapper.xml
.../taxtech/atms/vat/dao/extends/DataSourceExtendsMapper.xml
+1
-1
PeriodDataSourceExtendsMapper.xml
...ch/atms/vat/dao/extends/PeriodDataSourceExtendsMapper.xml
+1
-1
No files found.
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
View file @
9381f831
...
...
@@ -310,7 +310,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
Workbook
workbook
=
WorkbookFactory
.
create
(
inputStream
);
List
<
Template
>
filePathList
=
Lists
.
newArrayList
();
Date
now
=
new
Date
();
for
(
int
i
=
0
;
i
<
=
workbook
.
getNumberOfSheets
();
i
++)
{
for
(
int
i
=
0
;
i
<
workbook
.
getNumberOfSheets
();
i
++)
{
String
sheetName
=
workbook
.
getSheetName
(
i
);
String
newName
=
sheetName
+
CommonUtils
.
getUUID
()
+
POIUtil
.
getFileSuffix
(
fileName
).
get
();
Sheet
sheet
=
workbook
.
getSheetAt
(
i
);
...
...
@@ -338,7 +338,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
templateMapper
.
insertSelective
(
template
);
List
<
CellTemplate
>
cellTemplateList
=
Lists
.
newArrayList
();
List
<
CellTemplateConfig
>
cellTemplateConfigList
=
Lists
.
newArrayList
();
for
(
int
r
=
sheet
.
getFirstRowNum
();
i
<=
sheet
.
getLastRowNum
();
i
++)
{
for
(
int
r
=
sheet
.
getFirstRowNum
();
r
<=
sheet
.
getLastRowNum
();
r
++)
{
Row
row
=
sheet
.
getRow
(
r
);
for
(
int
c
=
row
.
getFirstCellNum
();
c
<=
row
.
getLastCellNum
();
c
++)
{
Cell
cell
=
row
.
getCell
(
c
);
...
...
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/DataSourceExtendsMapper.xml
View file @
9381f831
...
...
@@ -251,7 +251,7 @@
SELECT
CDS.CELL_DATA_ID,
DS.ID,
DS.T
_Y_P_
E,
DS.T
YP
E,
DS.NAME,
DS.AMOUNT,
DS.DESCRIPTION,
...
...
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodDataSourceExtendsMapper.xml
View file @
9381f831
...
...
@@ -279,7 +279,7 @@
SELECT
CDS.CELL_DATA_ID,
DS.ID,
DS.T
_Y_P_
E,
DS.T
YP
E,
DS.NAME,
DS.AMOUNT,
DS.DESCRIPTION,
...
...
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