修改mapper文件

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

@@ -51,10 +51,11 @@
         t.customs_scan_id,t.dept_name businessName,t.in_account_status,t.voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date,
         data_sources,t.image_id,t.posting_time,t.account_period
         from t_dx_customs_record t
-        where export_mark = '0' and t.gf_tax_no in
-        <foreach close=")" collection="gfsh" index="index" item="item" open="(" separator=",">
-            #{item}
-        </foreach>
+        where export_mark = '0'
+<!--        and t.gf_tax_no in-->
+<!--        <foreach close=")" collection="gfsh" index="index" item="item" open="(" separator=",">-->
+<!--            #{item}-->
+<!--        </foreach>-->
         <if test="keyWord != null and keyWord != '' and keyWord != 'null'">
             and t.customs_code like CONCAT('%',#{keyWord},'%')
         </if>
@@ -146,6 +147,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
+            and t.comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
+            and (t.comp_code = '' or t.comp_code is null)
+        </if>
         order by t.fill_in_date desc
     </select>
 
@@ -155,10 +162,11 @@
         count(1) hjsl,
         sum(t.tax_amount) hjse
         from t_dx_customs_record t
-        where export_mark = '0' and t.gf_tax_no in
-        <foreach close=")" collection="gfsh" index="index" item="item" open="(" separator=",">
-            #{item}
-        </foreach>
+        where export_mark = '0'
+<!--         and t.gf_tax_no in-->
+<!--        <foreach close=")" collection="gfsh" index="index" item="item" open="(" separator=",">-->
+<!--            #{item}-->
+<!--        </foreach>-->
         <if test="keyWord != null and keyWord != '' and keyWord != 'null'">
             and t.customs_code like CONCAT('%',#{keyWord},'%')
         </if>
@@ -250,6 +258,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
+            and t.comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
+            and (t.comp_code = '' or  t.comp_code is null)
+        </if>
     </select>