diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java index d531fa62..3641de70 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java @@ -2,6 +2,7 @@ package com.dxhy.extend.entity; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; /** @@ -135,6 +136,7 @@ public class ExtAddTaxInvoice implements Serializable { private String snVoucherNumber; private String postingTime; + @TableField("image_id") private String imageNumber; private String accountPeriod; private String compCode; diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index b5f2d37c..4b5f73c4 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -49,12 +49,12 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); pageList.get(i).setInvoiceType(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType())); pageList.get(i).setQsrq(pageList.get(i).getQsrq() == null ? "" : pageList.get(i).getQsrq()); @@ -274,9 +275,17 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); - pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, - pageList.get(i).getInAccountStatus())); + if (pageList.get(i).getInAccountStatus()!= null){ + if ("1".equals(pageList.get(i).getInAccountStatus())){ + pageList.get(i).setInAccountStatus("已入账"); + } + if ("0".equals(pageList.get(i).getInAccountStatus())) { + pageList.get(i).setInAccountStatus("未入账"); + } + } +// log.info("inAccountStatus=====>{}",pageList.get(i).getInAccountStatus()); +// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, +// pageList.get(i).getInAccountStatus())); } diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 2faf90aa..d20ee4b2 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -163,7 +163,6 @@ t.qs_name qsr, DATE_FORMAT(t.payment_date,'%Y-%m') inAccountMonth, t.payment_status paymentStatus, - t.inaccount_status inAccountStatus, t.voucher_number voucherNo, t.sn_voucher_number snVoucherNumber, t.posting_time postingTime, @@ -180,6 +179,7 @@ t.account_period accountPeriod, t.inaccount_status inAccountStatus, t.bzdh bzdh, + t.posting_time postingTime DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate, t.collect_from collectFrom from t_dx_record_invoice t