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
c6b49c2b
Commit
c6b49c2b
authored
Nov 20, 2018
by
sherlock
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some export
parent
285799ae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
13 deletions
+14
-13
OutputInvoiceController.java
.../pwc/taxtech/atms/controller/OutputInvoiceController.java
+5
-4
OutputVATInvoiceInfoDto.java
.../pwc/taxtech/atms/dto/vatdto/OutputVATInvoiceInfoDto.java
+9
-9
No files found.
atms-api/src/main/java/pwc/taxtech/atms/controller/OutputInvoiceController.java
View file @
c6b49c2b
...
...
@@ -104,6 +104,7 @@ public class OutputInvoiceController {
new
pwc
.
taxtech
.
atms
.
dto
.
vatdto
.
OutputVATInvoiceInfoDto
();
d
=
beanUtil
.
copyProperties
(
x
,
d
);
d
.
setInvoiceTypeName
(
d
.
getInvoiceTypeName
());
d
.
setTaxRate
(
x
.
getTaxRate
().
toString
()
+
"%"
);
list2
.
add
(
d
);
});
Map
<
String
,
String
>
header
=
new
LinkedHashMap
<>();
...
...
@@ -117,13 +118,13 @@ public class OutputInvoiceController {
header
.
put
(
"InvoiceDate"
,
"开票日期"
);
// header.put("CodeVersion", "商品编码版本号");
// header.put("DocumentNum", "单据号");
//
header.put("ProductName", "商品名称");
header
.
put
(
"ProductName"
,
"商品名称"
);
// header.put("ProductStandar", "规格");
// header.put("Unit", "单位");
//
header.put("Quantity", "数量");
//
header.put("UnitPrice", "单价");
header
.
put
(
"Quantity"
,
"数量"
);
header
.
put
(
"UnitPrice"
,
"单价"
);
header
.
put
(
"Amount"
,
"金额"
);
//
header.put("TaxRate", "税率");
header
.
put
(
"TaxRate"
,
"税率"
);
header
.
put
(
"TaxAmount"
,
"税额"
);
// header.put("TaxClassCode", "税收分类编码");
...
...
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/OutputVATInvoiceInfoDto.java
View file @
c6b49c2b
...
...
@@ -30,7 +30,7 @@ public class OutputVATInvoiceInfoDto {
private
Date
invoiceDate
;
// @ExcelCell(index=9)
private
String
codeVersion
;
// @ExcelCell(index=11
)
@ExcelCell
(
index
=
7
)
private
String
productName
;
// @ExcelCell(index=10)
private
String
documentNum
;
...
...
@@ -38,15 +38,15 @@ public class OutputVATInvoiceInfoDto {
private
String
productStandard
;
// @ExcelCell(index=13)
private
String
unit
;
// @ExcelCell(index=14
)
@ExcelCell
(
index
=
8
)
private
Integer
quantity
;
// @ExcelCell(index=15
)
@ExcelCell
(
index
=
9
)
private
Double
unitPrice
;
@ExcelCell
(
index
=
7
)
@ExcelCell
(
index
=
10
)
private
BigDecimal
amount
;
// @ExcelCell(index=17
)
private
BigDecimal
taxRate
;
@ExcelCell
(
index
=
8
)
@ExcelCell
(
index
=
11
)
private
String
taxRate
;
@ExcelCell
(
index
=
12
)
private
BigDecimal
taxAmount
;
private
String
taxClassCode
;
@JsonProperty
(
"periodID"
)
...
...
@@ -194,11 +194,11 @@ public class OutputVATInvoiceInfoDto {
this
.
amount
=
amount
;
}
public
BigDecimal
getTaxRate
()
{
public
String
getTaxRate
()
{
return
taxRate
;
}
public
void
setTaxRate
(
BigDecimal
taxRate
)
{
public
void
setTaxRate
(
String
taxRate
)
{
this
.
taxRate
=
taxRate
;
}
...
...
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