From ae3dd677f3bbbc26d7c41aebc0e6048e2d20593c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 十二月 2024 14:58:43 +0800
Subject: [PATCH] 1.花材统计报表：增加父类名称
---
src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerMaterialVO.java | 2 ++
src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerMaterialVO.java b/src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerMaterialVO.java
index bdf5a4d..c6ec9d3 100644
--- a/src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerMaterialVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerMaterialVO.java
@@ -22,6 +22,8 @@
private String stationName;
@ApiModelProperty(value = "品类")
private String categoryName;
+ @ApiModelProperty(value = "父品类")
+ private String parentCategoryName;
@ApiModelProperty(value = "商品名称")
private String flowerName;
@ApiModelProperty(value = "等级-FLOWER_LEVEL")
diff --git a/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml b/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
index ea77926..aa62080 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>
--
Gitblit v1.9.3