From fe59ae00aef5cdbc39c6d1b29c84af25071a32ff Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 10 May 2024 16:42:46 +0800
Subject: [PATCH] 防诈宣传优化
---
src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml | 8 +++++++-
src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml | 4 ++++
src/main/java/org/springblade/modules/backblast/vo/BackblastWarnHanRecVO.java | 3 +++
src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml | 8 +++++++-
src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java | 3 +++
src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml | 2 +-
6 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml b/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
index 15f4465..219df2a 100644
--- a/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
@@ -12,11 +12,14 @@
jbpr.*,
br.town_name as townName,
br.name as communityName,
- jpag.pcs_name pcsName
+ jpag.pcs_name pcsName,
+ bd.dept_name
from jczz_backblast_pub_record jbpr
LEFT JOIN jczz_grid jg on jg.grid_code = jbpr.grid_code and jg.is_deleted = 0
LEFT JOIN jczz_police_affairs_grid jpag on jbpr.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
LEFT JOIN blade_region br on br.code = jpag.community_code
+ LEFT JOIN blade_user bu ON bu.id = jbpr.create_user
+ LEFT JOIN blade_dept bd on bd.id = bu.dept_id
where jbpr.is_deleted = 0
<if test="backblastPubRecord.townName != null and backblastPubRecord.townName != ''">
and br.town_name like concat('%',#{backblastPubRecord.townName},'%')
@@ -33,6 +36,9 @@
<if test="backblastPubRecord.address != null and backblastPubRecord.address != ''">
and jbpr.address like concat('%',#{backblastPubRecord.address},'%')
</if>
+ <if test="backblastPubRecord.deptName != null and backblastPubRecord.deptName != ''">
+ and bd.dept_name like concat('%',#{backblastPubRecord.deptName},'%')
+ </if>
<if test="backblastPubRecord.pubContent != null and backblastPubRecord.pubContent != ''">
and jbpr.pub_content like concat('%',#{backblastPubRecord.pubContent},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml b/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml
index 862ebf5..3aef29d 100644
--- a/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml
+++ b/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml
@@ -12,11 +12,14 @@
jbwhr.*,
br.town_name as townName,
br.name as communityName,
- jpag.pcs_name pcsName
+ jpag.pcs_name pcsName,
+ bd.dept_name
from jczz_backblast_warn_han_rec jbwhr
LEFT JOIN jczz_grid jg on jg.grid_code = jbwhr.grid_code and jg.is_deleted = 0
LEFT JOIN jczz_police_affairs_grid jpag on jbwhr.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
LEFT JOIN blade_region br on br.code = jpag.community_code
+ LEFT JOIN blade_user bu ON bu.id = jbwhr.create_user
+ LEFT JOIN blade_dept bd on bd.id = bu.dept_id
where jbwhr.is_deleted = 0
<if test="backblastWarnHanRec.townName != null and backblastWarnHanRec.townName != ''">
and br.town_name like concat('%',#{backblastWarnHanRec.townName},'%')
@@ -51,6 +54,9 @@
<if test="backblastWarnHanRec.createUser != null">
and jbwhr.create_user = #{backblastWarnHanRec.createUser}
</if>
+ <if test="backblastWarnHanRec.deptName != null and backblastWarnHanRec.deptName != ''">
+ and bd.dept_name like concat('%',#{backblastWarnHanRec.deptName},'%')
+ </if>
<if test="backblastWarnHanRec.searchKey!=null and backblastWarnHanRec.searchKey!=''">
and CONCAT(
ifnull(jbwhr.policeman_phone,''),
diff --git a/src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java b/src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java
index 35306d9..8c8ee6a 100644
--- a/src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java
+++ b/src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java
@@ -81,6 +81,9 @@
@ApiModelProperty(value = "派出所名称", example = "")
private String pcsName;
+ @ApiModelProperty(value = "机构名称", example = "")
+ private String deptName;
+
/**
* 反诈宣防对象
*/
diff --git a/src/main/java/org/springblade/modules/backblast/vo/BackblastWarnHanRecVO.java b/src/main/java/org/springblade/modules/backblast/vo/BackblastWarnHanRecVO.java
index 8346254..6925ae7 100644
--- a/src/main/java/org/springblade/modules/backblast/vo/BackblastWarnHanRecVO.java
+++ b/src/main/java/org/springblade/modules/backblast/vo/BackblastWarnHanRecVO.java
@@ -76,4 +76,7 @@
@ApiModelProperty(value = "派出所名称", example = "")
private String pcsName;
+ @ApiModelProperty(value = "机构名称", example = "")
+ private String deptName;
+
}
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 8aeaf17..44eb280 100644
--- a/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
+++ b/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.xml
@@ -79,7 +79,7 @@
</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
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 89fabae..7ac3b9e 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
@@ -77,6 +77,10 @@
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 != ''">
--
Gitblit v1.9.3