From 411ebc9c06c2f987b4d8deb2a9a1496ab39b55ea Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Mon, 28 Oct 2024 16:34:39 +0800
Subject: [PATCH] Merge branch 'faeture/gzdyh_countRepeated_20241025' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml
index 20a82d1..57d00e0 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml
@@ -233,8 +233,16 @@
<if test="groupByRoad != null and groupByRoad != ''">
road_name as groupByType,
</if>
- <if test="groupByTime != null and groupByTime != '' and groupByTime == 'month'">
- DATE_FORMAT(ci.create_time, '%Y-%m') as groupByType,
+ <if test="groupByTime != null and groupByTime != ''">
+ <if test="groupByTime == 'day'">
+ DATE_FORMAT(ci.create_time, '%Y-%m-%d') as groupByType,
+ </if>
+ <if test="groupByTime == 'month'">
+ DATE_FORMAT(ci.create_time, '%Y-%m') as groupByType,
+ </if>
+ <if test="groupByTime == 'year'">
+ DATE_FORMAT(ci.create_time, '%Y') as groupByType,
+ </if>
</if>
COUNT(DISTINCT fc.case_id) as repeatCount
FROM FilteredCases fc
--
Gitblit v1.8.0