导出

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

@@ -920,11 +920,11 @@
         where t.qs_status = '0'
         and t.export_mark = '0'
         and (t.data_sources = '0' or (t.data_sources != '0' and t.collect_upload_status = '2'))
-        <if test="gfsh!=null">
-            and t.gf_tax_no = #{gfsh}
+        <if test="queryParams.gfsh!=null">
+            and t.gf_tax_no = #{queryParams.gfsh}
         </if>
-        <if test="companyCode!=null">
-            and t.comp_code = #{companyCode}
+        <if test="queryParams.companyCode!=null">
+            and (t.comp_code = #{queryParams.companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
         <if test="queryParams.fillInDateBegin!=null and queryParams.fillInDateBegin!=''">
             and t.fill_in_date &gt;= #{queryParams.fillInDateBegin}
@@ -1134,18 +1134,16 @@
         </if>
 
         <if test="queryParams.qsDateBegin!=null and queryParams.qsDateBegin!=''">
-            and to_char(t.qs_date,'yyyy-MM-dd hh24:mi:ss') &gt;= #{queryParams.qsDateBegin}
+            and t.qs_date &gt;= #{queryParams.qsDateBegin}
         </if>
         <if test="queryParams.qsDateEnd!=null and queryParams.qsDateEnd!=''">
-            and to_char(t.qs_date,'yyyy-MM-dd hh24:mi:ss') &lt;= CONCAT(substr(#{queryParams.qsDateEnd},1,10),'
-            23:59:59')
+            and t.qs_date &lt;= CONCAT(substr(#{queryParams.qsDateEnd},1,10),'23:59:59')
         </if>
         <if test="queryParams.fillInDateBegin!=null and queryParams.fillInDateBegin!=''">
-            and to_char(t.fill_in_date,'yyyy-MM-dd hh24:mi:ss') &gt;= #{queryParams.fillInDateBegin}
+            and t.fill_in_date &gt;= #{queryParams.fillInDateBegin}
         </if>
         <if test="queryParams.fillInDateEnd!=null and queryParams.fillInDateEnd!=''">
-            and to_char(t.fill_in_date,'yyyy-MM-dd hh24:mi:ss') &lt;= CONCAT(substr(#{queryParams.fillInDateEnd},1,10),'
-            23:59:59')
+            and t.fill_in_date &lt;= CONCAT(substr(#{queryParams.fillInDateEnd},1,10),'23:59:59')
         </if>
         <if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
             and t.customs_code = #{queryParams.customsCode}