From 29807fea73899a5b775eb2c7d8e1c05ea8bc0c3d Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 02 八月 2024 17:00:31 +0800
Subject: [PATCH] 2024-08-02 朱宝民 优化获取全部取水口接口，包含经纬度及12小时之内的报警信息
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
index 0d21824..4b4bcd7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -26,13 +26,15 @@
select
<include refid="Base_Column_List" />
from ba_block
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT} and deleted = 0
</select>
<select id="selectAll" resultMap="BaseResultMap">
select
- <include refid="part_Column_List" />
+<!-- <include refid="part_Column_List" />-->
+ <include refid="Base_Column_List" />
from ba_block
+ WHERE deleted = 0
</select>
<select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
@@ -40,17 +42,17 @@
count(*)
from ba_block
<trim prefix="where " suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
+ <if test="header != null and header != ''">
header like concat('%', #{header}, '%') and
</if>
- <if test="phone != null">
- phone = '#{phone,jdbcType=VARCHAR}' and
+ <if test="phone != null and phone != ''">
+ phone = #{phone,jdbcType=VARCHAR} and
</if>
<if test="area != null">
- area = #{area,jdbcType=INTEGER} and
+ area = ${area} and
</if>
</trim>
</select>
@@ -60,17 +62,18 @@
<include refid="Base_Column_List" />
from ba_block
<trim prefix="where " suffixOverrides="and">
- <if test="name != null">
+ deleted = 0 and
+ <if test="name != null and name != ''">
name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
- header = '#{header,jdbcType=VARCHAR}' and
+ <if test="header != null and header != ''">
+ header = #{header,jdbcType=VARCHAR} and
</if>
- <if test="phone != null">
- phone = '#{phone,jdbcType=VARCHAR}' and
+ <if test="phone != null and phone != ''">
+ phone = #{phone,jdbcType=VARCHAR} and
</if>
<if test="area != null">
- area = #{area,jdbcType=INTEGER} and
+ area = ${area} and
</if>
</trim>
order by id DESC
@@ -169,10 +172,10 @@
color = #{color,jdbcType=VARCHAR},
</if>
<if test="remark != null">
- color = #{remark,jdbcType=VARCHAR},
+ remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="deleted != null">
- color = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+ deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
--
Gitblit v1.8.0