diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 8c86e4e60..642a79f1b 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -2060,6 +2060,12 @@ ) ) + + and a.send_date = ]]> #{params.beginDate} + + + and a.send_date #{params.endDate} + ) tba, ( select count(1) as hasDoCount @@ -2067,7 +2073,7 @@ where a.del_flag='0' and a.waybill_status!='0' and a.order_status!='2' - and DATE_FORMAT(a.send_date,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m') + and ( (a.operate_employee_code is not null and a.operate_employee_code=#{params.privEmpCode} ) @@ -2075,6 +2081,12 @@ or a.register_man_code=#{params.privEmpCode} ) + + and a.send_date = ]]> #{params.beginDate} + + + and a.send_date #{params.endDate} + ) tbb, ( select count(1) as hasCancelCount @@ -2089,6 +2101,12 @@ ) + + and a.send_date = ]]> #{params.beginDate} + + + and a.send_date #{params.endDate} + ) tbc, ( select count(1) as hasChangeToCount @@ -2100,6 +2118,12 @@ select 1 from emis_waybill_change_to ewcto where a.bill_code=ewcto.bill_code and ewcto.change_from=#{params.privEmpCode} ) + + and a.send_date = ]]> #{params.beginDate} + + + and a.send_date #{params.endDate} + ) tbd