From 34f448ffe2aacb496c15ab5da44a24128e0682be Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期一, 24 二月 2025 17:30:26 +0800
Subject: [PATCH] 修改
---
hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
index 1f28eb0..ab87626 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
@@ -17,6 +17,7 @@
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="warehouseName" column="warehouse_name" />
+ <result property="cupboardName" column="cupboard_name" />
<association property="hazmatBasic" javaType="com.gkhy.hazmat.system.domain.HzHazmatBasic" resultMap="hazmatBasicResult" />
</resultMap>
@@ -38,10 +39,12 @@
<sql id="selectHazmatVo">
select a.id, a.basic_id, a.warehouse_id, a.code,a.remaining, a.state,a.company_id,a.version, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
b.id as basic_id,b.name as basic_name,b.cas as basic_cas,b.hazmat_type as basic_hazmat_type,b.hazmat_character as basic_hazmat_character,
- b.supplier as basic_supplier,b.manufacturer as basic_manufacturer,b.metering as basic_metering,b.unit as basic_unit,b.product_sn,b.min_package as basic_min_package,c.name as warehouse_name
+ b.supplier as basic_supplier,b.manufacturer as basic_manufacturer,b.metering as basic_metering,b.unit as basic_unit,b.product_sn,
+ b.min_package as basic_min_package,c.name as warehouse_name,d.cupboard_name
from hz_hazmat a
left join hz_hazmat_basic b on b.id=a.basic_id
left join hz_warehouse c on c.id=a.warehouse_id
+ left join hz_warehouse_cupboard d on d.id=a.cupboard_id
</sql>
<update id="deleteHazmatById" parameterType="com.gkhy.hazmat.system.domain.HzHazmat">
--
Gitblit v1.9.2