From bf11e1376ff82a5f32509ee4cb69cbc1782fddf4 Mon Sep 17 00:00:00 2001
From: DYL <Dn1332079466>
Date: 星期六, 08 二月 2025 17:27:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/develop1.0' into dyl_dev
---
zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
index 7fbb5b8..01c8c59 100644
--- a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
@@ -377,16 +377,17 @@
values (#{nodeId}, #{indexId})
</foreach>
</insert>
-
+
<select id="getModelNodeIndexIdByNodeId" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfor">
SELECT mn.node_id nodeId,
mn."name" "name",
ni.index_id indexId,
- ei.energy_id energyId
+ ei.energy_id energyId,
+ ei.index_type indexType
FROM "model_node" mn
LEFT JOIN "node_index" ni ON mn.node_id = ni.node_id
LEFT JOIN energy_index ei on ni.index_id = ei.index_id
- WHERE ni.node_id = #{nodeId}
+ WHERE ni.node_id = #{nodeId}
<if test="energyType!=null and energyType!=''">
and ei.energy_id = #{energyType}
</if>
@@ -404,7 +405,7 @@
<select id="getFirstModeNodeInfo" resultType="com.zhitan.model.domain.ModelNode">
<include refid="selectModelNodeVo"/>
where model_code = #{modelCode} AND parent_id is null
- order by order_num
+ order by order_num
</select>
<select id="selectIndexByNodeIds" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfor">
SELECT mn.node_id nodeId,
@@ -414,10 +415,17 @@
FROM "model_node" mn
LEFT JOIN "node_index" ni ON mn.node_id = ni.node_id
left join energy_index ei on ni.index_id = ei.index_id
- WHERE mn.model_code = #{modelCode}
+ <where>
+ mn.model_code = #{modelCode}
AND mn.node_id in
<foreach collection="nodeIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
+ <if test="modelCode!=null and modelCode!='' and nodeIds.size>0">
+ and ei.index_type='STATISTIC'
+ </if>
+
+ </where>
+
</select>
</mapper>
--
Gitblit v1.9.3