From adda3ce6f8b337dd7c6f238716d37bd520b8e7eb Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 15 Mar 2024 16:41:39 +0800
Subject: [PATCH] 报警记录添加字段+从业人员修改信息更新生日

---
 src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
similarity index 71%
rename from src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml
rename to src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
index c321c3f..18389d4 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.policeAlarmRecords.mapper.PoliceAlarmRecordsMapper">
+<mapper namespace="org.springblade.modules.police.mapper.PoliceAlarmRecordsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="policeAlarmRecordsResultMap" type="org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity">
+    <resultMap id="policeAlarmRecordsResultMap" type="org.springblade.modules.police.entity.PoliceAlarmRecordsEntity">
     </resultMap>
 
 
@@ -11,7 +11,7 @@
         select * from jczz_police_alarm_records where is_deleted = 0
     </select>
 
-    <resultMap type="org.springblade.modules.policeAlarmRecords.dto.PoliceAlarmRecordsDTO" id="PoliceAlarmRecordsDTOResult">
+    <resultMap type="org.springblade.modules.police.dto.PoliceAlarmRecordsDTO" id="PoliceAlarmRecordsDTOResult">
         <result property="id"    column="id"    />
         <result property="houseCode"    column="house_code"    />
         <result property="address"    column="address"    />
@@ -30,6 +30,7 @@
         <result property="jwGridCode"    column="jw_grid_code"    />
         <result property="alarmResponseTime"    column="alarm_response_time"    />
         <result property="alarmDescribe"    column="alarm_describe"    />
+        <result property="publicIncidents"    column="public_incidents"    />
     </resultMap>
 
     <sql id="selectPoliceAlarmRecords">
@@ -42,10 +43,17 @@
             alarm_type,
             injury_flag,
             grid_code,
-            is_deleted,
-            police_id,
             create_time,
-            update_time
+            update_time,
+            police_id,
+            police_name,
+            police_phone,
+            is_deleted,
+            gender,
+            jw_grid_code,
+            alarm_response_time,
+            alarm_describe,
+            public_incidents
         from
             jczz_police_alarm_records
     </sql>
@@ -56,7 +64,7 @@
 <!--        id = #{id}-->
 <!--    </select>-->
 
-<!--    <select id="selectPoliceAlarmRecordsList" parameterType="org.springblade.modules.policeAlarmRecords.dto.PoliceAlarmRecordsDTO" resultMap="PoliceAlarmRecordsDTOResult">-->
+<!--    <select id="selectPoliceAlarmRecordsList" parameterType="rg.springblade.modules.dto.PoliceAlarmRecordsDTO" resultMap="PoliceAlarmRecordsDTOResult">-->
 <!--        <include refid="selectPoliceAlarmRecords"/>-->
 <!--        <where>-->
 <!--            <if test="id != null "> and id = #{id}</if>-->
@@ -67,10 +75,17 @@
 <!--            <if test="alarmType != null  and alarmType != ''"> and alarm_type = #{alarmType}</if>-->
 <!--            <if test="injuryFlag != null "> and injury_flag = #{injuryFlag}</if>-->
 <!--            <if test="gridCode != null  and gridCode != ''"> and grid_code = #{gridCode}</if>-->
-<!--            <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>-->
-<!--            <if test="policeId != null "> and police_id = #{policeId}</if>-->
 <!--            <if test="createTime != null "> and create_time = #{createTime}</if>-->
 <!--            <if test="updateTime != null "> and update_time = #{updateTime}</if>-->
+<!--            <if test="policeId != null "> and police_id = #{policeId}</if>-->
+<!--            <if test="policeName != null  and policeName != ''"> and police_name = #{policeName}</if>-->
+<!--            <if test="policePhone != null  and policePhone != ''"> and police_phone = #{policePhone}</if>-->
+<!--            <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>-->
+<!--            <if test="gender != null "> and gender = #{gender}</if>-->
+<!--            <if test="jwGridCode != null  and jwGridCode != ''"> and jw_grid_code = #{jwGridCode}</if>-->
+<!--            <if test="alarmResponseTime != null "> and alarm_response_time = #{alarmResponseTime}</if>-->
+<!--            <if test="alarmDescribe != null  and alarmDescribe != ''"> and alarm_describe = #{alarmDescribe}</if>-->
+<!--            <if test="publicIncidents != null "> and public_incidents = #{publicIncidents}</if>-->
 <!--        </where>-->
 <!--    </select>-->
 

--
Gitblit v1.9.3