From ffe9c08011d25c39880d107a5f3de249d309c1b4 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 13 十一月 2023 12:37:56 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 3c4e12a..42a6cb7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -247,7 +247,8 @@
t1.property_status propertyStatus,
t1.check_period checkPeriod,
t1.next_technology_status_qualification_time nextTechnologyStatusQualificationTime,
- t1.technology_status_qualification_time technologyStatusQualificationTime
+ t1.technology_status_qualification_time technologyStatusQualificationTime,
+ t1.technology_status_verification_type technologyStatusVerificationType
from mom_eam_equipment t1
left join (select * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
where t1.del_flag = 0
@@ -255,7 +256,7 @@
and t1.num like concat('%',#{num},'%')
</if>
<if test="name != null and name != ''">
- and t1.num like concat('%',#{name},'%')
+ and t1.name like concat('%',#{name},'%')
</if>
<if test="model != null and model != ''">
and t1.model like concat('%',#{model},'%')
--
Gitblit v1.9.3