From 2630f6e2d847435930539f3fb2aaabcab922c3d9 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 十二月 2024 15:15:17 +0800
Subject: [PATCH] 1.花材统计报表：增加父类名称
---
src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java | 3 ++-
src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java
index 68430ff..decf1ae 100644
--- a/src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java
@@ -84,7 +84,8 @@
objs[a++] = o.getLoginName(); // 注册手机号
objs[a++] = o.getContactTel(); // 联系方式"
objs[a++] = o.getStationName(); // 所属集货站
- objs[a++] = o.getCategoryName(); // 品类
+// objs[a++] = o.getCategoryName(); // 品类
+ objs[a++] = o.getParentCategoryName(); // 品类
objs[a++] = o.getFlowerName(); //商品名称
// String dictValue = dictCacheClient.getDict("FLOWER_LEVEL", o.getFlowerLevel());
// objs[a++] = dictValue; //等级
diff --git a/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java b/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java
index c8eb798..da1e45e 100644
--- a/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java
+++ b/src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java
@@ -51,7 +51,7 @@
@ApiOperation(value = "花材统计-统计", notes = "花材统计统计")
public ResponseEntity<ReturnDataDTO<FlowerMaterialStaticVO>> getFlowerMaterialStatis(@Validated FlowerMaterialDTO dto
) {
- return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(statisticAnalysisService.getFlowerMaterialStatis(dto), FlowerSaleStatisticVO.class));
+ return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(statisticAnalysisService.getFlowerMaterialStatis(dto), FlowerMaterialStaticVO.class));
}
--
Gitblit v1.9.3