处理手工认证returnList

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java

@@ -75,23 +75,27 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                         dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
                         dataArray[1] = pageList.get(i).getInvoiceCode();
                         dataArray[2] = pageList.get(i).getInvoiceNo();
-                        dataArray[3] = dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS,pageList.get(i).getInvoiceStatus());
+                        dataArray[3] = new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType());
-                        dataArray[4] = pageList.get(i).getInvoiceDate();
+                        dataArray[4] = dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS,pageList.get(i).getInvoiceStatus());
-                        dataArray[5] = pageList.get(i).getGfName();
+                        dataArray[5] = pageList.get(i).getInvoiceDate();
-                        dataArray[6] = pageList.get(i).getXfName();
+                        dataArray[6] = pageList.get(i).getGfName();
-                        dataArray[7] = pageList.get(i).getInvoiceAmount();
+                        dataArray[7] = pageList.get(i).getXfName();
-                        dataArray[8] = pageList.get(i).getTaxAmount();
+                        dataArray[8] = pageList.get(i).getInvoiceAmount();
-                        dataArray[9] = pageList.get(i).getDkTaxAmount();
+                        dataArray[9] = pageList.get(i).getTaxAmount();
-                        dataArray[10] = dictdetaServcice.queryDictName(DictConstant.QS_STATUS, pageList.get(i).getQsStatus());
+                        dataArray[10] = pageList.get(i).getDkTaxAmount();
-                        dataArray[11] = pageList.get(i).getQsDate();
+                        dataArray[11] = dictdetaServcice.queryDictName(DictConstant.QS_STATUS, pageList.get(i).getQsStatus());
-                        dataArray[12] = dictdetaServcice.queryDictName(DictConstant.QS_TYPE, pageList.get(i).getQsType());
+                        dataArray[12] = pageList.get(i).getQsDate();
-                        dataArray[13] = pageList.get(i).getQsName();
+                        dataArray[13] = dictdetaServcice.queryDictName(DictConstant.QS_TYPE, pageList.get(i).getQsType());
-                        dataArray[14] = pageList.get(i).getSnVoucherNumber();
+                        if ("0".equals(pageList.get(i).getQsStatus())){
-                        dataArray[15] = pageList.get(i).getPostingTime();
+                            dataArray[13] = "";
-                        dataArray[16] = pageList.get(i).getImageNumber();
+                        }
-                        dataArray[17] = pageList.get(i).getAccountPeriod();
+                        dataArray[14] = pageList.get(i).getQsName();
-                        dataArray[18] = pageList.get(i).getBzdh();
+                        dataArray[15] = pageList.get(i).getSnVoucherNumber();
-                        dataArray[19] = pageList.get(i).getCompCode();
+                        dataArray[16] = pageList.get(i).getPostingTime();
+                        dataArray[17] = pageList.get(i).getImageNumber();
+                        dataArray[18] = pageList.get(i).getAccountPeriod();
+                        dataArray[19] = pageList.get(i).getBzdh();
+                        dataArray[20] = pageList.get(i).getCompCode();
 
                         returnList.add(dataArray);
                     }

dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java

@@ -65,8 +65,8 @@ public class ManualAthensThread extends BaseThread {
     /**
      * 导出excel的列名
      */
-    private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票状态", "开票日期","购方名称", "销方名称", "金额", "税额",
+    private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额",
-            "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号","报账单号", "过账时间", "影像号", "账期", "报账单号", "所属组织"};
+            "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "所属组织"};
 
     /**
      * 导出excel的列名