将其他票池的未入账字段进行修改

dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java

@@ -275,14 +275,14 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
                     pageList.get(i).setScanId(pageList.get(i).getScanId() == null ? "" : pageList.get(i).getScanId());
                     pageList.get(i)
                         .setInvoiceTypeString(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType()));
-                    if (pageList.get(i).getInAccountStatus()!= null){
+
-                        if ("1".equals(pageList.get(i).getInAccountStatus())){
+                    if ("1".equals(pageList.get(i).getInAccountStatus())){
-                            pageList.get(i).setInAccountStatus("已入账");
+                        pageList.get(i).setInAccountStatus("已入账");
-                        }
+                    }else {
-                        if ("0".equals(pageList.get(i).getInAccountStatus())) {
+                        pageList.get(i).setInAccountStatus("未入账");
-                            pageList.get(i).setInAccountStatus("未入账");
-                        }
                     }
+
+
 //                    log.info("inAccountStatus=====>{}",pageList.get(i).getInAccountStatus());
 //                    pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
 //                            pageList.get(i).getInAccountStatus()));

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

@@ -349,9 +349,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and account_period = #{accountPeriod}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (inaccount_status = '0' or inaccount_status = '' or inaccount_status is null)
+        </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and bzdh = #{bzdh}
         </if>
@@ -446,9 +449,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and account_period = #{accountPeriod}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (inaccount_status = '0' or inaccount_status = '' or inaccount_status is null)
+        </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and bzdh = #{bzdh}
         </if>