From cd747003e88c3e0e3eb36fa417693848e8ea3b8b Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 27 Apr 2023 14:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/fpxxrz/BaseRzFpxxServiceImpl.java  |  9 +++++++--
 .../BaseInvoiceManualCheckServiceImpl.java     | 16 ++++++++--------
 .../impl/CustomsCustomsJkszhcxServiceImpl.java |  8 ++++++--
 .../impl/CustomsRecordDkrzServiceImpl.java     | 15 ++++++++++++---
 .../service/bb/impl/ExtFpzhcxServiceImpl.java  |  8 ++++++--
 .../service/bb/impl/ExtYcfpcxServiceImpl.java  |  6 +++++-
 .../service/companypool/TicketServiceImpl.java |  9 +++++++--
 .../pool/ExtInvoicePoolServiceImpl.java        | 18 +++++++++---------
 8 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
index b7317f65..aa5bc318 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
@@ -182,8 +182,13 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         // }
                         // }
                         // }
-                        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()));
+                        if ("1".equals(pageList.get(i).getInAccountStatus())){
+                            pageList.get(i).setInAccountStatus("已入账");
+                        }else if ("0".equals(pageList.get(i).getInAccountStatus())){
+                            pageList.get(i).setInAccountStatus("未入账");
+                        }
                         pageList.get(i).setRzsj(pageList.get(i).getRzsj());
                         pageList.get(i).setSkssq(pageList.get(i).getSkssq());
                     }
diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index c2a73800..9950f8b1 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
@@ -201,20 +201,20 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     if (pageList.get(i).getQsStatus() != null) {
                         vo.setQszt(dictdetaServcice.queryDictName(DictConstant.QS_STATUS,pageList.get(i).getQsStatus()));
                     }
-//                    if ("1".equals(pageList.get(i).getPaymentStatus())) {
-//                        vo.setPaymentStatus("已付款");
-//                    } else if ("0".equals(pageList.get(i).getPaymentStatus())) {
-//                        vo.setPaymentStatus("未付款");
-//                    }
+                    if ("1".equals(pageList.get(i).getInAccountStatus())) {
+                        vo.setInAccountStatus("已入账");
+                    } else if ("0".equals(pageList.get(i).getInAccountStatus())) {
+                        vo.setInAccountStatus("未入账");
+                    }
                     vo.setPaymentStatus(dictdetaServcice.queryDictName(DictConstant.FK_STATUS,pageList.get(i).getPaymentStatus()));
                     vo.setPaymentDate(pageList.get(i).getPaymentDate());
                     vo.setGfmc(pageList.get(i).getGfName());
                     vo.setXfmc(pageList.get(i).getXfName());
                     vo.setBusinessName(businessName);
                     vo.setEleInvoiceNo(pageList.get(i).getEleInvoiceNo());
-                    String dkzt= dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus());
-                    pageList.get(i).setInAccountStatus(dkzt);
-                    vo.setInAccountStatus(dkzt);
+//                    String dkzt= dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus());
+//                    pageList.get(i).setInAccountStatus(dkzt);
+//                    vo.setInAccountStatus(dkzt);
                     vo.setSelect(true);
                     if (!"1".equals(pageList.get(i).getAuthStatus())) {
                         vo.setSelect(false);
diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
index 04b796b2..61ffcfb3 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
@@ -117,8 +117,12 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
 
                     // 字典值转换
                     String inaccountStatus = pageList.get(i).getInaccountStatus();
-                    pageList.get(i).setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inaccountStatus));
-                    String auditStatus = pageList.get(i).getAuditStatus();
+                    if ("1".equals(inaccountStatus)){
+                        pageList.get(i).setInaccountStatus("已入账");
+                    }else if ("0".equals(inaccountStatus)) {
+                        pageList.get(i).setInaccountStatus("未入账");
+                    }
+                     String auditStatus = pageList.get(i).getAuditStatus();
                     pageList.get(i)
                         .setAuditStatus(dictdetaServcice.queryDictName(DictConstant.AUDIT_STATUS, auditStatus));
                     String applyCheck = pageList.get(i).getApplyCheck();
diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
index 57c54540..f85de567 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
@@ -132,7 +132,12 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
                     map.put("qsStatus", dictdetaServcice.queryDictName(DictConstant.QS_STATUS, qsStatus));
                     String qsType = (String)map.get("qsType");
                     map.put("qsType", dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsType));
-                    map.put("inAccountStatus",dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,(String)map.get("inAccountStatus")));
+                    if ("1".equals(map.get("inAccountStatus"))){
+                        map.put("inAccountStatus","已入账");
+
+                    }else if ("2".equals(map.get("inAccountStatus"))){
+                        map.put("inAccountStatus","未入账");
+                    }
 
                     if (map.get("qsDate") != null) {
                         map.put("qsDate", map.get("qsDate"));
@@ -1225,8 +1230,12 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
                     map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
                     map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));
                     //入账状态
-                    String inAccountStatus = (String) map.get("inAccountStatus");
-                    map.put("inAccountStatus",dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inAccountStatus));
+                    if ("1".equals(map.get("inAccountStatus"))){
+                        map.put("inAccountStatus","已入账");
+                    }else if ("0".equals(map.get("inAccountStatus"))) {
+                        map.put("inAccountStatus","未入账");
+                    }
+
                     if (map.get("qsDate") != null) {
                         map.put("qsDate", map.get("qsDate"));
                     }
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
index 04634694..96761136 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
@@ -123,8 +123,12 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl<ExtBbfpzhDao, ExtBbf
                     String bdkStatus = resultList.get(i).getBdkStatus();
                     resultList.get(i).setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
                     String inAccountStatus = resultList.get(i).getInAccountStatus();
-                    resultList.get(i)
-                        .setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, inAccountStatus));
+                    if ("1".equals(inAccountStatus)){
+                        resultList.get(i).setInAccountStatus("已入账");
+                    }else if ("0".equals(inAccountStatus)){
+                        resultList.get(i).setInAccountStatus("未入账");
+                    }
+
                 }
             }
 
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
index 6bbb932e..0c9f34c2 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
@@ -106,7 +106,11 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl<ExtBbycfpcxDao, ExtB
                     String rzlx = pageList.get(i).getRzlx();
                     pageList.get(i).setRzlx(dictdetaServcice.queryDictName(DictConstant.INVOICE_RZLX, rzlx));
                     String inAccountStatus = pageList.get(i).getInAccountStatus();
-                    pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inAccountStatus));
+                    if ("1".equals(inAccountStatus)){
+                        pageList.get(i).setInAccountStatus("已入账");
+                    }else if ("0".equals(inAccountStatus)) {
+                        pageList.get(i).setInAccountStatus("未入账");
+                    }
 
                     // if (rzlxModels!=null){
                     // for (DictdetaModel model : rzlxModels){
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
index 80326cb8..dd25bcf2 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
@@ -142,9 +142,14 @@ public class TicketServiceImpl extends MpBaseServiceImpl<ExtTicketDao, ExtTicket
                         pageList.get(i).setCreateDate(pageList.get(i).getCreateDate().substring(0, 10));
                     }
                     //报账单号字典值转换
+                    if ("1".equals(pageList.get(i).getInAccountStatus())){
+                        pageList.get(i).setInAccountStatus("已入账");
+                    }else if ("0".equals(pageList.get(i).getInAccountStatus())){
+                        pageList.get(i).setInAccountStatus("未入账");
+                    }
                     log.info("入账状态====>{}",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).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus()));
+//                    log.info("入账状态====>{}",pageList.get(i).getInAccountStatus());
 
                 }
             }
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 4b5f73c4..ef4d937a 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
@@ -396,13 +396,13 @@ 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 {
-//                        pageList.get(i).setInAccountStatus("");
-//                    }
+                    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("");
+                    }
                     if ("0".equals(pageList.get(i).getListStatus())) {
                         pageList.get(i).setListStatus("否");
                     } else if ("1".equals(pageList.get(i).getListStatus())) {
@@ -421,8 +421,8 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
                         pageList.get(i).getInAccountMonth() == null ? "" : pageList.get(i).getInAccountMonth());
                     pageList.get(i).setScanId(pageList.get(i).getScanId() == null ? "" : pageList.get(i).getScanId());
                     pageList.get(i).setInvoiceType(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType()));
-                    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()));
                 }
             }