From 8a6b8211f09d0371483341fbe7906d3952d6da27 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 03 八月 2023 12:02:05 +0800
Subject: [PATCH] 根据车队主键查询三一车辆加入模型全路径提交
---
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index ad01b9c..32259ab 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -15,18 +15,36 @@
</resultMap>
<sql id="selectArdAppPatrolplanVo">
- select patro_end_time, user_id, cycle, create_time, id, plan_name, patro_begin_time from ard_app_patrolplan
+ select
+ ard_app_patrolplan.id,
+ ard_app_patrolplan.patro_end_time,
+ ard_app_patrolplan.user_id,
+ ard_app_patrolplan.cycle,
+ ard_app_patrolplan.create_time,
+ ard_app_patrolplan.plan_name,
+ ard_app_patrolplan.patro_begin_time
+ from
+ ard_app_patrolplan
</sql>
<select id="selectArdAppPatrolplanList" parameterType="ArdAppPatrolplan" resultMap="ArdAppPatrolplanResult">
<include refid="selectArdAppPatrolplanVo"/>
+ left join ard_app_patrolpoint as well on ard_app_patrolplan.id = well.patrolplan_id
+ left join ard_app_patroluser as users on ard_app_patrolplan.id = users.patrolplan_id
<where>
- <if test="patroEndTime != null and patroEndTime != ''"> and patro_end_time = #{patroEndTime}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="cycle != null and cycle != ''"> and cycle = #{cycle}</if>
<if test="planName != null and planName != ''"> and plan_name like '%'||#{planName}||'%'</if>
- <if test="patroBeginTime != null and patroBeginTime != ''"> and patro_begin_time = #{patroBeginTime}</if>
+ <if test="patroBeginTime != null and patroBeginTime != ''"> and patro_begin_time >= #{patroBeginTime}</if>
+ <if test="patroEndTime != null and patroEndTime != ''"> and patro_end_time <= #{patroEndTime}</if>
+ <if test="wellId != null and wellId != ''">
+ and well.alarmpoints_id = (select id from ard_alarmpoints_well where well_id = #{wellId})
+ </if>
+ <if test="pUser != null and pUser != ''">
+ and users.app_user_id = (select user_id from sys_user where nick_name = #{pUser})
+ </if>
</where>
+ group by ard_app_patrolplan.id
</select>
<select id="selectArdAppPatrolplanByPatroEndTime" parameterType="String" resultMap="ArdAppPatrolplanResult">
--
Gitblit v1.9.3