From ccc9d4533bc7b696f6d539720a6052abc44ff7a5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期日, 11 十月 2026 23:46:17 +0800
Subject: [PATCH] fix: 添加设备名称字段并修复多个查询的排序和分组问题
---
src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml
index eda1827..ed7ab63 100644
--- a/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml
+++ b/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml
@@ -9,6 +9,15 @@
and `name` like concat('%',#{req.name},'%')
</if>
</select>
+ <!--
+ 2026-10-11 淇锛堥�犳暟椤圭洰 R07锛岃 docs/handoff/R07-璁惧涓庤兘鑰�.md 搂7.1锛夛細
+ 鍘� SQL 鏈熬甯� `GROUP BY `code``锛屽湪鏈満 sql_mode 鍚� ONLY_FULL_GROUP_BY 鏃舵姏
+ ER_WRONG_FIELD_WITH_GROUP: Expression #1 of SELECT list is not in GROUP BY clause ...
+ ... 'id' is not functionally dependent on columns in GROUP BY clause
+ 瀵艰嚧銆岃兘鑰楃鐞� 鈫� 鑳芥簮瓒嬪娍銆嶉〉闈㈠繀鐒� 500銆�
+ 鐢变簬 WHERE 宸叉妸 run_date 閿佹涓哄悓涓�澶┿�佷笖 (code, run_date) 澶╃劧鍞竴锛�
+ `GROUP BY code` 鍦ㄨ涔変笂鏄┖鎿嶄綔 鈬� 鐩存帴绉婚櫎锛岃繑鍥炵粨鏋滈泦涓嶅彉銆�
+ -->
<select id="listPageByTrend" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption">
SELECT
*,
@@ -20,8 +29,6 @@
<if test="req.name != null and req.name != ''">
and `name` like concat('%',#{req.name},'%')
</if>
- GROUP BY
- `code`
ORDER BY
update_time DESC;
</select>
--
Gitblit v1.9.3