From 016e47ea961d84a186db0bbd45cd6d7eaaa57bc3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 26 Jan 2024 16:30:20 +0800
Subject: [PATCH] 文章添加小区id 字段
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index 264404e..32bbdde 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -195,9 +195,6 @@
#{code}
</foreach>
</when>
- <otherwise>
- and jg.community_code in ('')
- </otherwise>
</choose>
</if>
<if test="vo.roleName!=null and vo.roleName!=''">
@@ -217,6 +214,14 @@
</choose>
</if>
</if>
+
+ <if test="aoiCodeList!=null and aoiCodeList.size()>0">
+ and jda.aoi_code in
+ <foreach collection="aoiCodeList" item="item" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
ORDER BY jtrfr.create_time DESC
</select>
@@ -258,14 +263,14 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
</select>
<select id="getStatisticsCount" resultType="org.springblade.modules.task.vo.TaskReportStatistics">
- ELECT
+ SELECT
count( 1 ) AS total,
ifnull( sum( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END ), 0 ) AS handle
FROM
@@ -273,14 +278,23 @@
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jtrfr.address_code
WHERE is_deleted = 0
<if test="userId != null">
- and create_user = #{userId}
-
+ and jtrfr.create_user = #{userId}
</if>
<if test="houseCode != null and houseCode != ''">
- and address_code = #{houseCode}
+ and jtrfr.address_code = #{houseCode}
</if>
- <if test="neiCode != null and neiCode != ''">
- AND jda.nei_code LIKE concat( #{neiCode}, '%' )
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jda.nei_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jda.nei_code in ('')
+ </otherwise>
+ </choose>
</if>
</select>
--
Gitblit v1.9.3