From b6d93e08adb11e7f4584173d9d44dbc7c7508e9f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 27 十一月 2023 17:50:23 +0800
Subject: [PATCH] 测试冲突

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 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 46df3bd..9398b38 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,16 @@
     <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-->
+    id, `name`
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -23,22 +28,29 @@
     from ba_block
     where id = #{id,jdbcType=BIGINT}
   </select>
-  <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
+
+  <select id="selectAll" resultMap="BaseResultMap">
+    select
+    <include refid="part_Column_List" />
+    from ba_block
+  </select>
+
+<select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
     select
     count(*)
     from ba_block
-      <trim prefix="where ">
+      <trim prefix="where " suffixOverrides="and">
         <if test="name != null">
-          name like '%#{name,jdbcType=VARCHAR}%' and
+          name like concat('%', #{name}, '%') and
         </if>
         <if test="header != null">
-          header = '#{header,jdbcType=VARCHAR}' and
+          header like concat('%', #{header}, '%') and
         </if>
         <if test="phone != null">
           phone = '#{phone,jdbcType=VARCHAR}' and
         </if>
         <if test="area != null">
-          area = #{area,jdbcType=INTEGER}
+          area = #{area,jdbcType=INTEGER} and
         </if>
       </trim>
   </select>
@@ -47,9 +59,9 @@
     select
     <include refid="Base_Column_List" />
     from ba_block
-    <trim prefix="where ">
+    <trim prefix="where " suffixOverrides="and">
       <if test="name != null">
-        name like '%#{name,jdbcType=VARCHAR}%' and
+        name like concat('%', #{name}, '%') and
       </if>
       <if test="header != null">
         header = '#{header,jdbcType=VARCHAR}' and
@@ -58,26 +70,27 @@
         phone = '#{phone,jdbcType=VARCHAR}' and
       </if>
       <if test="area != null">
-        area = #{area,jdbcType=INTEGER}
+        area = #{area,jdbcType=INTEGER} 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">
     <!--@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">
@@ -102,6 +115,9 @@
       <if test="color != null">
         color,
       </if>
+      <if test="remark != null">
+        remark,
+      </if>
      <if test="deleted != null">
        deleted,
       </if>
@@ -124,6 +140,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},
@@ -149,6 +168,9 @@
       <if test="color != null">
         color = #{color,jdbcType=VARCHAR},
       </if>
+      <if test="remark != null">
+        color = #{remark,jdbcType=VARCHAR},
+      </if>
       <if test="deleted != null">
         color = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
       </if>
@@ -163,6 +185,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