From a9a2d0f1d8d271985869dd2b26ac29217191ab51 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 10 Dec 2024 11:51:58 +0800
Subject: [PATCH] 应急空间新增字典，查询修改
---
src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml | 19 ++++++++++---------
1 files changed, 10 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 572f52c..0d08ae8 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/RiskSourceMapper.xml
@@ -20,7 +20,7 @@
<select id="selectRiskSourcePage" resultType="org.springblade.modules.yw.vo.RiskSourceVO">
select
yrs.*,
- yfi.name as firmName,yfi.category,yfi.main_product,
+ yfi.name as firmName,yfi.category,yfi.main_product,yfi.lng,yfi.lat,
bdb.dict_value as riskLevelName
from
yw_risk_source yrs
@@ -30,6 +30,9 @@
<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>
@@ -38,18 +41,16 @@
<!--风险源统计查询-->
<select id="getStatisticData" resultType="java.util.Map">
SELECT
- CASE WHEN risk_level = 1 THEN '一般'
- WHEN risk_level = 2 THEN '较大'
- END AS riskLevel,
+ 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
+ AND yrs.risk_level IS NOT NULL
GROUP BY
- risk_level
+ yrs.risk_level
</select>
</mapper>
--
Gitblit v1.9.3