diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java index 1e2b958f..856c6a67 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java +++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java @@ -506,5 +506,7 @@ public class BaseTDxRecordInvoice implements Serializable { //账期 private String accountPeriod; //过账时间 - private Date postingTime; + private String postingTime; + //影像号 + private String imageId; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java index 498aa1ca..b9e2c0cc 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java @@ -1,7 +1,10 @@ package com.dxhy.base.model; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; + /** * 手工勾选查询返回对象 * @@ -126,4 +129,24 @@ public class BaseSggxCxRespVO { */ private String eleInvoiceNo; + /** + * 影像id + */ + private String imageId; + + /** + * 凭证号 + */ + private String snVoucherNumber; + + /** + * 过账时间 + */ + private String postingTime; + + /** + * 过账时间 + */ + private String accountPeriod; + } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index e92d0555..098ea695 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -14,6 +14,7 @@ import java.util.Map; import javax.annotation.Resource; import com.dxhy.common.constant.DictConstant; +import com.dxhy.common.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -168,6 +169,10 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl select t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no - gfsh,t.gf_name + gfsh,t.gf_name,t.image_id,t.rzh_date, gfmc,t.dept_id deptId,t.dept_name deptName, t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,date_format(t.rzh_date,'%Y-%m-%d') rzh_date,date_format(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.id id,