From 48bdd6d0b6c13c99dfc8ec5801d70a056d9db315 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 04 三月 2025 10:43:52 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazmat_manage
---
hazmat-system/src/main/resources/mapper/system/HzTabooWarningMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/hazmat-system/src/main/resources/mapper/system/HzTabooWarningMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzTabooWarningMapper.xml
index 3d734d0..76b8a28 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzTabooWarningMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzTabooWarningMapper.xml
@@ -19,6 +19,10 @@
<result property="remark" column="remark" />
<result property="basicName" column="basic_name" />
<result property="warehouseName" column="warehouse_name" />
+ <result property="reWarehouseId" column="re_warehouse_id" />
+ <result property="reCupboardId" column="re_cupboard_id" />
+ <result property="reWarehouseName" column="re_warehouse_name" />
+ <result property="reCupboardName" column="re_cupboard_name" />
</resultMap>
@@ -26,16 +30,19 @@
select aa.id,aa.warning_type,aa.state,aa.taboo_basic_id,aa.create_by,aa.create_time,aa.update_time,
aa.update_by,aa.version,aa.warehouse_id,a.basic_id,a.company_id,
b.name as basic_name,
- c.name as warehouse_name,aa.cupboard_id,d.cupboard_name as cupboard_name,bb.name as taboo_basic_name
+ c.name as warehouse_name,aa.cupboard_id,d.cupboard_name as cupboard_name,bb.name as taboo_basic_name,
+ aa.re_cupboard_id,aa.re_warehouse_id,dh.cupboard_name re_cupboard_name,bbh.name as re_warehouse_name
from hz_taboo_warning aa
left join hz_entry_record a on aa.entry_id=a.id
left join hz_hazmat_basic b on b.id=a.basic_id
left join hz_warehouse c on c.id=aa.warehouse_id
left join hz_warehouse_cupboard d on d.id=aa.cupboard_id
left join hz_hazmat_basic bb on bb.id=aa.taboo_basic_id
+ left join hz_warehouse_cupboard dh on dh.id=aa.re_cupboard_id
+ left join hz_warehouse bbh on bbh.id=aa.re_warehouse_id
</sql>
<select id="selectHzTabooWarningList" resultMap="HzTabooWarningResult"
- parameterType="com.gkhy.hazmat.system.domain.HzEntryRecord">
+ parameterType="com.gkhy.hazmat.system.domain.HzTabooWarning">
<include refid="selectHzTabooWarningVo"/>
<where>
and aa.del_flag = 0
--
Gitblit v1.9.2