From b1e8a099eb3117bcbd5f2e0c9a2eb0accabd8cbf Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 11 Feb 2025 08:56:46 +0800
Subject: [PATCH] 通过风险源点位分析三级防控点查询修改

---
 src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml b/src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml
index 2adb77d..1ac4944 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml
@@ -20,31 +20,36 @@
     <select id="selectRiskSourcePage" resultType="org.springblade.modules.yw.vo.RiskSourceVO">
         select
         yrs.*,
-        yfi.name as firmName
+        yfi.name as firmName,yfi.category,yfi.main_product,yfi.lng,yfi.lat,
+        bdb.dict_value as riskLevelName
         from
         yw_risk_source yrs
         left join yw_firm_info yfi on yfi.id = yrs.firm_id and yfi.is_deleted = 0
+        left join blade_dict_biz bdb on bdb.dict_key = yrs.risk_level and bdb.code = 'risk_level'
         where yrs.is_deleted = 0
         <if test="riskSource.firmId!=null">
             and yrs.firm_id = #{riskSource.firmId}
+        </if>
+        <if test="riskSource.name!=null and riskSource.name!=''">
+            and yrs.name like concat('%',#{riskSource.name},'%')
+        </if>
+        <if test="riskSource.riskLevel!=null">
+            and yrs.risk_level = #{riskSource.riskLevel}
         </if>
     </select>
 
     <!--风险源统计查询-->
     <select id="getStatisticData" resultType="java.util.Map">
         SELECT
-        CASE WHEN risk_level = 1 THEN '一般'
-             WHEN risk_level = 2 THEN '较大'
-        END AS riskLevel,
+        ifnull(bdb.dict_value,'其他') AS riskLevel,
         count(*) AS num
         FROM
-            yw_risk_source
+            yw_risk_source yrs
+        left join blade_dict_biz bdb on bdb.dict_key = yrs.risk_level and bdb.code = 'risk_level'
         WHERE
-            is_deleted = 0
-            AND risk_level IS NOT NULL
-            AND firm_id IS NOT NULL
+            yrs.is_deleted = 0
         GROUP BY
-            risk_level
+            yrs.risk_level
     </select>
 
 </mapper>

--
Gitblit v1.9.3