diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java index 6e382ea4..d20f44db 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java @@ -195,5 +195,7 @@ public class TDxInvoice implements Serializable { private String inaccountStatus; private String bzdh; private String bzr; + private String inAccountStatus; + private String imageNumber; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java index 7b4bbfdc..8a380036 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java @@ -229,4 +229,6 @@ public class FpRzRespVO implements Serializable { private String suspendStatus; private String suspendDate; + + private String taxRate; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java index 8ebcdfad..0d07bf37 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java @@ -46,5 +46,6 @@ public class SignQueryVO { private String inaccountStatus; private String bzdh; private String bzr; - + private String inAccountStatus; + private String imageNumber; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpqsServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpqsServiceImpl.java index c5abb8e8..8d013cdf 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpqsServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpqsServiceImpl.java @@ -153,6 +153,18 @@ public class FpqsServiceImpl extends MpBaseServiceImpl impl vo.setTaxAmount(MathUtil.round(pageList.get(i).getTaxAmount().toPlainString())); vo.setSnVoucherNumber(pageList.get(i).getSnVoucherNumber()); vo.setPostingTime(pageList.get(i).getPostingTime()); - vo.setImageId(pageList.get(i).getImageId()); + vo.setImageNumber(pageList.get(i).getImageNumber()); vo.setAccountPeriod(pageList.get(i).getAccountPeriod()); vo.setCompCode(pageList.get(i).getCompCode()); - vo.setInaccountStatus(pageList.get(i).getInaccountStatus()); + if ("1".equals(pageList.get(i).getInAccountStatus())){ + vo.setInAccountStatus("已入账"); + }else { + vo.setInAccountStatus("未入账"); + } vo.setBzr(pageList.get(i).getBzr()); vo.setBzdh(pageList.get(i).getBzdh()); returnList.add(vo); diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 67ee217a..159430d3 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -42,6 +42,7 @@ + + + + + + + + +