From 3b58972c757734f0dc4b1ff29a0a179ed564ab64 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 17 七月 2024 11:47:42 +0800
Subject: [PATCH] 2024-07-17 朱宝民 重构命令日志表，返回结果改为text类型

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 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 0b3ddff..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,28 +62,29 @@
     <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
     <trim prefix="limit " >
       <if test="start != null and count != null">
-        #{start,jdbcType=INTEGER}, #{count,jdbcType=INTEGER}
+        #{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, remark, deleted)
     values (#{id,jdbcType=BIGINT},
@@ -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