From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml b/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
index f9ebd11..44eb280 100644
--- a/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
+++ b/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
@@ -39,15 +39,17 @@
and jr.community_code like concat('%',#{rotation.regionCode},'%')
</if>
- <if test="rotation.rotationRange != null and rotation.rotationRange != ''"> and jr.rotation_range = #{rotation.rotationRange}</if>
- <if test="rotation.articleId != null "> and jr.article_id = #{rotation.articleId}</if>
- <if test="rotation.publicFlag != null "> and jr.public_flag = #{rotation.publicFlag}</if>
+ <if test="rotation.rotationRange != null and rotation.rotationRange != ''">and jr.rotation_range =
+ #{rotation.rotationRange}
+ </if>
+ <if test="rotation.articleId != null ">and jr.article_id = #{rotation.articleId}</if>
+ <if test="rotation.publicFlag != null ">and jr.public_flag = #{rotation.publicFlag}</if>
<if test="rotation.districtIdList != null and rotation.districtIdList.size() > 0 ">
and (jr.rotation_range like
<foreach collection="rotation.districtIdList" separator=" or jr.rotation_range like" item="id">'%${id}%'
</foreach>
- )
+ ) or jr.rotation_range is null
</if>
<if test="isAdministrator==2">
@@ -77,8 +79,11 @@
</otherwise>
</choose>
</if>
- <if test="rotation.roleName=='inhabitant'">
+ <if test="rotation.roleName=='inhabitant' or rotation.roleName=='xyzt' or rotation.roleName=='xyty'">
and jr.type = 3
+ <if test="rotation.districtIdList == null ">
+ and jr.rotation_range is null
+ </if>
</if>
</when>
<otherwise>
--
Gitblit v1.9.3