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
a80484ee
Commit
a80484ee
authored
Jul 31, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] add post for get customs invoice data for display
parent
d247dd16
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
CustomsInvoiceController.java
...pwc/taxtech/atms/controller/CustomsInvoiceController.java
+6
-1
No files found.
atms-api/src/main/java/pwc/taxtech/atms/controller/CustomsInvoiceController.java
View file @
a80484ee
...
@@ -45,7 +45,7 @@ public class CustomsInvoiceController {
...
@@ -45,7 +45,7 @@ public class CustomsInvoiceController {
private
IdentityService
identityService
;
private
IdentityService
identityService
;
@RequestMapping
(
value
=
"GetCustomsInvoiceDataForDisplay"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@RequestMapping
(
value
=
"GetCustomsInvoiceDataForDisplay"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
public
String
getCustomsInvoiceDataForDisplay
(
@RequestParam
int
fromPeriod
,
@RequestParam
int
toPeriod
,
@RequestParam
String
criteria
,
@RequestParam
String
pagination
)
{
public
String
getCustomsInvoiceDataForDisplay
(
@RequestParam
Integer
fromPeriod
,
@RequestParam
Integer
toPeriod
,
@RequestParam
String
criteria
,
@RequestParam
String
pagination
)
{
CustomsInvoiceFilter
filter
=
new
CustomsInvoiceFilter
();
CustomsInvoiceFilter
filter
=
new
CustomsInvoiceFilter
();
if
(
StringUtils
.
isNotBlank
(
criteria
)
&&
!
"null"
.
equals
(
criteria
))
{
if
(
StringUtils
.
isNotBlank
(
criteria
)
&&
!
"null"
.
equals
(
criteria
))
{
filter
=
JSONObject
.
parseObject
(
criteria
,
CustomsInvoiceFilter
.
class
);
filter
=
JSONObject
.
parseObject
(
criteria
,
CustomsInvoiceFilter
.
class
);
...
@@ -62,6 +62,11 @@ public class CustomsInvoiceController {
...
@@ -62,6 +62,11 @@ public class CustomsInvoiceController {
return
convertCustomsInvoiceDataToJson
(
fromPeriod
,
toPeriod
,
filter
,
paging
);
return
convertCustomsInvoiceDataToJson
(
fromPeriod
,
toPeriod
,
filter
,
paging
);
}
}
@RequestMapping
(
value
=
"GetCustomsInvoiceDataForDisplay"
,
method
=
RequestMethod
.
POST
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
public
String
postCustomsInvoiceDataForDisplay
(
@RequestParam
Integer
fromPeriod
,
@RequestParam
Integer
toPeriod
,
@RequestParam
String
criteria
,
@RequestParam
String
pagination
)
{
return
getCustomsInvoiceDataForDisplay
(
fromPeriod
,
toPeriod
,
criteria
,
pagination
);
}
@RequestMapping
(
value
=
"GetCustomsInvoicesByPeriodId/{periodId}"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@RequestMapping
(
value
=
"GetCustomsInvoicesByPeriodId/{periodId}"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
public
ResponseEntity
getCustomsInvoicesByPeriodId
(
@PathVariable
Integer
periodId
)
{
public
ResponseEntity
getCustomsInvoicesByPeriodId
(
@PathVariable
Integer
periodId
)
{
return
ResponseEntity
.
ok
().
body
(
customsInvoiceService
.
getCustomsInvoicesByPeriodId
(
periodId
));
return
ResponseEntity
.
ok
().
body
(
customsInvoiceService
.
getCustomsInvoicesByPeriodId
(
periodId
));
...
...
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