综合查询税率和明细导出修改打款状态为入账状态

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

@@ -84,7 +84,11 @@ public class FpzhcxmxServiceImpl extends MpBaseServiceImpl<BbfpzhmxDao, Bbfpzhmx
                         for (int j = 0; j < pageList.size(); j++) {
                             String[] dataArray = new String[30];
                             dataArray[0] = String.valueOf((curr - 1) * size + j + 1);
-                            dataArray[1] = dictdetaServcice.queryDictName(DictConstant.DK_STATUS,pageList.get(j).getInAccountStatus());
+                            if (pageList.get(j).getInAccountStatus() != null && "1".equals(pageList.get(j).getInAccountStatus())){
+                                dataArray[1] = "已入账";
+                            }else {
+                                dataArray[1] = "未入账";
+                            }
                             dataArray[2] = pageList.get(j).getInvoiceCode();
                             dataArray[3] = pageList.get(j).getInvoiceNo();
                             // 发票类型

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

@@ -71,7 +71,12 @@ public class FpzhcxslServiceImpl extends MpBaseServiceImpl<BbfpzhslDao, Bbfpzhsl
                         for (int i = 0; i < pageList.size(); i++) {
                             String[] dataArray = new String[8];
                             dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
-                            dataArray[1] = dictdetaServcice.queryDictName(DictConstant.DK_STATUS,pageList.get(i).getInAccountStatus());
+                            if ("1".equals(pageList.get(i).getInAccountStatus())){
+                                dataArray[1] = "已入账";
+                            }else {
+                                dataArray[1] = "未入账";
+                            }
+//                            dataArray[1] = dictdetaServcice.queryDictName(DictConstant.DK_STATUS,pageList.get(i).getInAccountStatus());
                             dataArray[2] = pageList.get(i).getInvoiceCode();
                             dataArray[3] = pageList.get(i).getInvoiceNo();
                             // 发票类型

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

@@ -246,7 +246,7 @@ public class FpzhcxmxExportThread extends BaseThread {
                 pramsMap.put("company", company);
                 if (StringUtils.isNotBlank(inAccountStatus)) {
                     pramsMap.put("inAccountStatus", inAccountStatus);
-                    titleColumns = new String[] {"序号", "打款状态", "发票代码", "发票号码", "发票类型", "开票日期", "购方税号", "购方名称", "购方地址电话",
+                    titleColumns = new String[] {"序号", "入账状态", "发票代码", "发票号码", "发票类型", "开票日期", "购方税号", "购方名称", "购方地址电话",
                         "购方开户行及账号", "销方税号", "销方名称", "销方地址电话", "销方开户行及账号", "发票金额", "发票税额", "发票价税合计", "货物或应税劳务、服务名称",
                         "规格型号", "单位", "数量", "单价", "发票明细金额", "发票明细税额", "税率", "车牌号", "类型", "通行日期起", "通行日期止", "备注"};
                 }

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

@@ -242,7 +242,7 @@ public class FpzhcxslExportThread extends BaseThread {
                 pramsMap.put("company", company);
                 if (StringUtils.isNotBlank(inAccountStatus)) {
                     pramsMap.put("inAccountStatus", inAccountStatus);
-                    titleColumns = new String[] {"序号", "打款状态", "发票代码", "发票号码", "发票类型", "金额", "税额", "税率"};
+                    titleColumns = new String[] {"序号", "入账状态", "发票代码", "发票号码", "发票类型", "金额", "税额", "税率"};
                 }
                 // 导出文件名
                 StringBuilder ftpFileName = new StringBuilder();