From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml b/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
index ea77926..67746bd 100644
--- a/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
+++ b/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
@@ -5,7 +5,8 @@
<select id="getFlowerMaterialPage"
resultType="com.mzl.flower.dto.response.statisticAnalysis.FlowerMaterialVO">
- <include refid="flowerMaterialSql"></include>
+<!-- <include refid="flowerMaterialSql"></include>-->
+ <include refid="flowerMaterialSqlWidthDict"></include>
</select>
<select id="getFlowerMaterialList"
resultType="com.mzl.flower.dto.response.statisticAnalysis.FlowerMaterialVO">
@@ -37,6 +38,7 @@
,si.contact_tel
,s.name as station_name
,fc.name as category_name
+ ,case when fc_parent.id is not null then fc_parent.name else fc.name end as parent_category_name
,f.name as flower_name
,f.`level` as flower_level
,f.unit as flower_unit
@@ -52,7 +54,8 @@
on si.station_id=s.id
left join t_flower_category fc
on f.category=fc.id
-
+ left join t_flower_category fc_parent
+ on fc.parent_id=fc_parent.id
-- and u.deleted=0 and s.deleted=0 and fc.deleted=0
<include refid="flowerMaterialSql_where"></include>
<if test="dto.orderField !=null and dto.orderField !=''">
@@ -68,6 +71,7 @@
,si.contact_tel
,s.name as station_name
,fc.name as category_name
+ ,case when fc_parent.id is not null then fc_parent.name else fc.name end as parent_category_name
,f.name as flower_name
,f.`level` as flower_level
,f.unit as flower_unit
@@ -85,6 +89,8 @@
on si.station_id=s.id
left join t_flower_category fc
on f.category=fc.id
+ left join t_flower_category fc_parent
+ on fc.parent_id=fc_parent.id
LEFT JOIN (SELECT ct.label, ct.value from t_code_value ct where type_code = 'FLOWER_STATUS') code ON f.status = code.value
LEFT JOIN (SELECT ct.label, ct.value from t_code_value ct where type_code = 'FLOWER_LEVEL') code2 ON f.`level` = code2.value
<include refid="flowerMaterialSql_where"></include>
@@ -119,8 +125,17 @@
))
</if>
- <if test="dto.flowerStatus !=null and dto.flowerStatus !=''">
- AND f.status = #{dto.flowerStatus}
+<!-- <if test="dto.flowerStatus != null and dto.flowerStatus != ''">-->
+<!-- <if test="dto.flowerStatus == 'OFF'">-->
+<!-- AND f.status IN ('OFF', 'FORCE_OFF')-->
+<!-- </if>-->
+<!-- <if test="dto.flowerStatus != 'OFF'">-->
+<!-- AND f.status = #{dto.flowerStatus}-->
+<!-- </if>-->
+<!-- </if>-->
+
+ <if test="dto.flowerStatus != null and dto.flowerStatus != ''">
+ AND f.status = #{dto.flowerStatus}
</if>
<if test="dto.flowerLevel !=null and dto.flowerLevel !=''">
AND f.`level` = #{dto.flowerLevel}
--
Gitblit v1.9.3