From 62a7f3228c94db41bf57858a6549eb0db033bf1e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 29 五月 2024 11:44:17 +0800
Subject: [PATCH] 2024-05-29 朱宝民

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml |   47 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 30 insertions(+), 17 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 0fee717..93e6e80 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -10,11 +10,12 @@
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="area" jdbcType="INTEGER" property="area" />
     <result column="color" jdbcType="VARCHAR" property="color" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, `name`, `header`, phone, area, color,deleted
+    id, `name`, `header`, phone, area, color, remark, deleted
   </sql>
   <sql id="part_Column_List">
     <!--@mbg.generated-->
@@ -30,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>
 
@@ -39,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>
@@ -59,36 +61,37 @@
     <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
     <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.BaBlock">
+  <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
     <!--@mbg.generated-->
-    insert into ba_block (id, `name`, `header`, phone, area, color, deleted)
+    insert into ba_block (id, `name`, `header`, phone, area, color, remark, deleted)
     values (#{id,jdbcType=BIGINT},
             #{name,jdbcType=VARCHAR},
             #{header,jdbcType=VARCHAR},
             #{phone,jdbcType=VARCHAR},
             #{area,jdbcType=INTEGER},
             #{color,jdbcType=VARCHAR},
+            #{remark,jdbcType=VARCHAR},
             #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
@@ -113,6 +116,9 @@
       <if test="color != null">
         color,
       </if>
+      <if test="remark != null">
+        remark,
+      </if>
      <if test="deleted != null">
        deleted,
       </if>
@@ -135,6 +141,9 @@
       </if>
       <if test="color != null">
         #{color,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
       </if>
       <if test="deleted != null">
         #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
@@ -160,8 +169,11 @@
       <if test="color != null">
         color = #{color,jdbcType=VARCHAR},
       </if>
+      <if test="remark != null">
+        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}
@@ -174,6 +186,7 @@
       phone = #{phone,jdbcType=VARCHAR},
       area = #{area,jdbcType=INTEGER},
       color = #{color,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
       deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>

--
Gitblit v1.8.0