From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml | 146 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 131 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
index 7ac3b9e..8bc58c2 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
@@ -14,6 +14,7 @@
<result property="houseCode" column="house_code"/>
<result property="createUser" column="create_user"/>
<result property="imageUrls" column="image_urls"/>
+ <result property="type" column="type"/>
<result property="status" column="status"/>
<result property="deleteFlag" column="delete_flag"/>
<collection property="taskPlaceRecordVOList" column="id" select="selectPatrolRecordList"
@@ -31,7 +32,7 @@
jg.grid_name,
jp.principal,
jp.principal_phone,
- jp.no_explosion_category,
+ IFNULL(jtnfr.no_fraud_type,jp.no_explosion_category) noExplosionCategory,
br.town_name as streetName,
br.village_name as communityName,
jpag.pcs_name,
@@ -63,6 +64,11 @@
<if test="place.placeName != null and place.placeName != ''">
and jp.place_name like concat('%', #{place.placeName},'%')
</if>
+
+ <if test="place.startTime != null and place.startTime != '' and place.endTime != null and place.endTime != '' ">
+ AND jtnfr.create_time BETWEEN #{place.startTime} and #{place.endTime}
+ </if>
+
<if test="place.principal != null and place.principal != ''">
and jp.principal like concat('%', #{place.principal},'%')
</if>
@@ -81,7 +87,7 @@
and jtnfr.pcs_name like concat('%', #{place.pcsName},'%')
</if>
- <if test="isAdministrator==2">
+ <if test="isAdministrator==2 and place.createUser == null">
<choose>
<when test="place.roleName != null and place.roleName != ''">
<if test="place.roleName=='wgy'">
@@ -100,11 +106,19 @@
<if test="place.roleName=='mj'">
<choose>
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
- and jpag.community_code in
+ and (
+ jpag.community_code in
<foreach collection="regionChildCodesList" item="code" open="(" close=")"
separator=",">
#{code}
</foreach>
+ or
+ jtnfr.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
+ #{code}
+ </foreach>
+ )
</when>
<otherwise>
and jpag.community_code in ('')
@@ -153,6 +167,8 @@
jpr.rectification_image_urls,
jpr.rectification_remark,
jpr.rectification_time,
+ jpr.pdf_path,
+ jpr.original_name,
jpgi.items_name
from jczz_task_place_record jpr
LEFT JOIN jczz_patrol_group_item jpgi on jpr.item_id = jpgi.id
@@ -198,18 +214,7 @@
<select id="selectTaskNoFraudReportingById" parameterType="long" resultMap="TaskNoFraudReportingDTOResult">
SELECT
- jtnfpr.id,
- jtnfpr.task_id,
- jtnfpr.task_name,
- jtnfpr.place_name,
- jtnfpr.remark,
- jtnfpr.update_time,
- jtnfpr.create_time,
- jtnfpr.house_code,
- jtnfpr.create_user,
- jtnfpr.image_urls,
- jtnfpr.status,
- jtnfpr.delete_flag,
+ jtnfpr.*,
jp.id jpid,
jp.place_name,
jp.location,
@@ -373,4 +378,115 @@
</select>
+ <select id="selectTaskNoFraudReportingCount" resultType="java.lang.Integer">
+ select count(1) from jczz_task_no_fraud_reporting jtnfr
+ LEFT JOIN jczz_place jp ON jtnfr.house_code = jp.house_code and jp.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_place_ext jpe ON jpe.place_id = jp.id and jpe.is_deleted = 0
+ LEFT JOIN blade_user bu ON bu.id = jtnfr.create_user and bu.is_deleted = 0
+ LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
+ <where>
+ <if test="place.id != null ">and jtnfr.id = #{place.id}</if>
+ <if test="place.taskId != null ">and jtnfr.task_id = #{place.taskId}</if>
+ <if test="place.taskName != null and place.taskName != ''">and jtnfr.task_name = #{place.taskName}</if>
+ <if test="place.placeName != null and place.placeName != ''">and jtnfr.place_name = #{place.placeName}</if>
+ <if test="place.remark != null and place.remark != ''">and jtnfr.remark = #{place.remark}</if>
+ <if test="place.updateTime != null ">and jtnfr.update_time = #{place.updateTime}</if>
+ <if test="place.createTime != null ">and jtnfr.create_time = #{place.createTime}</if>
+ <if test="place.houseCode != null and place.houseCode != ''">and jtnfr.house_code = #{place.houseCode}</if>
+ <if test="place.createUser != null ">and jtnfr.create_user = #{place.createUser}</if>
+ <if test="place.imageUrls != null and place.imageUrls != ''">and jtnfr.image_urls = #{place.imageUrls}</if>
+ <if test="place.status != null ">and jtnfr.status = #{place.status}</if>
+ <if test="place.deleteFlag != null ">and jtnfr.delete_flag = #{place.deleteFlag}</if>
+
+ <if test="place.noExplosionCategory != null ">and jp.no_explosion_category = #{place.noExplosionCategory}</if>
+
+ <if test="place.placeName != null and place.placeName != ''">
+ and jp.place_name like concat('%', #{place.placeName},'%')
+ </if>
+ <if test="place.principal != null and place.principal != ''">
+ and jp.principal like concat('%', #{place.principal},'%')
+ </if>
+ <if test="place.streetName!=null and place.streetName!=''">
+ and br.town_name like concat('%', #{place.streetName},'%')
+ </if>
+
+ <if test="place.communityName!=null and place.communityName!=''">
+ and br.village_name like concat('%', #{place.communityName},'%')
+ </if>
+ <if test="place.gridName!=null and place.gridName!=''">
+ and jg.grid_name like concat('%', #{place.gridName},'%')
+ </if>
+
+ <if test="place.pcsName!=null and place.pcsName!=''">
+ and jtnfr.pcs_name like concat('%', #{place.pcsName},'%')
+ </if>
+
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="place.roleName != null and place.roleName != ''">
+ <if test="place.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jp.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jp.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="place.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>
+ or
+ jtnfr.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>
+
+ </otherwise>
+ </choose>
+ </otherwise>
+ </choose>
+ </if>
+ </where>
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3