ariesy 统计查询导出

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

@@ -33,9 +33,9 @@
         from t_dx_invoice t inner join t_dx_record_invoice r on t.uuid = r.uuid
         where t.qs_status = '0'
         and t.qs_date between #{qsrqq} and #{qsrqz}
-        and t.gf_tax_no = #{gfsh}
+        and r.gf_tax_no = #{gfsh}
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' ">
-            and t.comp_code = #{companyCode}
+            and (r.comp_code = #{companyCode} or r.comp_code = '' or r.comp_code is null)
         </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">
             and t.xf_name like CONCAT(#{xfmc},'%')

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

@@ -33,9 +33,9 @@
         where
         t.qs_date between #{qsrqq} and #{qsrqz}
         and t.valid = '1'
-        and t.gf_tax_no = #{gfsh}
+        and r.gf_tax_no = #{gfsh}
         <if test="companyCode != null and companyCode != '' and companyCode != 'null'">
-            and t.comp_code = #{companyCode}
+            and (r.comp_code = #{companyCode} or r.comp_code = '' or r.comp_code is null)
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99' ">
             and t.qs_status = #{qszt}

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

@@ -1194,7 +1194,7 @@
         auth_status as authStatus,
         confirm_user as confirmUser,
         rzh_belong_date as rzhBelongDate,
-        dept_name as deptName
+        dept_name as deptName,
         sn_voucher_number as snVoucherNumber,
         posting_time as postingTime,
         image_id as imageId,

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

@@ -99,7 +99,7 @@
         </if>
 
         <if test="queryParams.companyCode!=null and queryParams.companyCode!=''">
-            and p.comp_code = #{queryParams.companyCode}
+            and (p.comp_code = #{queryParams.companyCode} or p.comp_code = '' or p.comp_code is null)
         </if>
 
         <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!=''">