Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-14 0a12bfc2e9594345a0a6cf136bcf234c62450d9d

 ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml

@@ -31,6 +31,12 @@
        <result property="cameraId" column="camera_id"/>
    </resultMap>

    <resultMap type="ArdAlarmpointsWell" id="wellResult">
        <result property="id" column="id"/>
        <result property="wellId" column="well_id"/>
        <result property="type" column="type"/>
    </resultMap>

    <sql id="selectArdAlarmpointsWellVo">
        select c.id,
               c.well_id,
@@ -64,7 +70,7 @@
    <select id="selectArdAlarmpointsWellList" parameterType="ArdAlarmpointsWell" resultMap="ArdAlarmpointsWellResult">
        <include refid="selectArdAlarmpointsWellVo"/>
        <where>
            <if test="wellId != null  and wellId != ''">and c.well_id = #{wellId}</if>
            <if test="wellId != null  and wellId != ''">and c.well_id like ('%${wellId}%')</if>
            <if test="wellNumber != null  and wellNumber != ''">and c.well_number = #{wellNumber}</if>
            <if test="userId != null  and userId != ''">and c.user_id = #{userId}</if>
            <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
@@ -192,13 +198,25 @@
            #{id}
        </foreach>
    </delete>
    <select id="checkWellIdExists" resultType="boolean">
        SELECT COUNT(*)
        FROM ard_alarmpoints_well
        WHERE well_id = #{wellId}
    <select id="checkWellIdExists" resultType="ArdAlarmpointsWell">
        SELECT * FROM ard_alarmpoints_well WHERE well_id = #{wellId} limit 1
    </select>

    <select id="wellByPlanId" parameterType="String" resultMap="ArdAlarmpointsWellResult">
        select * from ard_alarmpoints_well where id in (select alarmpoints_id from ard_app_patrolpoint where patrolplan_id = #{id})
    <select id="wellByPlanId" parameterType="String" resultMap="wellResult">
        select ard_app_patrolpoint.alarmpoints_id as id,ard_alarmpoints_well.well_id, ard_app_patrolpoint."type",ard_alarmpoints_well.longitude,ard_alarmpoints_well.latitude from ard_alarmpoints_well LEFT JOIN ard_app_patrolpoint on ard_app_patrolpoint.alarmpoints_id = ard_alarmpoints_well.id where ard_alarmpoints_well.id in (select alarmpoints_id from ard_app_patrolpoint where patrolplan_id = #{id})
        GROUP BY ard_app_patrolpoint.alarmpoints_id,ard_alarmpoints_well.well_id,ard_app_patrolpoint."type",ard_alarmpoints_well.longitude,ard_alarmpoints_well.latitude
    </select>

    <select id="wellListDept" parameterType="List" resultType="com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellDeptVo">
        Select well.id,well.well_id,well.well_number,well.oil_production,well.well_block,well.production_date,
        well.displacement_mode,well.surrounding_environment,well.well_type,well.installed_load,well.metering_station,
        well.transfer_station,well.dehydration_station,well.run_status,well.longitude,well.latitude,well.altitude,well.dept_id,
        dept.parent_id,dept.ancestors,dept.dept_name
        from ard_alarmpoints_well well
        left join sys_dept dept on well.dept_id = dept.dept_id
        where well.dept_id  in
        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
            #{item}
        </foreach>
    </select>
</mapper>