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
e3145f6a
Commit
e3145f6a
authored
Oct 12, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[dev] fixed find input detail item
parent
2c91ee79
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
9 deletions
+4
-9
InputInvoiceImportController.java
...taxtech/atms/controller/InputInvoiceImportController.java
+4
-3
InputInvoiceDataImportServiceImpl.java
...s/vat/service/impl/InputInvoiceDataImportServiceImpl.java
+0
-6
No files found.
atms-api/src/main/java/pwc/taxtech/atms/controller/InputInvoiceImportController.java
View file @
e3145f6a
...
...
@@ -15,6 +15,7 @@ import pwc.taxtech.atms.thirdparty.ExcelSheet;
import
pwc.taxtech.atms.thirdparty.ExcelUtil
;
import
pwc.taxtech.atms.vat.dpo.InputInvoicePreviewQueryParam
;
import
pwc.taxtech.atms.vat.entity.InputInvoice
;
import
pwc.taxtech.atms.vat.entity.InputInvoiceDetail
;
import
pwc.taxtech.atms.vat.entity.InputVatInvoiceItem
;
import
pwc.taxtech.atms.vat.service.impl.InputInvoiceDataImportServiceImpl
;
...
...
@@ -110,9 +111,9 @@ public class InputInvoiceImportController {
excelSheetB
.
setHeaders
(
header2
);
excelSheetB
.
setSheetName
(
"sheetB"
);
List
<
Input
VatInvoiceItem
>
inputInvoiceItemList
=
new
ArrayList
<>();
List
<
Input
InvoiceDetail
>
inputInvoiceItemList
=
new
ArrayList
<>();
for
(
InputInvoice
item
:
list
)
{
inputInvoiceItemList
.
addAll
(
inputInvoiceDataImportService
.
getInputInvoiceItem
TreeViewData
(
item
.
getID
()));
inputInvoiceItemList
.
addAll
(
inputInvoiceDataImportService
.
getInputInvoiceItem
List
(
item
.
getID
()));
}
excelSheetB
.
setDataset
(
inputInvoiceItemList
);
List
<
ExcelSheet
<
InputVATInvoiceBaseDto
>>
sheets
=
new
ArrayList
<>();
...
...
@@ -137,6 +138,6 @@ public class InputInvoiceImportController {
@RequestMapping
(
value
=
"inputInvoiceItemPreviewList/{InputInvoiceId}"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
public
ResponseEntity
GetInputInvoiceItemTreeViewData
(
@PathVariable
String
InputInvoiceId
)
{
return
ResponseEntity
.
ok
(
inputInvoiceDataImportService
.
getInputInvoiceItem
TreeViewData
(
InputInvoiceId
));
return
ResponseEntity
.
ok
(
inputInvoiceDataImportService
.
getInputInvoiceItem
List
(
InputInvoiceId
));
}
}
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/InputInvoiceDataImportServiceImpl.java
View file @
e3145f6a
...
...
@@ -60,12 +60,6 @@ public class InputInvoiceDataImportServiceImpl {
return
pageInfo
;
}
public
List
<
InputVatInvoiceItem
>
getInputInvoiceItemTreeViewData
(
String
id
)
{
InputVatInvoiceItemExample
example
=
new
InputVatInvoiceItemExample
();
example
.
createCriteria
().
andInputVATInvoiceIdEqualTo
(
id
);
return
inputVATInvoiceItemMapper
.
selectByExample
(
example
);
}
public
List
<
InputVATInvoiceDto
>
getInputInvoiceList
(
Integer
period
)
{
...
...
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