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/HzEntryRecordMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/hazmat-system/src/main/resources/mapper/system/HzEntryRecordMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzEntryRecordMapper.xml
index 11781d4..58c19e9 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzEntryRecordMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzEntryRecordMapper.xml
@@ -4,6 +4,7 @@
<resultMap type="com.gkhy.hazmat.system.domain.HzEntryRecord" id="HzEntryRecordResult">
<result property="id" column="id" />
<result property="warehouseId" column="warehouse_id" />
+ <result property="cupboardId" column="cupboard_id" />
<result property="num" column="num" />
<result property="batchNo" column="batch_no" />
<result property="state" column="state" />
@@ -20,6 +21,7 @@
<result property="remark" column="remark" />
<association property="warehouse" javaType="com.gkhy.hazmat.system.domain.HzWarehouse" resultMap="wareResult" />
<association property="hazmatBasic" javaType="com.gkhy.hazmat.system.domain.HzHazmatBasic" resultMap="hazmatBasicResult" />
+ <association property="cupboard" javaType="com.gkhy.hazmat.system.domain.HzWarehouseCupboard" resultMap="cupboardResult"/>
</resultMap>
@@ -43,16 +45,23 @@
<result property="name" column="warehouse_name" />
</resultMap>
+ <resultMap id="cupboardResult" type="com.gkhy.hazmat.system.domain.HzWarehouseCupboard">
+ <id property="id" column="cupboard_id"/>
+ <result property="cupboardName" column="cupboard_name"/>
+ </resultMap>
+
+
<sql id="selectEntryRecordVo">
- select a.id, a.warehouse_id, a.num,a.batch_no,a.state,a.basic_id,a.company_id,a.start_code,a.end_code,a.code_prex,a.version, a.create_by,
+ select a.id, a.warehouse_id,a.cupboard_id, a.num,a.batch_no,a.state,a.basic_id,a.company_id,a.start_code,a.end_code,a.code_prex,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,b.max_entry,
- c.id as warehouse_id,c.name as warehouse_name
+ c.id as warehouse_id,c.name as warehouse_name,d.id as cupboard_id,d.cupboard_name
from hz_entry_record 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 a.cupboard_id = d.id
</sql>
<select id="selectEntryRecordList" resultMap="HzEntryRecordResult"
parameterType="com.gkhy.hazmat.system.domain.HzEntryRecord">
--
Gitblit v1.9.2