ariesy 权限功能bug 修复

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

@@ -513,6 +513,14 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
                 vo.setExportAmount(AmountFormatUtil.fmtMicrometer(vo.getExportAmount()));
                 vo.setExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getExportTaxAmount()));
                 vo.setExportYxse(AmountFormatUtil.fmtMicrometer(vo.getExportYxse()));
+
+                if("1".equals(vo.getInaccountStatus())){
+                    vo.setInaccountStatus("已入账");
+                }else{
+                    vo.setInaccountStatus("未入账");
+                }
+
+
                 i++;
             }
         }

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

@@ -35,7 +35,7 @@
         from t_dx_record_invoice t
         where t.invoice_type in ('01','03','08','14','31') and t.auth_status = '4' <!--and rzh_yesorno='1'-->
         and t.gf_tax_no = #{gfsh}
-        and t.comp_code = #{companyCode}
+        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         <if test="skssq != null and skssq != '' and skssq != 'null' ">
             and t.rzh_belong_date = #{skssq}
         </if>

dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml

@@ -58,7 +58,7 @@
             and t.bzdh = #{bzdh}
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
-            and t.inaccount_status = #{inAccountStatus}
+            and (t.inaccount_status != '1' or t.inaccount_status is null)
         </if>
         <if test="customsCode != null and customsCode != '' and customsCode != 'null'">
             and t.customs_code = #{customsCode}

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

@@ -47,7 +47,10 @@
         and t.auth_status = '4' <!--and rzh_yesorno='1'-->
         and t.company = #{company}
         and t.gf_tax_no = #{gfsh}
-        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
+        and t.comp_code = #{companyCode}
+        <if test="skssq != null and skssq != '' and skssq != 'null' ">
+            and t.rzh_belong_date = #{skssq}
+        </if>
         <if test="dklx!=null and dklx!=''">
             <choose>
                 <when test='dklx=="99"'>