From a7ecb4b14c2e5a56f425f46decc9c203580edd35 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 25 七月 2024 10:56:56 +0800
Subject: [PATCH] 小修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 4 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml | 7 ++++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 3a07433..18dfb59 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -218,7 +218,7 @@
if(StringUtils.isNotBlank(equipment.getName())){
queryWrapper.like("name",equipment.getName());
}
- queryWrapper.eq("equipment_status","1");
+// queryWrapper.eq("equipment_status","1");
queryWrapper.in("technology_status","qualified","limitedUse");
queryWrapper.eq("status","1");
queryWrapper.eq("del_flag",0);
@@ -242,7 +242,7 @@
if(StringUtils.isNotBlank(equipment.getName())){
queryWrapper.like("name",equipment.getName());
}
- queryWrapper.eq("equipment_status","1");
+// queryWrapper.eq("equipment_status","1");
queryWrapper.in("technology_status","qualified","limitedUse");
queryWrapper.in("equipment_importance_id","A","B","C");
queryWrapper.eq("status","1");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml
index b6f68df..0a22cc2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml
@@ -9,7 +9,7 @@
t1.name,
t1.model,
t1.specification,
- t2.depart_name as departName
+ t2.name as departName
FROM
mom_eam_equipment t1
LEFT JOIN mom_base_area t2 ON t1.work_center_id = t2.id
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
index 0951f79..0768753 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml
@@ -13,11 +13,12 @@
<when test="areaId != null and areaId != ''">
and t2.area_id = #{areaId}
</when>
- <otherwise>
- and t2.area_id = '-1'
- </otherwise>
+
</choose>
ORDER BY t1.create_time desc
</select>
+<!-- <otherwise>-->
+<!-- and t2.area_id = '-1'-->
+<!-- </otherwise>-->
</mapper>
--
Gitblit v1.9.3