From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期五, 23 二月 2024 14:07:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml index e62fd44..5d4b794 100644 --- a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml +++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml @@ -294,4 +294,19 @@ <= (select cast(sc.config_value as decimal) from sys_config sc where sc.config_key = 'appAlarmPointsDistance') order by f_compute_distance(cast(#{longitude} as decimal),cast(#{latitude} as decimal),aaw.longitude,aaw.latitude) desc limit 1 offset 0 </select> + + <select id="getWellById" resultMap="ArdAlarmpointsWellOnlyResult"> + select aaw.* from ard_alarmpoints_well aaw where aaw.id = #{id} + </select> + + + <select id="conditionList" parameterType="List" + resultType="com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellDeptVo"> + Select * from ard_alarmpoints_well well + where WHERE well.well_id = #{wellId} + and well.dept_id in + <foreach collection="list" index="index" item="item" open="(" separator="," close=")"> + #{item} + </foreach> + </select> </mapper> -- Gitblit v1.9.3