From da2c594ade5d69621dd11a13bb758477e2dc079e Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 07 五月 2025 15:57:51 +0800
Subject: [PATCH] 危化品新版修改
---
hazmat-system/src/main/resources/mapper/system/HzHazmatBasicMapper.xml | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/hazmat-system/src/main/resources/mapper/system/HzHazmatBasicMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzHazmatBasicMapper.xml
index b598e3f..bfb143a 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzHazmatBasicMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzHazmatBasicMapper.xml
@@ -20,6 +20,8 @@
<result property="threshold" column="threshold" />
<result property="productSn" column="product_sn" />
<result property="delFlag" column="del_flag" />
+ <result property="peculiarityType" column="peculiarity_type" />
+ <result property="peculiarityNumber" column="peculiarity_number" />
<result property="companyId" column="company_id" />
<result property="version" column="version" />
<result property="createBy" column="create_by" />
@@ -29,14 +31,16 @@
<result property="remark" column="remark" />
<result property="maxEntry" column="max_entry" />
<result property="companyName" column="company_name" />
+ <result property="riskType" column="risk_type"/>
</resultMap>
<sql id="selectHazmatBasicVo">
select a.id, a.name, a.cas, a.hazmat_type,a.min_package, a.kind,a.hazmat_character,a.supplier,a.manufacturer,a.hazmat_format,a.metering,
- a.unit,a.price,a.per_box,a.safe_num,a.threshold,a.product_sn,a.company_id,a.version, a.create_by, a.create_time,
- a.update_by, a.update_time, a.remark,a.max_entry,b.name as company_name
+ a.unit,a.price,a.per_box,a.safe_num,a.threshold,a.product_sn,a.company_id,a.version,a.peculiarity_type,a.peculiarity_number, a.create_by, a.create_time,
+ a.update_by, a.update_time, a.remark,a.max_entry,b.name as company_name,hs.risk_type
from hz_hazmat_basic a
left join sys_company b on b.id=a.company_id
+ LEFT JOIN hz_secientific hs ON a.secientific_id = hs.id
</sql>
<update id="deleteHazmatBasicById" parameterType="java.lang.Long">
@@ -80,4 +84,30 @@
#{basicId}
</foreach>
</select>
+ <select id="basicCount" resultType="com.gkhy.hazmat.system.domain.vo.HzBasicVo">
+ SELECT
+ '易燃品' AS hazmat_character,
+ SUM(FIND_IN_SET('易燃品', hazmat_character) > 0) AS count
+ FROM hz_hazmat_basic WHERE del_flag =0
+ UNION ALL
+ SELECT
+ '有毒品' AS hazmat_character,
+ SUM(FIND_IN_SET('有毒品', hazmat_character) > 0) AS count
+ FROM hz_hazmat_basic WHERE del_flag =0
+ UNION ALL
+ SELECT
+ '氧化品' AS hazmat_character,
+ SUM(FIND_IN_SET('氧化品', hazmat_character) > 0) AS count
+ FROM hz_hazmat_basic WHERE del_flag =0
+ UNION ALL
+ SELECT
+ '腐蚀品' AS hazmat_character,
+ SUM(FIND_IN_SET('腐蚀品', hazmat_character) > 0) AS count
+ FROM hz_hazmat_basic WHERE del_flag =0
+ UNION ALL
+ SELECT
+ '非易燃品' AS hazmat_character,
+ SUM(FIND_IN_SET('非易燃品', hazmat_character) > 0) AS count
+ FROM hz_hazmat_basic WHERE del_flag =0
+ </select>
</mapper>
--
Gitblit v1.9.2