From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 150 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 008a099..419d7fd 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -27,10 +27,11 @@
br.district_code regionCode,
br.village_code neiCode,
br.town_code streetCode,
- jp.principal as realName,
- jp.principal_phone as phone,
- jp.nine_type ,
- jp.front_type ,
+ jp.principal AS realName,
+ jp.principal_phone AS phone,
+ jp.nine_type,
+ jp.front_type,
+ jp.place_name,
jt.id,
jt.NAME,
jt.type,
@@ -44,14 +45,22 @@
jt.source,
jt.is_deleted,
jt.house_code,
+ jppl.color,
+ jc.category_name,
jt.report_type
FROM
jczz_task jt
- LEFT JOIN jczz_place jp ON jt.house_code=jp.house_code and jp.is_deleted = 0
- LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0
- LEFT JOIN jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
- LEFT JOIN blade_region br on br.code = jg.community_code
- LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
+ LEFT JOIN jczz_place jp ON jt.house_code = jp.house_code
+ AND jp.is_deleted = 0
+ LEFT JOIN blade_user bu ON bu.id = jt.create_user
+ AND bu.is_deleted = 0
+ LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code
+ AND jg.is_deleted = 0
+ LEFT JOIN blade_region br ON br.CODE = jg.community_code
+ LEFT JOIN jczz_police_affairs_grid jpag ON jp.jw_grid_code = jpag.jw_grid_code
+ AND jpag.is_deleted = 0
+ LEFT JOIN jczz_place_poi_label jppl on jppl.place_id = jp.id and jppl.type = 3
+ LEFT JOIN jczz_category jc on jc.category_no = jppl.poi_code
<where>
<if test="isAdministrator==2">
<choose>
@@ -60,7 +69,8 @@
<choose>
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
and jh.grid_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
#{code}
</foreach>
</when>
@@ -73,7 +83,8 @@
<choose>
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
and br.village_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
#{code}
</foreach>
</when>
@@ -153,7 +164,7 @@
and jt.report_type = #{task.reportType}
</if>
<if test="task.reportType == null">
- and jt.report_type in ( 5,8)
+ and jt.report_type in ( 5,7,8)
</if>
and jt.is_deleted = 0
and jt.house_code is not null
@@ -419,7 +430,6 @@
and jt.report_type in (5,8)
</if>
and jt.is_deleted = 0
- and jt.house_code is not null
</where>
</select>
@@ -439,6 +449,10 @@
<where>
<if test="task.reportType != null and task.reportType != '' and task.reportType == 1">
AND jt.report_type = #{task.reportType}
+ </if>
+
+ <if test="task.startTime != null and task.startTime != '' and task.endTime != null and task.endTime != '' ">
+ AND jt.create_time BETWEEN #{task.startTime} and #{task.endTime}
</if>
<if test="task.reportType == null or task.reportType == ''">
@@ -634,4 +648,127 @@
</select>
+ <select id="selectTaskPageByPersonCount" resultType="java.lang.Integer">
+ SELECT
+ count(1)
+ FROM
+ jczz_task jt
+ LEFT JOIN jczz_house jh ON jt.house_code=jh.house_code and jh.is_deleted = 0
+ LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0
+ LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
+ LEFT JOIN blade_region br on br.code = jg.community_code
+ LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id
+ <where>
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="task.roleName != null and task.roleName != ''">
+ <if test="task.roleName=='wgy'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jh.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jh.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="task.roleName=='mj' and isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and br.village_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and br.village_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ </when>
+ <otherwise>
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and
+ (
+ jg.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ or
+ br.village_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+ and
+ (
+ jg.grid_code in ('') or br.village_code in ('')
+ )
+ </otherwise>
+ </choose>
+ </otherwise>
+ </choose>
+ </if>
+ <if test="task.status != null and task.status != null">
+ and jt.status = #{task.status}
+ </if>
+ <if test="task.aoiCode != null and task.aoiCode != null">
+ and jh.district_code = #{task.aoiCode}
+ </if>
+ <if test="task.neiCode != null and task.neiCode != null">
+ and jg.community_code = #{task.neiCode}
+ </if>
+ <if test="task.communityCode != null and task.communityCode != null">
+ and jg.community_code = #{task.communityCode}
+ </if>
+ <if test="task.communityName != null and task.communityName != null">
+ and br.name like concat('%', #{task.communityName}, '%')
+ </if>
+ <if test="task.streetCode != null and task.streetCode != null">
+ and br.town_code = #{task.streetCode}
+ </if>
+ <if test="task.realName != null and task.realName != null">
+ and bu.name like concat('%', #{task.realName}, '%')
+ </if>
+ <if test="task.phone != null and task.phone != null">
+ and bu.phone like concat('%', #{task.phone}, '%')
+ </if>
+ <if test="task.districtName != null and task.districtName != null">
+ and jh.district_name like concat('%', #{task.districtName}, '%')
+ </if>
+ <if test="task.frequency != null and task.frequency != ''">
+ and jt.frequency = #{task.frequency}
+ </if>
+ <if test="task.name != null and task.name != ''">
+ and jt.name like concat('%', #{task.name}, '%')
+ </if>
+ <if test="task.id != null ">and jt.id = #{task.id}</if>
+ <if test="task.type != null ">and jt.type = #{task.type}</if>
+ <if test="task.remark != null and task.remark != ''">and jt.remark = #{task.remark}</if>
+ <if test="task.createTime != null ">and jt.create_time = #{task.createTime}</if>
+ <if test="task.createUser != null ">and jt.create_user = #{task.createUser}</if>
+ <if test="task.updateTime != null ">and jt.update_time = #{task.updateTime}</if>
+ <if test="task.updateUser != null ">and jt.update_user = #{task.updateUser}</if>
+ <if test="task.isDeleted != null ">and jt.is_deleted = #{task.isDeleted}</if>
+ <if test="task.houseCode != null and task.houseCode != ''">and jt.house_code = #{task.houseCode}</if>
+ <if test="task.startTime != null and task.startTime != '' and task.endTime != null and task.endTime != '' ">
+ AND jt.create_time BETWEEN #{task.startTime} and #{task.endTime}
+ </if>
+ <!-- 取保候审 或 报事报修 -->
+ <if test="task.reportType != null and task.reportType != 2 ">
+ and jt.report_type = #{task.reportType}
+ </if>
+ and jt.is_deleted = 0
+ order by jt.create_time desc
+ </where>
+
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3