From e2af8608c0d243c6ec061791197fd446b4401b8a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 25 十二月 2024 13:37:01 +0800
Subject: [PATCH] 1.统计报表-历史合伙人可查 2.小程序-花店：分类按照售罄放到最下面 3.小程序-合伙人：质检按照仓库排序
---
src/main/resources/mapper/flower/FlowerMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 711835b..7cfae74 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -198,7 +198,9 @@
order by fzp.rank asc
</when>
<otherwise>
- order by f.price asc
+ order by
+ CASE WHEN f.stock = 0 THEN 1 ELSE 0 END,
+ f.price asc
</otherwise>
</choose>
</select>
@@ -415,7 +417,7 @@
<update id="updateFlowerCategoryInfo">
update t_flower f, t_flower_category fc
- set f.unit = fc.unit, f.color = fc.color
+ set f.unit = fc.unit, f.color = fc.color,f.name=fc.name
where f.category = fc.id and fc.id = #{category}
</update>
<update id="updateBatchTypeRank">
--
Gitblit v1.9.3