This commit is contained in:
linfso 2025-01-05 19:10:00 +08:00
parent dfca82b974
commit 1eefd48f8e

View File

@ -2060,6 +2060,12 @@
)
)
</if>
<if test="params.beginDate != null and params.beginDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and a.send_date <![CDATA[ <= ]]> #{params.endDate}
</if>
) 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')
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
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}
)
</if>
<if test="params.beginDate != null and params.beginDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and a.send_date <![CDATA[ <= ]]> #{params.endDate}
</if>
) tbb,
(
select count(1) as hasCancelCount
@ -2089,6 +2101,12 @@
)
</if>
<if test="params.beginDate != null and params.beginDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and a.send_date <![CDATA[ <= ]]> #{params.endDate}
</if>
) 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}
)
</if>
<if test="params.beginDate != null and params.beginDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and a.send_date <![CDATA[ <= ]]> #{params.endDate}
</if>
) tbd
</select>