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
2915dfd0
Commit
2915dfd0
authored
Jul 27, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] extracte voucherDto from voucher
parent
ec9e35df
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
10 deletions
+28
-10
VoucherDto.java
...src/main/java/pwc/taxtech/atms/dto/vatdto/VoucherDto.java
+27
-0
JournalEntryImportServiceImpl.java
.../atms/vat/service/impl/JournalEntryImportServiceImpl.java
+1
-10
No files found.
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/VoucherDto.java
View file @
2915dfd0
package
pwc
.
taxtech
.
atms
.
dto
.
vatdto
;
package
pwc
.
taxtech
.
atms
.
dto
.
vatdto
;
import
pwc.taxtech.atms.vat.entity.Voucher
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -396,4 +398,29 @@ public class VoucherDto {
...
@@ -396,4 +398,29 @@ public class VoucherDto {
public
void
setAuditCount
(
int
auditCount
)
{
public
void
setAuditCount
(
int
auditCount
)
{
this
.
auditCount
=
auditCount
;
this
.
auditCount
=
auditCount
;
}
}
public
VoucherDto
extractFromVoucher
(
Voucher
v
)
{
setVoucherID
(
v
.
getVoucherID
());
setvID
(
v
.
getVID
());
setDate
(
v
.
getDate
());
setGroup
(
v
.
getGroup
());
setPeriod
(
v
.
getPeriod
());
setCustomerCode
(
v
.
getCustomerCode
());
setCustomerName
(
v
.
getCustomerName
());
setSummary
(
v
.
getSummary
());
setAcctCode
(
v
.
getAcctCode
());
setDebit
(
v
.
getDebit
());
setCredit
(
v
.
getCredit
());
setAttach
(
v
.
getAttach
());
if
(
v
.
getItemID
()
!=
null
)
setItemID
(
Long
.
parseLong
(
v
.
getItemID
()));
setCreatedTime
(
v
.
getCreateTime
());
setOriginalPeriod
(
v
.
getOriginalPeriod
());
setStatus
(
v
.
getStatus
());
setStdCode
(
v
.
getStdCode
());
setMappingReason
(
v
.
getMappingReason
());
setMappingUser
(
Integer
.
valueOf
(
v
.
getMappingUser
()));
setMappingTime
(
v
.
getMappingTime
());
return
this
;
}
}
}
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/JournalEntryImportServiceImpl.java
View file @
2915dfd0
...
@@ -92,16 +92,7 @@ public class JournalEntryImportServiceImpl {
...
@@ -92,16 +92,7 @@ public class JournalEntryImportServiceImpl {
for
(
Voucher
voucher
:
pageResultList
)
{
for
(
Voucher
voucher
:
pageResultList
)
{
if
(
voucher
.
getMonthID
()
==
null
&&
MonthID
==
1
)
voucher
.
setMonthID
(
0
);
if
(
voucher
.
getMonthID
()
==
null
&&
MonthID
==
1
)
voucher
.
setMonthID
(
0
);
if
(
voucher
.
getSummary
()
==
null
&&
Summary
==
1
)
voucher
.
setSummary
(
""
);
if
(
voucher
.
getSummary
()
==
null
&&
Summary
==
1
)
voucher
.
setSummary
(
""
);
qResult
.
getList
().
add
(
new
VoucherDto
().
extractFromVoucher
(
voucher
));
VoucherDto
voucherDto
=
new
VoucherDto
();
try
{
FieldsMapper
.
map
(
voucher
,
voucherDto
);
}
catch
(
ClassNotFoundException
e
)
{
//TODO replace exception filter (neo)
e
.
printStackTrace
();
}
catch
(
IllegalAccessException
e
)
{
e
.
printStackTrace
();
}
qResult
.
getList
().
add
(
voucherDto
);
}
}
return
qResult
;
return
qResult
;
...
...
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