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
15731d2b
Commit
15731d2b
authored
Oct 02, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] add project and preirod
parent
99c01c41
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
ReportGeneratorImpl.java
...wc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
+2
-0
ReportServiceImpl.java
.../pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
+1
-1
No files found.
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @
15731d2b
...
...
@@ -417,6 +417,8 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
cellDataSource
.
setDataSourceId
(
dataSource
.
getId
());
cellDataSource
.
setCreateTime
(
createTime
);
cellDataSource
.
setUpdateTime
(
createTime
);
cellDataSource
.
setPeriod
(
period
);
cellDataSource
.
setProjectId
(
projectId
);
SpringContextUtil
.
periodCellDataSourceMapper
.
insertSelective
(
cellDataSource
);
}
}
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @
15731d2b
...
...
@@ -880,7 +880,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
for
(
PeriodCellData
cellData
:
cellDataList
)
{
if
(
cellData
.
getId
()
!=
data
.
getCellId
()
&&
cellData
.
getFormulaExp
().
contains
(
cellName
))
{
PeriodCellDataSourceExample
cellDataSourceExample
=
new
PeriodCellDataSourceExample
();
cellDataSourceExample
.
createCriteria
().
andCellDataIdEqualTo
(
cellData
.
getId
()).
andCellTemplateIdEqualTo
(
cellData
.
getCellTemplateId
());
cellDataSourceExample
.
createCriteria
().
and
ProjectIdEqualTo
(
projectId
).
andPeriodEqualTo
(
cellData
.
getPeriod
()).
and
CellDataIdEqualTo
(
cellData
.
getId
()).
andCellTemplateIdEqualTo
(
cellData
.
getCellTemplateId
());
List
<
PeriodCellDataSource
>
cellDataSourceList
=
periodCellDataSourceMapper
.
selectByExample
(
cellDataSourceExample
);
for
(
PeriodCellDataSource
cellDataSource
:
cellDataSourceList
)
{
Long
dataSourceId
=
cellDataSource
.
getDataSourceId
();
...
...
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