From e9e91d14c9436b29292054e3de0445dbb7d8601c Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 12 六月 2024 09:17:14 +0800
Subject: [PATCH] 修改 检测控制取水口列表 增加排序asc
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml | 31 ++++++++++++++++---------------
1 files changed, 16 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 9398b38..93e6e80 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -31,7 +31,8 @@
<select id="selectAll" resultMap="BaseResultMap">
select
- <include refid="part_Column_List" />
+<!-- <include refid="part_Column_List" />-->
+ <include refid="Base_Column_List" />
from ba_block
</select>
@@ -40,17 +41,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 +61,17 @@
<include refid="Base_Column_List" />
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">
- 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
@@ -81,7 +82,7 @@
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
<!--@mbg.generated-->
insert into ba_block (id, `name`, `header`, phone, area, color, remark, deleted)
values (#{id,jdbcType=BIGINT},
@@ -169,10 +170,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