From 8a881a2c54673d4223425f17bc5cae8eef4e5649 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 22 Mar 2024 17:26:43 +0800
Subject: [PATCH] 反诈宣传和反诈预警查询调整

---
 src/main/java/org/springblade/modules/backblast/entity/BackblastWarnHanRecEntity.java            |    1 
 src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml             |  149 ++++++++++++++++++
 src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java             |    1 
 src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.java             |    6 
 src/main/java/org/springblade/modules/backblast/vo/BackblastWarnHanRecVO.java                    |   44 +++++
 src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.java            |    8 
 src/main/java/org/springblade/modules/backblast/service/IBackblastWarnHanRecService.java         |    7 
 src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java                     |   44 +++++
 src/main/java/org/springblade/modules/backblast/service/impl/BackblastWarnHanRecServiceImpl.java |   10 +
 src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java     |   13 +
 src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml              |  150 ++++++++++++++++++
 src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java  |   10 +
 src/main/java/org/springblade/modules/backblast/service/IBackblastPubRecordService.java          |    7 
 src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java    |   10 +
 14 files changed, 454 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java b/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java
index 8de6384..0e3b142 100644
--- a/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java
+++ b/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java
@@ -132,5 +132,16 @@
 		return R.status(backblastPubRecordService.removeByIds(Func.toLongList(ids)));
 	}
 
-
+	/**
+	 * 反炸宣传记录表 自定义详情
+	 * @param backblastPubRecord
+	 * @return
+	 */
+	@GetMapping("/getDetail")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "详情", notes = "传入backblastPubRecord")
+	public R getDetail(BackblastPubRecordVO backblastPubRecord) {
+		BackblastPubRecordVO detail = backblastPubRecordService.getDetail(backblastPubRecord);
+		return R.data(detail);
+	}
 }
diff --git a/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java b/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java
index f35fdb3..829630b 100644
--- a/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java
+++ b/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java
@@ -133,4 +133,14 @@
 	}
 
 
+	/**
+	 * 反炸预警处置记录表 自定义详情
+	 */
+	@GetMapping("/getDetail")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "详情", notes = "传入backblastWarnHanRec")
+	public R getDetail(BackblastWarnHanRecVO backblastWarnHanRec) {
+		BackblastWarnHanRecVO detail = backblastWarnHanRecService.getDetail(backblastWarnHanRec);
+		return R.data(detail);
+	}
 }
diff --git a/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java b/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
index c7177f8..25b5156 100644
--- a/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
+++ b/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
@@ -102,5 +102,6 @@
 	/** 是否删除 0:否  1:是 */
 	@ApiModelProperty(value = "是否删除 0:否  1:是", example = "")
 	@TableField("is_deleted")
+	@TableLogic
 	private Integer isDeleted;
 }
diff --git a/src/main/java/org/springblade/modules/backblast/entity/BackblastWarnHanRecEntity.java b/src/main/java/org/springblade/modules/backblast/entity/BackblastWarnHanRecEntity.java
index 8107389..711f10f 100644
--- a/src/main/java/org/springblade/modules/backblast/entity/BackblastWarnHanRecEntity.java
+++ b/src/main/java/org/springblade/modules/backblast/entity/BackblastWarnHanRecEntity.java
@@ -101,5 +101,6 @@
 	/** 是否删除 0:否  1:是 */
 	@ApiModelProperty(value = "是否删除 0:否  1:是", example = "")
 	@TableField("is_deleted")
+	@TableLogic
 	private Integer isDeleted;
 }
diff --git a/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.java b/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.java
index efd3c8a..46a01ba 100644
--- a/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.java
+++ b/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.java
@@ -45,4 +45,10 @@
 															@Param("gridCodeList") List<String> gridCodeList);
 
 
+	/**
+	 * 反炸宣传记录表 自定义详情
+	 * @param backblastPubRecord
+	 * @return
+	 */
+	BackblastPubRecordVO getDetail(@Param("backblastPubRecord") BackblastPubRecordVO backblastPubRecord);
 }
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 7ce55f1..b3af5dd 100644
--- a/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
@@ -6,9 +6,155 @@
     <resultMap id="backblastPubRecordResultMap" type="org.springblade.modules.backblast.vo.BackblastPubRecordVO">
     </resultMap>
 
-
+    <!--自定义分页列表查询-->
     <select id="selectBackblastPubRecordPage" resultMap="backblastPubRecordResultMap">
-        select * from jczz_backblast_pub_record where is_deleted = 0
+        select
+        jbpr.*,
+        br.town_name as townName,
+        br.name as communityName,
+        jpag.pcs_name pcsName
+        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
+        where jbpr.is_deleted = 0
+        <if test="backblastPubRecord.townName != null and backblastPubRecord.townName != ''">
+            and br.town_name like concat('%',#{backblastPubRecord.townName},'%')
+        </if>
+        <if test="backblastPubRecord.communityName != null and backblastPubRecord.communityName != ''">
+            and jbr.name like concat('%',#{backblastPubRecord.communityName},'%')
+        </if>
+        <if test="backblastPubRecord.pcsName != null and backblastPubRecord.pcsName != ''">
+            and jpag.pcs_name like concat('%',#{backblastPubRecord.pcsName},'%')
+        </if>
+        <if test="backblastPubRecord.houseCode != null and backblastPubRecord.houseCode != ''">
+            and jbpr.house_code = #{backblastPubRecord.houseCode}
+        </if>
+        <if test="backblastPubRecord.address != null and backblastPubRecord.address != ''">
+            and jbpr.address like concat('%',#{backblastPubRecord.address},'%')
+        </if>
+        <if test="backblastPubRecord.pubContent != null and backblastPubRecord.pubContent != ''">
+            and jbpr.pub_content like concat('%',#{backblastPubRecord.pubContent},'%')
+        </if>
+        <if test="backblastPubRecord.policeman != null and backblastPubRecord.policeman != ''">
+            and jbpr.policeman like concat('%',#{backblastPubRecord.policeman},'%')
+        </if>
+        <if test="backblastPubRecord.policemanPhone != null and backblastPubRecord.policemanPhone != ''">
+            and jbpr.policeman_phone like concat('%',#{backblastPubRecord.policemanPhone},'%')
+        </if>
+        <if test="backblastPubRecord.startTime != null and backblastPubRecord.startTime != ''">
+            and date_format(jbpr.create_time,'%Y-%m-%d') &gt;= #{backblastPubRecord.startTime}
+        </if>
+        <if test="backblastPubRecord.endTime != null and backblastPubRecord.endTime != ''">
+            and date_format(jbpr.create_time,'%Y-%m-%d') &lt;= #{backblastPubRecord.endTime}
+        </if>
+        <if test="backblastPubRecord.searchKey!=null and backblastPubRecord.searchKey!=''">
+            and CONCAT(
+            ifnull(jbpr.policeman_phone,''),
+            ifnull(jbpr.address,''),
+            ifnull(jbpr.pub_content,''),
+            ifnull(jbpr.policeman,'')
+            ) like CONCAT ('%', #{backblastPubRecord.searchKey},'%')
+        </if>
+        <if test="isAdministrator==2">
+            <choose>
+                <when test="backblastPubRecord.roleName != null and backblastPubRecord.roleName != ''">
+                    <if test="backblastPubRecord.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="backblastPubRecord.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>
+        order by jbpr.id desc,jbpr.create_time desc
+    </select>
+
+    <!--反炸宣传记录表 自定义详情-->
+    <select id="getDetail" resultType="org.springblade.modules.backblast.vo.BackblastPubRecordVO">
+        select
+        jbpr.*,
+        br.town_name as townName,
+        br.name as communityName,
+        jpag.pcs_name pcsName
+        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
+        where jbpr.is_deleted = 0
+        <if test="backblastPubRecord.id != null">
+            and jbpr.id = #{backblastPubRecord.id}
+        </if>
+        <if test="backblastPubRecord.townName != null and backblastPubRecord.townName != ''">
+            and br.town_name like concat('%',#{backblastPubRecord.townName},'%')
+        </if>
+        <if test="backblastPubRecord.communityName != null and backblastPubRecord.communityName != ''">
+            and jbr.name like concat('%',#{backblastPubRecord.communityName},'%')
+        </if>
+        <if test="backblastPubRecord.pcsName != null and backblastPubRecord.pcsName != ''">
+            and jpag.pcs_name like concat('%',#{backblastPubRecord.pcsName},'%')
+        </if>
+        <if test="backblastPubRecord.houseCode != null and backblastPubRecord.houseCode != ''">
+            and jbpr.house_code = #{backblastPubRecord.houseCode}
+        </if>
+        <if test="backblastPubRecord.address != null and backblastPubRecord.address != ''">
+            and jbpr.address like concat('%',#{backblastPubRecord.address},'%')
+        </if>
+        <if test="backblastPubRecord.pubContent != null and backblastPubRecord.pubContent != ''">
+            and jbpr.pub_content like concat('%',#{backblastPubRecord.pubContent},'%')
+        </if>
+        <if test="backblastPubRecord.policeman != null and backblastPubRecord.policeman != ''">
+            and jbpr.policeman like concat('%',#{backblastPubRecord.policeman},'%')
+        </if>
+        <if test="backblastPubRecord.policemanPhone != null and backblastPubRecord.policemanPhone != ''">
+            and jbpr.policeman_phone like concat('%',#{backblastPubRecord.policemanPhone},'%')
+        </if>
+        order by jbpr.id desc,jbpr.create_time desc
     </select>
 
 
diff --git a/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.java b/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.java
index 0e6a086..3cfcc7f 100644
--- a/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.java
+++ b/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.java
@@ -39,10 +39,16 @@
 	 * @return
 	 */
 	List<BackblastWarnHanRecVO> selectBackblastWarnHanRecPage(IPage page,
-															  @Param("backblastWarnHanRec")  BackblastWarnHanRecVO backblastWarnHanRec,
+															  @Param("backblastWarnHanRec") BackblastWarnHanRecVO backblastWarnHanRec,
 															  @Param("isAdministrator") Integer isAdministrator,
 															  @Param("regionChildCodesList") List<String> regionChildCodesList,
 															  @Param("gridCodeList") List<String> gridCodeList);
 
 
+	/**
+	 * 反炸预警处置记录表 自定义详情
+	 * @param backblastWarnHanRec
+	 * @return
+	 */
+	BackblastWarnHanRecVO getDetail(@Param("backblastWarnHanRec") BackblastWarnHanRecVO backblastWarnHanRec);
 }
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 9d48774..48da13d 100644
--- a/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml
+++ b/src/main/java/org/springblade/modules/backblast/mapper/BackblastWarnHanRecMapper.xml
@@ -6,9 +6,154 @@
     <resultMap id="backblastWarnHanRecResultMap" type="org.springblade.modules.backblast.vo.BackblastWarnHanRecVO">
     </resultMap>
 
-
+    <!--自定义分页列表查询-->
     <select id="selectBackblastWarnHanRecPage" resultMap="backblastWarnHanRecResultMap">
-        select * from jczz_backblast_warn_han_rec where is_deleted = 0
+        select
+        jbwhr.*,
+        br.town_name as townName,
+        br.name as communityName,
+        jpag.pcs_name pcsName
+        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
+        where jbwhr.is_deleted = 0
+        <if test="backblastWarnHanRec.townName != null and backblastWarnHanRec.townName != ''">
+            and br.town_name like concat('%',#{backblastWarnHanRec.townName},'%')
+        </if>
+        <if test="backblastWarnHanRec.communityName != null and backblastWarnHanRec.communityName != ''">
+            and jbr.name like concat('%',#{backblastWarnHanRec.communityName},'%')
+        </if>
+        <if test="backblastWarnHanRec.pcsName != null and backblastWarnHanRec.pcsName != ''">
+            and jpag.pcs_name like concat('%',#{backblastWarnHanRec.pcsName},'%')
+        </if>
+        <if test="backblastWarnHanRec.houseCode != null and backblastWarnHanRec.houseCode != ''">
+            and jbwhr.house_code = #{backblastWarnHanRec.houseCode}
+        </if>
+        <if test="backblastWarnHanRec.address != null and backblastWarnHanRec.address != ''">
+            and jbwhr.address like concat('%',#{backblastWarnHanRec.address},'%')
+        </if>
+        <if test="backblastWarnHanRec.recContent != null and backblastWarnHanRec.recContent != ''">
+            and jbwhr.rec_content like concat('%',#{backblastWarnHanRec.recContent},'%')
+        </if>
+        <if test="backblastWarnHanRec.policeman != null and backblastWarnHanRec.policeman != ''">
+            and jbwhr.policeman like concat('%',#{backblastWarnHanRec.policeman},'%')
+        </if>
+        <if test="backblastWarnHanRec.policemanPhone != null and backblastWarnHanRec.policemanPhone != ''">
+            and jbwhr.policeman_phone like concat('%',#{backblastWarnHanRec.policemanPhone},'%')
+        </if>
+        <if test="backblastWarnHanRec.startTime != null and backblastWarnHanRec.startTime != ''">
+            and date_format(jbwhr.create_time,'%Y-%m-%d') &gt;= #{backblastWarnHanRec.startTime}
+        </if>
+        <if test="backblastWarnHanRec.endTime != null and backblastWarnHanRec.endTime != ''">
+            and date_format(jbwhr.create_time,'%Y-%m-%d') &lt;= #{backblastWarnHanRec.endTime}
+        </if>
+        <if test="backblastWarnHanRec.searchKey!=null and backblastWarnHanRec.searchKey!=''">
+            and CONCAT(
+            ifnull(jbwhr.policeman_phone,''),
+            ifnull(jbwhr.address,''),
+            ifnull(jbwhr.rec_content,''),
+            ifnull(jbwhr.policeman,'')
+            ) like CONCAT ('%', #{backblastWarnHanRec.searchKey},'%')
+        </if>
+        <if test="isAdministrator==2">
+            <choose>
+                <when test="backblastWarnHanRec.roleName != null and backblastWarnHanRec.roleName != ''">
+                    <if test="backblastWarnHanRec.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="backblastWarnHanRec.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>
+        order by jbwhr.id desc,jbwhr.create_time desc
+    </select>
+
+    <!--自定义分页列表查询-->
+    <select id="getDetail" resultType="org.springblade.modules.backblast.vo.BackblastWarnHanRecVO">
+        select
+        jbwhr.*,
+        br.town_name as townName,
+        br.name as communityName,
+        jpag.pcs_name pcsName
+        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
+        where jbwhr.is_deleted = 0
+        <if test="backblastWarnHanRec.townName != null and backblastWarnHanRec.townName != ''">
+            and br.town_name like concat('%',#{backblastWarnHanRec.townName},'%')
+        </if>
+        <if test="backblastWarnHanRec.communityName != null and backblastWarnHanRec.communityName != ''">
+            and jbr.name like concat('%',#{backblastWarnHanRec.communityName},'%')
+        </if>
+        <if test="backblastWarnHanRec.pcsName != null and backblastWarnHanRec.pcsName != ''">
+            and jpag.pcs_name like concat('%',#{backblastWarnHanRec.pcsName},'%')
+        </if>
+        <if test="backblastWarnHanRec.houseCode != null and backblastWarnHanRec.houseCode != ''">
+            and jbwhr.house_code = #{backblastWarnHanRec.houseCode}
+        </if>
+        <if test="backblastWarnHanRec.id != null">
+            and jbwhr.id = #{backblastWarnHanRec.id}
+        </if>
+        <if test="backblastWarnHanRec.address != null and backblastWarnHanRec.address != ''">
+            and jbwhr.address like concat('%',#{backblastWarnHanRec.address},'%')
+        </if>
+        <if test="backblastWarnHanRec.recContent != null and backblastWarnHanRec.recContent != ''">
+            and jbwhr.rec_content like concat('%',#{backblastWarnHanRec.recContent},'%')
+        </if>
+        <if test="backblastWarnHanRec.policeman != null and backblastWarnHanRec.policeman != ''">
+            and jbwhr.policeman like concat('%',#{backblastWarnHanRec.policeman},'%')
+        </if>
+        <if test="backblastWarnHanRec.policemanPhone != null and backblastWarnHanRec.policemanPhone != ''">
+            and jbwhr.policeman_phone like concat('%',#{backblastWarnHanRec.policemanPhone},'%')
+        </if>
     </select>
 
 
diff --git a/src/main/java/org/springblade/modules/backblast/service/IBackblastPubRecordService.java b/src/main/java/org/springblade/modules/backblast/service/IBackblastPubRecordService.java
index f3795c7..32950f8 100644
--- a/src/main/java/org/springblade/modules/backblast/service/IBackblastPubRecordService.java
+++ b/src/main/java/org/springblade/modules/backblast/service/IBackblastPubRecordService.java
@@ -46,4 +46,11 @@
 	 * @return
 	 */
 	boolean addOrUpdateBackblastPubRecordEntity(BackblastPubRecordEntity backblastPubRecord);
+
+	/**
+	 * 反炸宣传记录表 自定义详情
+	 * @param backblastPubRecord
+	 * @return
+	 */
+    BackblastPubRecordVO getDetail(BackblastPubRecordVO backblastPubRecord);
 }
diff --git a/src/main/java/org/springblade/modules/backblast/service/IBackblastWarnHanRecService.java b/src/main/java/org/springblade/modules/backblast/service/IBackblastWarnHanRecService.java
index 138e1ff..0b2cbcb 100644
--- a/src/main/java/org/springblade/modules/backblast/service/IBackblastWarnHanRecService.java
+++ b/src/main/java/org/springblade/modules/backblast/service/IBackblastWarnHanRecService.java
@@ -46,4 +46,11 @@
 	 * @return
 	 */
 	boolean saveOrUpdateBackblastWarnHanRecEntity(BackblastWarnHanRecEntity backblastWarnHanRec);
+
+	/**
+	 * 反炸预警处置记录表 自定义详情
+	 * @param backblastWarnHanRec
+	 * @return
+	 */
+    BackblastWarnHanRecVO getDetail(BackblastWarnHanRecVO backblastWarnHanRec);
 }
diff --git a/src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java b/src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java
index c0da064..6ceb266 100644
--- a/src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/backblast/service/impl/BackblastPubRecordServiceImpl.java
@@ -91,4 +91,14 @@
 			backblastPubRecord.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
 		}
 	}
+
+	/**
+	 * 反炸宣传记录表 自定义详情
+	 * @param backblastPubRecord
+	 * @return
+	 */
+	@Override
+	public BackblastPubRecordVO getDetail(BackblastPubRecordVO backblastPubRecord) {
+		return baseMapper.getDetail(backblastPubRecord);
+	}
 }
diff --git a/src/main/java/org/springblade/modules/backblast/service/impl/BackblastWarnHanRecServiceImpl.java b/src/main/java/org/springblade/modules/backblast/service/impl/BackblastWarnHanRecServiceImpl.java
index 42d8e30..3de71ba 100644
--- a/src/main/java/org/springblade/modules/backblast/service/impl/BackblastWarnHanRecServiceImpl.java
+++ b/src/main/java/org/springblade/modules/backblast/service/impl/BackblastWarnHanRecServiceImpl.java
@@ -63,4 +63,14 @@
 		// 新增
 		return save(backblastWarnHanRec);
 	}
+
+	/**
+	 * 反炸预警处置记录表 自定义详情
+	 * @param backblastWarnHanRec
+	 * @return
+	 */
+	@Override
+	public BackblastWarnHanRecVO getDetail(BackblastWarnHanRecVO backblastWarnHanRec) {
+		return baseMapper.getDetail(backblastWarnHanRec);
+	}
 }
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 5e4daeb..afd2b32 100644
--- a/src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java
+++ b/src/main/java/org/springblade/modules/backblast/vo/BackblastPubRecordVO.java
@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.backblast.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.modules.backblast.entity.BackblastPubRecordEntity;
 import org.springblade.core.tool.node.INode;
 import lombok.Data;
@@ -32,4 +33,47 @@
 public class BackblastPubRecordVO extends BackblastPubRecordEntity {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "社区编号", example = "")
+	private String communityCode;
+
+
+	@ApiModelProperty(value = "角色别名", example = "")
+	private String roleName;
+
+	/**
+	 * 搜索关键字
+	 */
+	@ApiModelProperty(value = "搜索关键字", example = "")
+	private String searchKey;
+
+	/**
+	 * 开始时间
+	 */
+	@ApiModelProperty(value = "开始时间", example = "")
+	private String startTime;
+
+	/**
+	 * 结束时间
+	 */
+	@ApiModelProperty(value = "结束时间", example = "")
+	private String endTime;
+
+	/**
+	 * 乡镇名称
+	 */
+	@ApiModelProperty(value = "乡镇名称", example = "")
+	private String townName;
+
+	/**
+	 * 社区名称
+	 */
+	@ApiModelProperty(value = "社区名称", example = "")
+	private String communityName;
+
+	/**
+	 * 派出所名称
+	 */
+	@ApiModelProperty(value = "派出所名称", example = "")
+	private String pcsName;
+
 }
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 9ef75de..8346254 100644
--- a/src/main/java/org/springblade/modules/backblast/vo/BackblastWarnHanRecVO.java
+++ b/src/main/java/org/springblade/modules/backblast/vo/BackblastWarnHanRecVO.java
@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.backblast.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.modules.backblast.entity.BackblastWarnHanRecEntity;
 import org.springblade.core.tool.node.INode;
 import lombok.Data;
@@ -32,4 +33,47 @@
 public class BackblastWarnHanRecVO extends BackblastWarnHanRecEntity {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "社区编号", example = "")
+	private String communityCode;
+
+
+	@ApiModelProperty(value = "角色别名", example = "")
+	private String roleName;
+
+	/**
+	 * 搜索关键字
+	 */
+	@ApiModelProperty(value = "搜索关键字", example = "")
+	private String searchKey;
+
+	/**
+	 * 开始时间
+	 */
+	@ApiModelProperty(value = "开始时间", example = "")
+	private String startTime;
+
+	/**
+	 * 结束时间
+	 */
+	@ApiModelProperty(value = "结束时间", example = "")
+	private String endTime;
+
+	/**
+	 * 乡镇名称
+	 */
+	@ApiModelProperty(value = "乡镇名称", example = "")
+	private String townName;
+
+	/**
+	 * 社区名称
+	 */
+	@ApiModelProperty(value = "社区名称", example = "")
+	private String communityName;
+
+	/**
+	 * 派出所名称
+	 */
+	@ApiModelProperty(value = "派出所名称", example = "")
+	private String pcsName;
+
 }

--
Gitblit v1.9.3