From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期四, 14 十二月 2023 13:51:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml | 60 ++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 24 deletions(-) diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml index 7b997d0..e6247af 100644 --- a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml +++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml @@ -28,10 +28,12 @@ <result property="createTime" column="create_time"/> <result property="updateBy" column="update_by"/> <result property="updateTime" column="update_time"/> - <result property="cameraId" column="camera_id"/> - <result property="guideP" column="guide_p"/> - <result property="guideT" column="guide_t"/> - <result property="guideZ" column="guide_z"/> + <result property="guideP1" column="guide_p1"/> + <result property="guideT1" column="guide_t1"/> + <result property="guideZ1" column="guide_z1"/> + <result property="guideP2" column="guide_p2"/> + <result property="guideT2" column="guide_t2"/> + <result property="guideZ2" column="guide_z2"/> </resultMap> <resultMap type="ArdAlarmpointsWell" id="wellResult"> @@ -64,10 +66,12 @@ c.create_time, c.update_by, c.update_time, - c.camera_id, - c.guide_p, - c.guide_t, - c.guide_z + c.guide_p1, + c.guide_t1, + c.guide_z1, + c.guide_p2, + c.guide_t2, + c.guide_z2 from ard_alarmpoints_well c left join sys_dept d on d.dept_id = c.dept_id left join sys_user u on u.user_id = c.user_id @@ -132,10 +136,12 @@ <if test="createTime != null">create_time,</if> <if test="updateBy != null">update_by,</if> <if test="updateTime != null">update_time,</if> - <if test="cameraId != null">camera_id,</if> - <if test="guideP != null">guide_p,</if> - <if test="guideT != null">guide_t,</if> - <if test="guideZ != null">guide_z,</if> + <if test="guideP1 != null">guide_p1,</if> + <if test="guideT1 != null">guide_t1,</if> + <if test="guideZ1 != null">guide_z1,</if> + <if test="guideP2 != null">guide_p2,</if> + <if test="guideT2 != null">guide_t2,</if> + <if test="guideZ2 != null">guide_z2,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id},</if> @@ -161,10 +167,12 @@ <if test="createTime != null">#{createTime},</if> <if test="updateBy != null">#{updateBy},</if> <if test="updateTime != null">#{updateTime},</if> - <if test="cameraId != null">#{cameraId},</if> - <if test="guideP != null">#{guideP},</if> - <if test="guideT != null">#{guideT},</if> - <if test="guideZ != null">#{guideZ},</if> + <if test="guideP1 != null">#{guideP1},</if> + <if test="guideT1 != null">#{guideT1},</if> + <if test="guideZ1 != null">#{guideZ1},</if> + <if test="guideP2 != null">#{guideP2},</if> + <if test="guideT2 != null">#{guideT2},</if> + <if test="guideZ2 != null">#{guideZ2},</if> </trim> </insert> @@ -193,10 +201,12 @@ <if test="createTime != null">create_time = #{createTime},</if> <if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateTime != null">update_time = #{updateTime},</if> - <if test="cameraId != null">camera_id = #{cameraId},</if> - <if test="guideP != null">guide_p = #{guideP},</if> - <if test="guideT != null">guide_t = #{guideT},</if> - <if test="guideZ != null">guide_z = #{guideZ},</if> + <if test="guideP1 != null">guide_p1 = #{guideP1},</if> + <if test="guideT1 != null">guide_t1 = #{guideT1},</if> + <if test="guideZ1 != null">guide_z1 = #{guideZ1},</if> + <if test="guideP2 != null">guide_p2 = #{guideP2},</if> + <if test="guideT2 != null">guide_t2 = #{guideT2},</if> + <if test="guideZ2 != null">guide_z2 = #{guideZ2},</if> </trim> where id = #{id} </update> @@ -225,10 +235,12 @@ <if test="createTime != null">create_time = #{createTime},</if> <if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateTime != null">update_time = #{updateTime},</if> - <if test="cameraId != null">camera_id = #{cameraId},</if> - <if test="guideP != null">guide_p = #{guideP},</if> - <if test="guideT != null">guide_t = #{guideT},</if> - <if test="guideZ != null">guide_z = #{guideZ},</if> + <if test="guideP1 != null">guide_p1 = #{guideP1},</if> + <if test="guideT1 != null">guide_t1 = #{guideT1},</if> + <if test="guideZ1 != null">guide_z1 = #{guideZ1},</if> + <if test="guideP2 != null">guide_p2 = #{guideP2},</if> + <if test="guideT2 != null">guide_t2 = #{guideT2},</if> + <if test="guideZ2 != null">guide_z2 = #{guideZ2},</if> </trim> where well_id = #{wellId} </update> -- Gitblit v1.9.3