出口转内销认证入账状态修改

dxhy-core/src/main/java/com/dxhy/core/model/ExportCustomsRzcxVO.java

@@ -38,7 +38,7 @@ public class ExportCustomsRzcxVO {
     private String imageId;
     private String accountPeriod;
     private String compCode;
-    private String inaccountStatus;
+    private String inAccountStatus;
     private String bzdh;
     private String bzr;
 

dxhy-core/src/main/java/com/dxhy/core/model/ExportInvoiceRzcxVO.java

@@ -37,7 +37,7 @@ public class ExportInvoiceRzcxVO {
     private String imageId;
     private String accountPeriod;
     private String compCode;
-    private String inaccountStatus;
+    private String inAccountStatus;
     private String bzdh;
     private String bzr;
 

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

@@ -369,6 +369,12 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus()));
                 vo.setCxrzStatus(dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, vo.getCxrzStatus()));
                 vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus()));
+
+                if ("1".equals(vo.getInAccountStatus())){
+                    vo.setInAccountStatus("已入账");
+                }else {
+                    vo.setInAccountStatus("未入账");
+                }
                 i++;
             }
         }
@@ -519,10 +525,10 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getExportTaxAmount()));
                 vo.setExportYxse(AmountFormatUtil.fmtMicrometer(vo.getExportYxse()));
 
-                if("1".equals(vo.getInaccountStatus())){
-                    vo.setInaccountStatus("已入账");
+                if("1".equals(vo.getInAccountStatus())){
+                    vo.setInAccountStatus("已入账");
                 }else{
-                    vo.setInaccountStatus("未入账");
+                    vo.setInAccountStatus("未入账");
                 }
 
 

dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml

@@ -178,7 +178,7 @@
         p.account_period as account_period,
         p.bzdh,
         p.bzr,
-        p.inaccount_status as inaccountStatus,
+        p.inaccount_status as inAccountStatus,
         p.comp_code as compCode
         FROM
         t_dx_export_customs p

dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml

@@ -81,7 +81,7 @@
         p.account_period as account_period,
         p.bzdh,
         p.bzr,
-        p.inaccount_status as inaccountStatus,
+        p.inaccount_status as inAccountStatus,
         p.comp_code as compCode
         FROM
         t_dx_export_invoice p