From b9903ead016b8b1aa68eb04b48fca3b53fdab0d3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 30 十二月 2024 10:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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..5fc2324 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; //等级
@@ -120,6 +121,8 @@
@Override
public FlowerSaleStatisticVO getFlowerSaleStatistics(FlowerSaleDTO dto) {
+ dto.setCreateStartDate(parseLocalDateTime(dto.getCreateStartDateStr(), 17, 0, 0, -1));
+ dto.setCreateEndDate(parseLocalDateTime(dto.getCreateEndDateStr(), 17, 0, 0, 0));
return salesStatisticAnalysisMapper.getFlowerSaleStatistics(dto);
}
--
Gitblit v1.9.3