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
244ad198
Commit
244ad198
authored
Aug 03, 2018
by
frank.xa.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed the formula project context and remove some unused data in DB
need add the bspl report in the system
parent
add077bc
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 @
244ad198
...
...
@@ -228,7 +228,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
if
(
periodCellTemplateConfigList
!=
null
)
{
periodCellTemplateConfigList
.
forEach
(
a
->
{
if
(
StringUtils
.
isNotBlank
(
a
.
getAccountCodes
()))
{
String
[]
acctCodes
=
","
.
split
(
a
.
getAccountCodes
()
);
String
[]
acctCodes
=
a
.
getAccountCodes
().
split
(
","
);
EnterpriseAccountExample
enterpriseAccountExample
=
new
EnterpriseAccountExample
();
enterpriseAccountExample
.
createCriteria
().
andStdCodeIn
(
Arrays
.
asList
(
acctCodes
));
List
<
EnterpriseAccount
>
enterpriseAccounts
=
enterpriseAccountMapper
.
selectByExample
(
enterpriseAccountExample
);
...
...
@@ -261,7 +261,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
public
OperationResultDto
generateData
(
String
projectId
,
EnumServiceType
serviceType
,
Boolean
ifDeleteManualDataSource
,
Integer
periodParam
,
Integer
reportType
,
String
generator
)
{
OperationResultDto
operationResultDto
=
new
OperationResultDto
();
if
(
serviceType
.
equals
(
EnumServiceType
.
VAT
)
&&
(
periodParam
==
null
&&
periodParam
<=
0
))
{
if
(
serviceType
.
equals
(
EnumServiceType
.
VAT
)
&&
(
periodParam
==
null
||
periodParam
<=
0
))
{
operationResultDto
.
setResultMsg
(
"PeriodRequiredForVAT"
);
return
operationResultDto
;
}
...
...
@@ -271,7 +271,7 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
throw
new
NotSupportedException
();
}
int
period
=
periodParam
!=
null
?
periodParam
:
0
;
int
period
=
periodParam
;
String
serviceTypeStr
=
serviceType
.
getCode
().
toString
();
ProjectServiceTypeExample
projectServiceTypeExample
=
new
ProjectServiceTypeExample
();
...
...
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