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 |  785 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 530 insertions(+), 255 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 e3e6cfc..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,7 +45,280 @@
         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_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>
+                    <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.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 jp.principal 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.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 jt.report_type = #{task.reportType}
+            </if>
+            <if test="task.reportType == null">
+                and jt.report_type in ( 5,7,8)
+            </if>
+            and jt.is_deleted = 0
+            and jt.house_code is not null
+            order by jt.create_time desc
+        </where>
+    </select>
+
+    <!--查询取保候审任务列表(人房相关)-->
+    <select id="selectTaskPageByPerson" resultType="org.springblade.modules.task.vo.TaskVO">
+        SELECT
+        jh.address AS address_name,
+        jh.district_code AS aoiCode,
+        br.district_code regionCode,
+        br.village_code neiCode,
+        br.town_code streetCode,
+        jt.id,
+        jt.NAME,
+        jt.type,
+        jt.frequency,
+        jt.remark,
+        jt.create_time,
+        jt.create_user,
+        jt.update_time,
+        jt.update_user,
+        jt.STATUS,
+        jt.source,
+        jt.is_deleted,
+        jt.house_code,
+        jt.report_type,
+        jtbre.start_time startTimes,
+        jtbre.reach_time,
+        jtbre.return_time
+        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>
+
+
+    <select id="selectTaskCount" resultType="int" parameterType="org.springblade.modules.task.vo.TaskVO">
+        SELECT
+        count(1)
         FROM
         jczz_task jt
         LEFT JOIN jczz_place jp ON jt.house_code=jp.house_code and jp.is_deleted = 0
@@ -125,7 +399,7 @@
                 and br.town_code = #{task.streetCode}
             </if>
             <if test="task.realName != null and task.realName != null">
-                and bu.name like concat('%', #{task.realName}, '%')
+                and jp.principal like concat('%', #{task.realName}, '%')
             </if>
             <if test="task.phone != null and task.phone != null">
                 and bu.phone like concat('%', #{task.phone}, '%')
@@ -153,22 +427,67 @@
                 and jt.report_type = #{task.reportType}
             </if>
             <if test="task.reportType == null">
-                and jt.report_type in (2,3,4,5,6,7,8)
+                and jt.report_type in (5,8)
             </if>
             and jt.is_deleted = 0
-            and jt.house_code is not null
-            order by jt.create_time desc
         </where>
     </select>
 
-    <!--查询取保候审任务列表(人房相关)-->
-    <select id="selectTaskPageByPerson" resultType="org.springblade.modules.task.vo.TaskVO">
+
+    <select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
         SELECT
-        jh.address AS address_name,
-        jh.district_code AS aoiCode,
-        br.district_code regionCode,
-        br.village_code neiCode,
-        br.town_code streetCode,
+        jt.* ,
+        jda.address_name,
+        jtbre.start_time startTimes,
+        jtbre.reach_time,
+        jtbre.return_time
+        FROM
+        jczz_task jt
+        LEFT JOIN jczz_doorplate_address jda ON jt.house_code = jda.address_code
+        LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+        LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id
+        <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 == ''">
+                AND jt.report_type in (2,3,6,7)
+            </if>
+            <if test="task.userId != null and task.userId != ''">
+                AND jc.res_police_user_id like concat('%',#{task.userId},'%')
+            </if>
+            <if test="isAdministrator==2">
+                <choose>
+                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+                        and jc.code in
+                        <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+                            #{code}
+                        </foreach>
+                    </when>
+                    <otherwise>
+                        and jc.code in ('')
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+    <!--取保候审人员查询-->
+    <select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
+        SELECT
+        IFNULL( jda.address_name, jh.house_name ) AS address_name,
+        jtbre.apply_name,
+        jh.district_code aoiCode,
+        jda.region_code,
+        jg.community_code neiCode,
+        jc.street_code streetCode,
+        bu.real_name realName,
+        ifnull(bu.phone,jtbre.check_telephone) as phone,
         jt.id,
         jt.NAME,
         jt.type,
@@ -182,66 +501,217 @@
         jt.source,
         jt.is_deleted,
         jt.house_code,
-        jt.report_type
+        jt.report_type,
+        jtbre.start_time startTimes,
+        jtbre.reach_time,
+        jtbre.return_time
+        FROM
+        jczz_task jt
+        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
+        LEFT JOIN jczz_house jh ON jt.house_code = jh.house_code and jh.is_deleted = 0
+        LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
+        LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
+        LEFT JOIN jczz_community jc on jc.`code`= jg.community_code and jc.is_deleted = 0
+        LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id and jtbre.is_deleted = 0
+        LEFT JOIN blade_user bu on bu.id = jtbre.check_user_id and bu.is_deleted = 0
+        <where>
+            <if test="task.userId != null and task.userId != ''">
+                AND jt.house_code IN (
+                SELECT
+                jgr.house_code
+                FROM
+                jczz_grid_range jgr
+                LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+                LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+                WHERE
+                jg.is_deleted = 0
+                <if test="task.communityCode != null and task.communityCode != ''">
+                    and jg.community_code = #{task.communityCode}
+                </if>
+                AND jgm.user_id = #{task.userId} )
+            </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.streetCode != null and task.streetCode != null">
+                and jc.street_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.communityName != null and task.communityName != null">
+                and jc.name like concat('%', #{task.communityName}, '%')
+            </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>
+            <if test="isAdministrator==2">
+                <choose>
+                    <when test="task.roleName != null and task.roleName != ''">
+                        <if test="task.roleName=='wgy'">
+                            <choose>
+                                <when test="gridCodeList !=null and gridCodeList.size()>0">
+                                    and jg.grid_code in
+                                    <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+                                        #{code}
+                                    </foreach>
+                                </when>
+                                <otherwise>
+                                    and jg.grid_code in ('')
+                                </otherwise>
+                            </choose>
+                        </if>
+                        <if test="task.roleName=='mj'">
+                            <choose>
+                                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+                                    and jpag.community_code in
+                                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+                                        #{code}
+                                    </foreach>
+                                </when>
+                                <otherwise>
+                                    and jpag.community_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
+                                jpag.community_code in
+                                <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+                                    #{code}
+                                </foreach>
+                                )
+                            </when>
+                            <otherwise>
+                                and
+                                (
+                                jg.grid_code in ('') or jpag.community_code in ('')
+                                )
+                            </otherwise>
+                        </choose>
+                    </otherwise>
+                </choose>
+            </if>
+            and jt.is_deleted = 0
+            and jt.house_code is not null
+            order by jt.create_time desc
+        </where>
+    </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_range jgr on jgr.house_code= jt.house_code
-        LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.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="task.roleName != null and task.roleName != ''">
-                <if test="task.roleName=='wgy'">
-                    <if test="isAdministrator==2">
+            <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 jh.grid_code in
+                                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 jh.grid_code in ('')
+                                and
+                                (
+                                jg.grid_code in ('') or br.village_code in ('')
+                                )
                             </otherwise>
                         </choose>
-                    </if>
-                </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>
-            </if>
-            <if test="isAdministrator==2">
-                <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>
             </if>
@@ -295,204 +765,9 @@
                 and jt.report_type = #{task.reportType}
             </if>
             and jt.is_deleted = 0
-            and jt.house_code is not null
             order by jt.create_time desc
         </where>
-    </select>
 
-
-    <select id="selectTaskCount" resultType="int" parameterType="org.springblade.modules.task.vo.TaskVO">
-        SELECT
-        count( 1 )
-        FROM
-        jczz_task jt
-        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
-        <where>
-            <if test="status != null">
-                and jt.status = #{status}
-            </if>
-            <if test="frequency != null">
-                and jt.frequency = #{frequency}
-            </if>
-            <if test="type != null">
-                and jt.type = #{type}
-            </if>
-            <!-- 取保候审 -->
-            <if test="reportType != null and reportType == 1 ">
-                and jt.report_type = 1
-            </if>
-            <!-- 场所店铺 -->
-            <if test="reportType != null and reportType == 2 ">
-                and jt.report_type in (2,3,4,5,6,7)
-            </if>
-
-            <if test="name != null and name != ''">
-                and jt.name like concat('%', #{name}, '%')
-            </if>
-            <if test="neiCode != null and neiCode != ''">
-                and jda.nei_code = #{neiCode}
-            </if>
-            <if test="userId != null">
-                AND jt.house_code IN (
-                SELECT
-                jgr.house_code
-                FROM
-                jczz_grid_range jgr
-                LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
-                LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
-                WHERE
-                jg.is_deleted = 0
-                AND jgm.user_id = #{userId} )
-            </if>
-        </where>
-        order by jt.create_time desc
-    </select>
-
-
-    <select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
-        SELECT
-        jt.* ,
-        jda.address_name
-        FROM
-        jczz_task jt
-        LEFT JOIN jczz_doorplate_address jda ON jt.house_code = jda.address_code
-        LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
-        <where>
-            <if test="task.reportType != null and task.reportType != '' and task.reportType == 1">
-                AND jt.report_type = #{task.reportType}
-            </if>
-
-            <if test="task.reportType == null or task.reportType == ''">
-                AND jt.report_type in (2,3,6,7)
-            </if>
-            <if test="task.userId != null and task.userId != ''">
-                AND jc.res_police_user_id like concat('%',#{task.userId},'%')
-            </if>
-            <if test="isAdministrator==2">
-                <choose>
-                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
-                        and jc.code in
-                        <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
-                            #{code}
-                        </foreach>
-                    </when>
-                    <otherwise>
-                        and jc.code in ('')
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
-
-    <select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
-        SELECT
-        IFNULL( jda.address_name, jp.location ) AS address_name,
-        jtbre.apply_name,
-        jgr.district_code aoiCode,
-        jda.region_code,
-        jg.community_code neiCode,
-        jc.street_code streetCode,
-        bu.name realName,
-        bu.phone,
-        jt.id,
-        jt.NAME,
-        jt.type,
-        jt.frequency,
-        jt.remark,
-        jt.create_time,
-        jt.create_user,
-        jt.update_time,
-        jt.update_user,
-        jt.STATUS,
-        jt.source,
-        jt.is_deleted,
-        jt.house_code,
-        jt.report_type
-        FROM
-        jczz_task jt
-        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
-        LEFT JOIN jczz_place jp ON locate(jt.house_code,jp.house_code)>0 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_range jgr on jgr.house_code= jt.house_code
-        LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
-        LEFT JOIN jczz_community jc on jc.`code`= jg.community_code and jc.is_deleted = 0
-        LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id and jtbre.is_deleted = 0
-        <where>
-            <if test="task.userId != null and task.userId != ''">
-                AND jt.house_code IN (
-                SELECT
-                jgr.house_code
-                FROM
-                jczz_grid_range jgr
-                LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
-                LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
-                WHERE
-                jg.is_deleted = 0
-                <if test="task.communityCode != null and task.communityCode != ''">
-                    and jg.community_code = #{task.communityCode}
-                </if>
-                AND jgm.user_id = #{task.userId} )
-            </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 jgr.district_code = #{task.aoiCode}
-            </if>
-
-            <if test="task.neiCode != null and task.neiCode != null">
-                and jg.community_code = #{task.neiCode}
-            </if>
-
-            <if test="task.streetCode != null and task.streetCode != null">
-                and jc.street_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.communityName != null and task.communityName != null">
-                and jc.name like concat('%', #{task.communityName}, '%')
-            </if>
-
-            <if test="task.districtName != null and task.districtName != null">
-                and jgr.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
-            and jt.house_code is not null
-            order by jt.create_time desc
-        </where>
     </select>
 
 

--
Gitblit v1.9.3