From 06d3d15a5a08637041cc601101c063b11b07a346 Mon Sep 17 00:00:00 2001
From: net <net@netdeMBP.lan>
Date: 星期五, 14 二月 2025 17:25:21 +0800
Subject: [PATCH] 合并理去杀杀人
---
zhitan-system/src/main/resources/mapper/comprehensivestatistics/YearComprehensiveMapper.xml | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/zhitan-system/target/classes/mapper/comprehensivestatistics/DailyComprehensiveMapper.xml b/zhitan-system/src/main/resources/mapper/comprehensivestatistics/YearComprehensiveMapper.xml
similarity index 69%
copy from zhitan-system/target/classes/mapper/comprehensivestatistics/DailyComprehensiveMapper.xml
copy to zhitan-system/src/main/resources/mapper/comprehensivestatistics/YearComprehensiveMapper.xml
index 0380045..e36e03c 100644
--- a/zhitan-system/target/classes/mapper/comprehensivestatistics/DailyComprehensiveMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/comprehensivestatistics/YearComprehensiveMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhitan.comprehensivestatistics.mapper.DailyComprehensiveMapper">
- <resultMap id="dataItemMap" type="com.zhitan.comprehensivestatistics.domain.DailyComprehensive">
+<mapper namespace="com.zhitan.comprehensivestatistics.mapper.YearComprehensiveMapper">
+ <resultMap id="dataItemMap" type="com.zhitan.comprehensivestatistics.domain.YearComperhensive">
<result column="index_id" property="indexId"/>
<result column="index_name" property="indexName"/>
<result column="time_type" property="timeType"/>
@@ -21,21 +21,9 @@
<result column="value10" property="value10"/>
<result column="value11" property="value11"/>
<result column="value12" property="value12"/>
- <result column="value13" property="value13"/>
- <result column="value14" property="value14"/>
- <result column="value15" property="value15"/>
- <result column="value16" property="value16"/>
- <result column="value17" property="value17"/>
- <result column="value18" property="value18"/>
- <result column="value19" property="value19"/>
- <result column="value20" property="value20"/>
- <result column="value21" property="value21"/>
- <result column="value22" property="value22"/>
- <result column="value23" property="value23"/>
- <result column="value0" property="value0"/>
</resultMap>
<!--鍏ㄥ巶鑳借�楃粺璁�-->
- <select id="getdailyComprehensiveList" resultMap="dataItemMap">
+ <select id="getYearComprehensiveList" resultMap="dataItemMap">
SELECT
aa.index_id,
aa.index_name,
@@ -45,7 +33,7 @@
aa.time_type,
aa.order_num orderNum
FROM
- (
+ (
SELECT
ni.index_id,
ei."name" AS "index_name",
@@ -61,14 +49,13 @@
WHERE
mn.parent_id = #{nodeId}
AND di.data_time >= #{beginTime}
- AND di.data_time < #{endTime}
+ AND di.data_time <= #{endTime}
AND di.time_type = #{timeType}
- <if test="indexStorageId !='' and indexStorageId !=null">
- and ei.energy_id=#{indexStorageId}
- </if>
- ) aa
- GROUP BY
- aa.index_id, aa.index_name, aa.time_type, aa.order_num
+ <if test="indexStorageId !='' and indexStorageId !=null">
+ and ei.energy_id=#{indexStorageId}
+ </if>
+ ) aa
+ GROUP BY aa.index_id, aa.index_name, aa.time_type, aa.order_num
ORDER BY aa.order_num ASC
</select>
@@ -88,6 +75,7 @@
AND di.data_time < #{endTime}
AND di.data_time >= #{beginTime}
AND di.time_type = #{timeType}
- ORDER BY data_time ASC
+ ORDER BY
+ di.time_code;
</select>
</mapper>
--
Gitblit v1.9.3