From c4a9df30886cf5efc674c317a2889d201ed92d8b Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期三, 25 十二月 2024 14:27:59 +0800 Subject: [PATCH] fix: flowerCategory --- src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml b/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml index 35cbbcd..c2334f9 100644 --- a/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml +++ b/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml @@ -62,11 +62,16 @@ <if test="dto.registerTel!=null and dto.registerTel!=''"> AND si.contact_tel LIKE CONCAT('%',#{dto.registerTel}, '%') </if> + <if test="dto.contactTel!=null and dto.contactTel!=''"> + AND si.contact_tel LIKE CONCAT('%',#{dto.contactTel}, '%') + </if> <if test="dto.stationId != null"> AND oi.station_id = #{dto.stationId} </if> <if test="dto.flowerCategory != null"> - AND f.category = #{dto.flowerCategory} + AND ( f.category = #{dto.flowerCategory} or f.category in ( + select id from t_flower_category where parent_id = #{dto.flowerCategory} + )) </if> <if test="dto.flowerLevel != null and dto.flowerLevel != ''"> AND oi.flower_level = #{dto.flowerLevel} @@ -90,6 +95,9 @@ <if test="dto.createEndDate != null"> AND o.payment_time < #{dto.createEndDate} </if> + <if test="dto.orderField !=null and dto.orderField !=''"> + order by ${dto.orderField} ${dto.orderType} + </if> </sql> -- Gitblit v1.9.3