From cef4d402f712aa7b42a2347970cc536c59dcc301 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 14 Mar 2023 15:07:12 +0800
Subject: [PATCH] 大屏 远程调用添加错误返回

---
 blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.xml |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.xml b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.xml
index 094b169..e0176cb 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.xml
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.fireSupplement.mapper.FireSupplementMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="fireSupplementResultMap" type="org.springblade.modules.fireSupplement.entity.FireSupplementEntity">
+    <resultMap id="fireSupplementResultMap" type="org.springblade.fire.vo.FireSupplementVO">
         <result column="id" property="id"/>
         <result column="fire_id" property="fireId"/>
         <result column="fire_reason" property="fireReason"/>
@@ -16,9 +16,9 @@
         <result column="minor_injury_person" property="minorInjuryPerson"/>
         <result column="serious_injury_person" property="seriousInjuryPerson"/>
         <result column="death_person" property="deathPerson"/>
-        <result column="economic_loss" property="economicLoss"/>
-        <result column="damage_area" property="damageArea"/>
-        <result column="police_resources" property="policeResources"/>
+        <result column="economic_loss" property="economicLoss" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+        <result column="damage_area" property="damageArea" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+        <result column="police_resources" property="policeResources" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
@@ -34,5 +34,15 @@
         select * from sys_fire_supplement where is_deleted = 0
     </select>
 
+    <select id="getVODetail" resultMap="fireSupplementResultMap">
+        select * from sys_fire_supplement where is_deleted = 0
+        <if test="sup.id !=null and sup.id !=''">
+            AND id = #{sup.id}
+        </if>
+        <if test="sup.fireId !=null and sup.fireId !='' ">
+            AND fire_id = #{sup.fireId}
+        </if>
+    </select>
+
 
 </mapper>

--
Gitblit v1.9.3