Merge remote-tracking branch 'origin/main'

This commit is contained in:
haozq 2025-01-21 14:40:56 +08:00
commit 90f3e318a6
1 changed files with 9 additions and 0 deletions

View File

@ -314,6 +314,15 @@
LEFT JOIN car_supplier cs on cs.id=cpas.sup_id
LEFT JOIN car_slt_plan csp on csp.plan_id=cpa.id
where cpo.`status`=1
<if test="yearMonth!=null and yearMonth!=''">
AND DATE_FORMAT(cpo.out_time,'%Y-%m') = #{yearMonth}
</if>
<if test="year!=null and year!=''">
AND DATE_FORMAT(cpo.out_time,'%Y') = #{year}
</if>
<if test="month!=null and month!=''">
AND DATE_FORMAT(cpo.out_time,'%m') = #{month}
</if>
<if test="type!=null and type!=''">
and cpod.plan_type=#{type}
</if>