From c60767599cf741fde1cb7a10544d8c0ebb8db6a5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 八月 2024 19:36:33 +0800
Subject: [PATCH] 2024-08-08 朱宝民 统计指定月份各天漏算了、统计指定年份各月漏算量
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 81d2965..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">
@@ -47,10 +49,10 @@
header like concat('%', #{header}, '%') and
</if>
<if test="phone != null and phone != ''">
- phone = '#{phone,jdbcType=VARCHAR}' and
+ phone = #{phone,jdbcType=VARCHAR} and
</if>
<if test="area != null">
- area = ${area} and
+ area = #{area,jdbcType=INTEGER} and
</if>
</trim>
</select>
@@ -60,17 +62,18 @@
<include refid="Base_Column_List" />
from ba_block
<trim prefix="where " suffixOverrides="and">
+ deleted = 0 and
<if test="name != null and name != ''">
name like concat('%', #{name}, '%') and
</if>
<if test="header != null and header != ''">
- header = '#{header,jdbcType=VARCHAR}' and
+ header = #{header,jdbcType=VARCHAR} and
</if>
<if test="phone != null and phone != ''">
- phone = '#{phone,jdbcType=VARCHAR}' and
+ phone = #{phone,jdbcType=VARCHAR} and
</if>
<if test="area != null">
- area = ${area} and
+ area = #{area,jdbcType=INTEGER} and
</if>
</trim>
order by id DESC
--
Gitblit v1.8.0