luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into release

Browse Source
release
yishiqihuasheng 2 years ago
parent 9d03a75b51 f244ca1794
commit 17f1ff2cfc
2 changed files with 36 additions and 37 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 48
      dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
  2. 25
      dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml

48
dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
Unescape View File

@ -284,13 +284,13 @@
<if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'"> <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
and p.bzdh = #{queryParams.bzdh} and p.bzdh = #{queryParams.bzdh}
</if> </if>
<if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'"> <!-- <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">-->
and p.inaccount_status = #{queryParams.inAccountStatus} <!-- and p.inaccount_status = #{queryParams.inAccountStatus}-->
</if> <!-- </if>-->
<if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'"> <!-- <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->
and p.sn_voucher_number = #{queryParams.snVoucherNumber} <!-- and p.sn_voucher_number = #{queryParams.snVoucherNumber}-->
</if> <!-- </if>-->
<if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'"> <if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd} and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
</if> </if>
@ -385,13 +385,13 @@
<if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'"> <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
and p.bzdh = #{queryParams.bzdh} and p.bzdh = #{queryParams.bzdh}
</if> </if>
<if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'"> <!-- <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">-->
and p.inaccount_status = #{queryParams.inAccountStatus} <!-- and p.inaccount_status = #{queryParams.inAccountStatus}-->
</if> <!-- </if>-->
<if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'"> <!-- <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->
and p.sn_voucher_number = #{queryParams.snVoucherNumber} <!-- and p.sn_voucher_number = #{queryParams.snVoucherNumber}-->
</if> <!-- </if>-->
<if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'"> <if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd} and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
</if> </if>
@ -409,9 +409,9 @@
<if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'"> <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
and p.bzdh = #{bzdh} and p.bzdh = #{bzdh}
</if> </if>
<if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'"> <!-- <if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">-->
and p.inaccount_status = #{inaccountStatus} <!-- and p.inaccount_status = #{inaccountStatus}-->
</if> <!-- </if>-->
<if test="queryParams.customsCode!=null and queryParams.customsCode!=''"> <if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
and p.customs_code = #{queryParams.customsCode} and p.customs_code = #{queryParams.customsCode}
@ -879,9 +879,9 @@
<if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'"> <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">
and p.inaccount_status = #{queryParams.inAccountStatus} and p.inaccount_status = #{queryParams.inAccountStatus}
</if> </if>
<if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'"> <!-- <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->
and p.sn_voucher_number = #{queryParams.snVoucherNumber} <!-- and p.sn_voucher_number = #{queryParams.snVoucherNumber}-->
</if> <!-- </if>-->
<if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'"> <if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd} and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
</if> </if>
@ -1114,12 +1114,12 @@
<if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'"> <if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
and p.bzdh = #{queryParams.bzdh} and p.bzdh = #{queryParams.bzdh}
</if> </if>
<if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'"> <!-- <if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">-->
and p.inaccount_status = #{queryParams.inAccountStatus} <!-- and p.inaccount_status = #{queryParams.inAccountStatus}-->
</if> <!-- </if>-->
<if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'"> <!-- <if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">-->
and p.sn_voucher_number = #{queryParams.snVoucherNumber} <!-- and p.sn_voucher_number = #{queryParams.snVoucherNumber}-->
</if> <!-- </if>-->
<if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'"> <if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd} and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
</if> </if>

25
dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml
Unescape View File

@ -318,13 +318,12 @@
</foreach> </foreach>
</if> </if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null'"> <!-- <if test="bzdh != null and bzdh != '' and bzdh != 'null'">-->
and p.bzdh = #{bzdh} <!-- and p.bzdh = #{bzdh}-->
</if> <!-- </if>-->
<!-- <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">-->
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'"> <!-- and p.inaccount_status = #{inAccountStatus}-->
and p.inaccount_status = #{inAccountStatus} <!-- </if>-->
</if>
<if test="queryParams.gfsh!=null and queryParams.gfsh!=''"> <if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
and p.gf_tax_no = #{queryParams.gfsh} and p.gf_tax_no = #{queryParams.gfsh}
@ -422,13 +421,13 @@
</foreach> </foreach>
</if> </if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null'"> <!-- <if test="bzdh != null and bzdh != '' and bzdh != 'null'">-->
and p.bzdh = #{bzdh} <!-- and p.bzdh = #{bzdh}-->
</if> <!-- </if>-->
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'"> <!-- <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">-->
and p.inaccount_status = #{inAccountStatus} <!-- and p.inaccount_status = #{inAccountStatus}-->
</if> <!-- </if>-->
<if test="queryParams.gfsh!=null and queryParams.gfsh!=''"> <if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
and p.gf_tax_no = #{queryParams.gfsh} and p.gf_tax_no = #{queryParams.gfsh}

Write Preview
Loading…
Cancel
Save