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/HzEntryRecordMapper.xml | 10 ++++++++--
1 files changed, 8 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 58c19e9..91a917e 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzEntryRecordMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzEntryRecordMapper.xml
@@ -26,7 +26,7 @@
</resultMap>
<resultMap type="com.gkhy.hazmat.system.domain.HzHazmatBasic" id="hazmatBasicResult">
- <result property="id" column="basic_id" />
+ <result property="id" column="basic_idd" />
<result property="name" column="basic_name" />
<result property="cas" column="basic_cas" />
<result property="minPackage" column="basic_min_package" />
@@ -55,7 +55,7 @@
<sql id="selectEntryRecordVo">
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.id as basic_idd,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,d.id as cupboard_id,d.cupboard_name
from hz_entry_record a
@@ -79,6 +79,12 @@
<if test="state != null">
AND a.state= #{state}
</if>
+ <if test="params.warehouseId !=null">
+ and a.warehouse_id = #{params.warehouseId}
+ </if>
+ <if test="params.cupboardId !=null">
+ and a.cupboard_id = #{params.cupboardId}
+ </if>
</where>
order by a.id desc
</select>
--
Gitblit v1.9.2