diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceOutVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceOutVO.java index 13997126..d649a074 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceOutVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceOutVO.java @@ -30,10 +30,10 @@ public class InvoiceOutVO { private String snVoucherNumber; private String postingTime; - private String imageId; + private String imageNumber; private String accountPeriod; private String compCode; - private String inaccountStatus; + private String inAccountStatus; private String bzdh; private String bzr; diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/ReceiptInvoiceView.java b/dxhy-core/src/main/java/com/dxhy/core/model/ReceiptInvoiceView.java index f30e4287..ab5e0c10 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/ReceiptInvoiceView.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/ReceiptInvoiceView.java @@ -124,10 +124,10 @@ public class ReceiptInvoiceView implements Serializable { private String snVoucherNumber; private String postingTime; - private String imageId; + private String imageNumber; private String accountPeriod; private String compCode; - private String inaccountStatus; + private String inAccountStatus; private String bzdh; private String bzr; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java index 96226e5d..48554607 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java @@ -322,10 +322,14 @@ public class InvoiceOutExportThread extends BaseThread { vo.setSnVoucherNumber(view.getSnVoucherNumber()); vo.setPostingTime(view.getPostingTime()); - vo.setImageId(view.getImageId()); + vo.setImageNumber(view.getImageNumber()); vo.setAccountPeriod(view.getAccountPeriod()); vo.setCompCode(view.getCompCode()); - vo.setInaccountStatus(view.getInaccountStatus()); + if ("1".equals(view.getInAccountStatus())){ + vo.setInAccountStatus("已入账"); + }else { + vo.setInAccountStatus("未入账"); + } vo.setBzr(view.getBzr()); vo.setBzdh(view.getBzdh()); diff --git a/dxhy-core/src/main/resources/mapper/InvoiceOutMapper.xml b/dxhy-core/src/main/resources/mapper/InvoiceOutMapper.xml index adb37f53..0fc2faa6 100644 --- a/dxhy-core/src/main/resources/mapper/InvoiceOutMapper.xml +++ b/dxhy-core/src/main/resources/mapper/InvoiceOutMapper.xml @@ -26,7 +26,14 @@ - + + + + + + + +