修改mapper文件

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;

dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java

@@ -49,12 +49,12 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
         try {
             String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "销方名称", "销方税号", "金额", "税额", "有效税额",
                 "价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
-                "入账月份", "入账状态","凭证号", "过账时间", "影像号", "账期","是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","报账单号","入账状态"};
+                "入账月份", "凭证号", "过账时间", "影像号", "账期","是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","报账单号","入账状态"};
 
             String[] titleprop = {"xh", "invoiceType", "invoiceCode", "invoiceNo", "invoiceStatus", "invoiceDate",
                 "xfmc", "xfsh", "invoiceAmount", "taxAmount", "yxse", "totalAmount", "rzzt", "rzlx", "rzrq", "rzfs",
                 "rzr", "collectStatus", "collectDate", "collectFrom", "qsfs", "qszt", "qsrq", "qsr", "inAccountMonth",
-                "inAccountStatus", "voucherNo","postingTime","imageId","accountPeriod", "amortizeStatus", "amortizeAmount", "remainAmortizeAmount",
+                 "snVoucherNumber","postingTime","imageNumber","accountPeriod", "amortizeStatus", "amortizeAmount", "remainAmortizeAmount",
                 "documentNumber", "createDate","bzdh","inAccountStatus"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
@@ -158,11 +158,12 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
                     } else {
                         pageList.get(i).setRzlx("");
                     }
-//                    if ("0".equals(pageList.get(i).getInAccountStatus())) {
-//                        pageList.get(i).setInAccountStatus("未入账");
-//                    } else if ("1".equals(pageList.get(i).getInAccountStatus())) {
-//                        pageList.get(i).setInAccountStatus("已入账");
-//                    } else {
+                    if ("0".equals(pageList.get(i).getInAccountStatus())) {
+                        pageList.get(i).setInAccountStatus("未入账");
+                    } else if ("1".equals(pageList.get(i).getInAccountStatus())) {
+                        pageList.get(i).setInAccountStatus("已入账");
+                    }
+//                    else {
 //                        pageList.get(i).setInAccountStatus("未入账");
 //                    }
 
@@ -172,7 +173,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
                         pageList.get(i).setCollectFrom("票据采集");
                     }
                     //报账单号字典值转换
-                    pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus()));
+//                    pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus()));
                     log.info("入账状态====>{}",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<ExtInvoicePoolD
                     pageList.get(i).setScanId(pageList.get(i).getScanId() == null ? "" : pageList.get(i).getScanId());
                     pageList.get(i)
                         .setInvoiceTypeString(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType()));
-                    log.info("inAccountStatus=====>{}",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()));
 
                 }
 

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