From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报（功能码83）报中的控制器时钟去除掉了，通信中间件解决这个报文时，把开阀报中的开阀时间当作控制器时钟，把关阀报中的关阀时间作为控制器时钟； 2、优化代码。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
index 89e644f..472ac7f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDivideMapper.xml
@@ -52,13 +52,13 @@
left join ba_block bbk on bd.blockId = bbk.id
where bd.deleted != 1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
bd.name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
+ <if test="header != null and header != ''">
bd.header = '#{header,jdbcType=VARCHAR}' and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone != ''">
bd.phone = '#{phone,jdbcType=VARCHAR}' and
</if>
<if test="blockName != null">
@@ -81,13 +81,13 @@
left join ba_district bdtv on bd.villageId=bdtv.id
where bd.deleted != 1
<trim prefix="and" suffixOverrides="and">
- <if test="name != null">
+ <if test="name != null and name != ''">
bd.name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
+ <if test="header != null and header != ''">
bd.header = '#{header,jdbcType=VARCHAR}' and
</if>
- <if test="phone != null">
+ <if test="phone != null and phone != ''">
bd.phone = '#{phone,jdbcType=VARCHAR}' and
</if>
<if test="blockName != null">
@@ -97,11 +97,11 @@
order by bd.id DESC
<trim prefix="limit " >
<if test="start != null and count != null">
- #{start}, #{count}
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
</if>
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaDivide">
<!--@mbg.generated-->
insert into ba_divide (id, `name`, countyId,
townId, villageId, blockId,
--
Gitblit v1.8.0