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
13d5d8dd
Commit
13d5d8dd
authored
Jul 24, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] use queryDto same as Query body param
parent
98a01c03
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
42 deletions
+10
-42
QueryEvidenceDto.java
...in/java/pwc/taxtech/atms/dto/vatdto/QueryEvidenceDto.java
+4
-36
OutputInvoiceServiceImpl.java
...xtech/atms/vat/service/impl/OutputInvoiceServiceImpl.java
+6
-6
No files found.
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/QueryEvidenceDto.java
View file @
13d5d8dd
package
pwc
.
taxtech
.
atms
.
dto
.
vatdto
;
public
class
QueryEvidenceDto
{
private
Integer
queryType
;
private
String
queryString
;
private
Boolean
isCurrentPeriod
;
private
Integer
periodId
;
public
Integer
getQueryType
()
{
return
queryType
;
}
public
void
setQueryType
(
Integer
queryType
)
{
this
.
queryType
=
queryType
;
}
public
String
getQueryString
()
{
return
queryString
;
}
public
void
setQueryString
(
String
queryString
)
{
this
.
queryString
=
queryString
;
}
public
Boolean
getCurrentPeriod
()
{
return
isCurrentPeriod
;
}
public
void
setCurrentPeriod
(
Boolean
currentPeriod
)
{
isCurrentPeriod
=
currentPeriod
;
}
public
Integer
getPeriodId
()
{
return
periodId
;
}
public
void
setPeriodId
(
Integer
periodId
)
{
this
.
periodId
=
periodId
;
}
public
Integer
QueryType
;
public
String
QueryString
;
public
Boolean
IsCurrentPeriod
;
public
Integer
PeriodId
;
}
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/OutputInvoiceServiceImpl.java
View file @
13d5d8dd
...
...
@@ -69,17 +69,17 @@ public class OutputInvoiceServiceImpl extends VatAbstractService {
public
List
<
ImportFile
>
getEvidenceList
(
QueryEvidenceDto
queryDto
)
{
ImportFileExample
example
=
new
ImportFileExample
();
if
(
queryDto
.
getCurrentPeriod
()
)
{
if
(
Utils
.
isEmpty
(
queryDto
.
getQueryString
()
))
{
example
.
createCriteria
().
andFileImportTypeEqualTo
(
2
).
andPeriodIDEqualTo
(
queryDto
.
getPeriodId
()
.
intValue
());
if
(
queryDto
.
IsCurrentPeriod
)
{
if
(
Utils
.
isEmpty
(
queryDto
.
QueryString
))
{
example
.
createCriteria
().
andFileImportTypeEqualTo
(
2
).
andPeriodIDEqualTo
(
queryDto
.
PeriodId
.
intValue
());
}
else
{
example
.
createCriteria
().
andFileImportTypeEqualTo
(
2
).
andPeriodIDEqualTo
(
queryDto
.
getPeriodId
().
intValue
()).
andFileNameLike
(
queryDto
.
getQueryString
()
);
example
.
createCriteria
().
andFileImportTypeEqualTo
(
2
).
andPeriodIDEqualTo
(
queryDto
.
PeriodId
.
intValue
()).
andFileNameLike
(
queryDto
.
QueryString
);
}
}
else
{
if
(
Utils
.
isEmpty
(
queryDto
.
getQueryString
()
))
{
if
(
Utils
.
isEmpty
(
queryDto
.
QueryString
))
{
example
.
createCriteria
().
andFileImportTypeEqualTo
(
2
);
}
else
{
example
.
createCriteria
().
andFileImportTypeEqualTo
(
2
).
andFileNameLike
(
queryDto
.
getQueryString
()
);
example
.
createCriteria
().
andFileImportTypeEqualTo
(
2
).
andFileNameLike
(
queryDto
.
QueryString
);
}
}
return
importFileMapper
.
selectByExample
(
example
);
...
...
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