修改导出字段不展示

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

@@ -71,7 +71,7 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                 List<String[]> returnList = new ArrayList<>();
                 if (resultList != null && resultList.size() > 0) {
                     for (int i = 0; i < pageList.size(); i++) {
-                        String[] dataArray = new String[25];
+                        String[] dataArray = new String[26];
                         dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
                         dataArray[1] = pageList.get(i).getInvoiceCode();
                         dataArray[2] = pageList.get(i).getInvoiceNo();
@@ -96,9 +96,15 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                         dataArray[18] = pageList.get(i).getAccountPeriod();
                         dataArray[19] = pageList.get(i).getBzdh();
                         dataArray[20] = pageList.get(i).getBzr();
-                        dataArray[21] = pageList.get(i).getCompCode();
+                        if ("1".equals(pageList.get(i).getInAccountStatus())){
-                        dataArray[22] = pageList.get(i).getSuspendStatus();
+                            dataArray[21] = "已入账";
-                        dataArray[23] = pageList.get(i).getSuspendDate();
+                        }else {
+                            dataArray[21] = "未入账";
+                        }
+
+                        dataArray[22] = pageList.get(i).getCompCode();
+                        dataArray[23] = pageList.get(i).getSuspendStatus();
+                        dataArray[24] = pageList.get(i).getSuspendDate();
 
                         returnList.add(dataArray);
                     }

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

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