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
52edaa46
Commit
52edaa46
authored
Nov 09, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] revert add munaul datasource
parent
85dc97ea
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
1 deletion
+23
-1
ReportGeneratorImpl.java
...wc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
+23
-1
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @
52edaa46
...
@@ -122,7 +122,6 @@ public class ReportGeneratorImpl {
...
@@ -122,7 +122,6 @@ public class ReportGeneratorImpl {
List
<
PeriodCellTemplateConfig
>
periodCellTemplateConfigs
=
resources
.
getPeriodCellTemplateConfigs
().
stream
()
List
<
PeriodCellTemplateConfig
>
periodCellTemplateConfigs
=
resources
.
getPeriodCellTemplateConfigs
().
stream
()
.
filter
(
a
->
a
.
getReportTemplateId
().
equals
(
templateId
)).
collect
(
Collectors
.
toList
());
.
filter
(
a
->
a
.
getReportTemplateId
().
equals
(
templateId
)).
collect
(
Collectors
.
toList
());
//update formulablock table reportid field
//update formulablock table reportid field
List
<
Long
>
cellTemplateConfigIds
=
periodCellTemplateConfigs
.
stream
()
List
<
Long
>
cellTemplateConfigIds
=
periodCellTemplateConfigs
.
stream
()
.
map
(
PeriodCellTemplateConfig:
:
getCellTemplateId
)
.
map
(
PeriodCellTemplateConfig:
:
getCellTemplateId
)
...
@@ -287,6 +286,29 @@ public class ReportGeneratorImpl {
...
@@ -287,6 +286,29 @@ public class ReportGeneratorImpl {
cellData
.
setProjectId
(
projectId
);
cellData
.
setProjectId
(
projectId
);
cellData
.
setPeriod
(
period
);
cellData
.
setPeriod
(
period
);
if
(
periodCellTemplateConfig
.
getDataSourceType
().
intValue
()
==
FormulaDataSourceType
.
KeyInSource
.
getCode
())
{
if
(!
isMergeMunual
)
{
PeriodDataSource
dataSource
=
new
PeriodDataSource
();
dataSource
.
setId
(
distributedIdService
.
nextId
());
if
(
tempPeriodCellTemplate
.
isPresent
())
{
dataSource
.
setColumnIndex
(
tempPeriodCellTemplate
.
get
().
getColumnIndex
());
dataSource
.
setRowIndex
(
tempPeriodCellTemplate
.
get
().
getRowIndex
());
}
dataSource
.
setAmount
(
new
BigDecimal
(
"0"
));
dataSource
.
setName
(
"ManualDataSource"
);
dataSource
.
setDescription
(
"ManualDataSource"
);
dataSource
.
setCreateTime
(
new
Date
());
dataSource
.
setUpdateTime
(
new
Date
());
dataSource
.
setCreateBy
(
"Admin"
);
dataSource
.
setUpdateBy
(
"Admin"
);
dataSource
.
setPeriod
(
period
);
dataSource
.
setProjectId
(
projectId
);
dataSource
.
setCellTemplateId
(
tempPeriodCellTemplate
.
get
().
getCellTemplateId
());
dataSource
.
setType
(
FormulaDataSourceType
.
KeyInSource
.
getCode
());
periodDataSourceMapper
.
insertSelective
(
dataSource
);
}
}
//after insert celldata, insert the celldatasource for link celldata and datasource
//after insert celldata, insert the celldatasource for link celldata and datasource
PeriodDataSourceExample
dataSourceExample
=
new
PeriodDataSourceExample
();
PeriodDataSourceExample
dataSourceExample
=
new
PeriodDataSourceExample
();
...
...
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