From f4e7f658fa5260b93740d26ba813c2f30d0961a1 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 08 八月 2024 14:57:05 +0800
Subject: [PATCH] 指定时间段内挂失总数量(物理卡) 指定时间段内充值总数量(物理卡)

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 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..f2a1069 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,14 +42,14 @@
     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
@@ -60,14 +62,15 @@
     <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
@@ -81,7 +84,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 +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