|
|
|
@ -768,8 +768,8 @@ |
|
|
|
|
FROM |
|
|
|
|
t_dx_customs_record t |
|
|
|
|
where t.qs_status = '0' |
|
|
|
|
and t.gf_tax_no = #{gfsh} |
|
|
|
|
and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) |
|
|
|
|
and t.gf_tax_no = #{queryParams.gfsh} |
|
|
|
|
and (t.comp_code = #{queryParams.companyCode} or t.comp_code = '' or t.comp_code is null) |
|
|
|
|
and t.export_mark = '0' |
|
|
|
|
and (t.data_sources = '0' or (t.data_sources != '0' and t.collect_upload_status = '2')) |
|
|
|
|
<if test="queryParams.fillInDateBegin!=null and queryParams.fillInDateBegin!=''"> |
|
|
|
@ -994,9 +994,9 @@ |
|
|
|
|
r.comp_code as compCode |
|
|
|
|
FROM |
|
|
|
|
t_dx_customs t left join t_dx_customs_record r on t.customs_code = r.customs_code |
|
|
|
|
where r.gf_tax_no = #{gfsh} |
|
|
|
|
and (r.comp_code = #{companyCode} or r.comp_code = '' or r.comp_code is null) |
|
|
|
|
t.user_account = #{queryParams.userAccount} |
|
|
|
|
where r.gf_tax_no = #{queryParams.gfsh} |
|
|
|
|
and (r.comp_code = #{queryParams.companyCode} or r.comp_code = '' or r.comp_code is null) |
|
|
|
|
and t.user_account = #{queryParams.userAccount} |
|
|
|
|
<if test="queryParams.qsDateBegin!=null and queryParams.qsDateBegin!=''"> |
|
|
|
|
and t.qs_date >= #{queryParams.qsDateBegin} |
|
|
|
|
</if> |
|
|
|
|