diff --git a/emis-biz/src/main/resources/mapper/EmisElectronicPagApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisElectronicPagApplyMapper.xml index cbb9ff9dc..f703dda93 100644 --- a/emis-biz/src/main/resources/mapper/EmisElectronicPagApplyMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisElectronicPagApplyMapper.xml @@ -110,6 +110,14 @@ and remark = #{remark} and create_site = #{createSite} and update_site = #{updateSite} + + + and apply_date ]]> #{params.beginApplyDate} + + + and apply_date #{params.endApplyDate} + + order by create_time desc diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 9e9a94309..5945b5c4a 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -536,6 +536,10 @@ and bl_print=#{params.printFlag} + + and bill_code not in( select bill_code from emis_tms_pack_dtl where del_flag='0' ) + + and (