From c330638c372787a29ad0a6b2d5aa60d0193572fa Mon Sep 17 00:00:00 2001
From: fkf <1475794025@qq.com>
Date: Sun, 25 Jun 2023 17:50:50 +0800
Subject: [PATCH] =?UTF-8?q?6-25=20=E6=8A=A5=E8=AD=A6=E4=B8=AD=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/supervise/rms/api/riskalarm/RiskAlarmVo.java   | 1 +
 .../com/supervise/rms/biz/riskalarm/RiskAlarmMapper.xml     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmVo.java
index 6398fefd..93fe7638 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmVo.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmVo.java
@@ -61,4 +61,5 @@ public class RiskAlarmVo implements Vo {
     private String typeCode;
     @ApiModelProperty("风险类别名称")
     private String typeName;
+    private String bigTypeName;
 }
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.xml
index e8f8553f..282d595f 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.xml
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.xml
@@ -2,8 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.supervise.rms.biz.riskalarm.RiskAlarmMapper">
     <select id="listPage" resultType="com.supervise.rms.api.riskalarm.RiskAlarmVo">
-        select *
-        from risk_alarm
+        select a.*,t.name bigTypeName
+        from risk_alarm a
+        left join risk_type l on a.typeSid = l.sid
+        left join risk_type t on l.parentSid = t.sid
         <where>
             ${ew.sqlSegment}
         </where>