修改mapper文件

dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java

@@ -182,7 +182,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         // }
                         // }
                         // }
-                        pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS,
+                        pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
                             pageList.get(i).getInAccountStatus()));
                         pageList.get(i).setRzsj(pageList.get(i).getRzsj());
                         pageList.get(i).setSkssq(pageList.get(i).getSkssq());

dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

@@ -212,7 +212,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                     vo.setXfmc(pageList.get(i).getXfName());
                     vo.setBusinessName(businessName);
                     vo.setEleInvoiceNo(pageList.get(i).getEleInvoiceNo());
-                    String dkzt= dictdetaServcice.queryDictName(DictConstant.DK_STATUS,pageList.get(i).getInAccountStatus());
+                    String dkzt= dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus());
                     pageList.get(i).setInAccountStatus(dkzt);
                     vo.setInAccountStatus(dkzt);
                     vo.setSelect(true);

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java

@@ -116,6 +116,8 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                         AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getYxTaxAmount())));
 
                     // 字典值转换
+                    String inaccountStatus = pageList.get(i).getInaccountStatus();
+                    pageList.get(i).setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inaccountStatus));
                     String auditStatus = pageList.get(i).getAuditStatus();
                     pageList.get(i)
                         .setAuditStatus(dictdetaServcice.queryDictName(DictConstant.AUDIT_STATUS, auditStatus));

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java

@@ -126,6 +126,7 @@ 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 (map.get("qsDate") != null) {
                         map.put("qsDate", map.get("qsDate"));
@@ -1212,6 +1213,9 @@ 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 (map.get("qsDate") != null) {
                         map.put("qsDate", map.get("qsDate"));
                     }

dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java

@@ -152,7 +152,7 @@ public class ExtBbfpzhcxRespVO implements Serializable {
      */
     private String exportMark;
     private String scanId;
-    private String inaccountStatus;
+    private String inAccountStatus;
 
     /**
      * 结算单号

dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java

@@ -122,9 +122,9 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl<ExtBbfpzhDao, ExtBbf
                     resultList.get(i).setQsfs(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsfs));
                     String bdkStatus = resultList.get(i).getBdkStatus();
                     resultList.get(i).setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
-                    String inAccountStatus = resultList.get(i).getInaccountStatus();
+                    String inAccountStatus = resultList.get(i).getInAccountStatus();
                     resultList.get(i)
-                        .setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS, inAccountStatus));
+                        .setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, inAccountStatus));
                 }
             }
 

dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java

@@ -78,6 +78,7 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl<ExtBbycfpcxDao, ExtB
 
             PageHelper.startPage(curr, size);
             List<ExtBbycfpcxRespVO> pageList = super.baseMapper.selectByPramsMap(pramsMap);
+            log.info("数据库查询结果pageList {}",pageList);
             PageInfo<ExtBbycfpcxRespVO> pageInfo = new PageInfo<>(pageList);
             // 用于页面返回list对象
             if (pageList.size() > 0) {
@@ -104,6 +105,8 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl<ExtBbycfpcxDao, ExtB
                     pageList.get(i).setRzzt(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzzt));
                     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 (rzlxModels!=null){
                     // for (DictdetaModel model : rzlxModels){

dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml

@@ -7,7 +7,7 @@
                type="com.dxhy.extend.model.ExtBbfpzhcxRespVO">
         <result column="invoice_code" property="invoiceCode"/>
         <result column="bzdh" property="bzdh"/>
-        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
         <result column="invoice_no" property="invoiceNo"/>
         <result column="kprq" property="invoiceDate"/>
         <result column="invoice_type" property="invoiceType"/>
@@ -35,7 +35,7 @@
         <result column="bdk_status" property="bdkStatus"/>
         <result column="export_mark" property="exportMark"/>
         <result column="scan_id" property="scanId"/>
-        <result column="in_account_status" property="inAccountStatus"/>
+<!--        <result column="in_account_status" property="inAccountStatus"/>-->
         <result column="settle_source" property="settleSource"/>
         <result column="settlement_no" property="settlementNo"/>
         <result column="settlement_status" property="settlementStatus"/>
@@ -76,8 +76,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
-            and t.inaccount_status = #{inaccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and t.inaccount_status = #{inAccountStatus}
         </if>
         <if
                 test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
@@ -335,8 +335,8 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
-            and t.in_account_status = #{inaccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
+            and t.in_account_status = #{inAccountStatus}
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}