From 57945f688fd21076e36ab5332028c8b4a6dcf59c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 04 九月 2025 16:37:31 +0800
Subject: [PATCH] 同步密网设备管理代码
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index c2ec226..e92de4b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -137,6 +137,23 @@
if (StringUtils.isNotBlank(eamEquipment.getOperationSystem())) {
queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem());
}
+ if (StringUtils.isNotBlank(eamEquipment.getManufacturingEnterprise())) {
+ queryWrapper.like("e.manufacturing_enterprise", eamEquipment.getManufacturingEnterprise());
+ }
+ if (StringUtils.isNotBlank(eamEquipment.getOriginalValue())) {
+ queryWrapper.like("e.original_value", eamEquipment.getOriginalValue());
+ }
+ if (StringUtils.isNotBlank(eamEquipment.getPerformanceIndicators())) {
+ queryWrapper.like("e.performance_indicators", eamEquipment.getPerformanceIndicators());
+ }
+ if(oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryEndTime())){
+ queryWrapper.ge("e.leave_factory_date",eamEquipment.getLeaveFactoryStartTime());
+ queryWrapper.le("e.leave_factory_date",eamEquipment.getLeaveFactoryEndTime());
+ }
+ if(oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckEndTime())){
+ queryWrapper.ge("e.acceptance_check_date",eamEquipment.getAcceptanceCheckStartTime());
+ queryWrapper.le("e.acceptance_check_date",eamEquipment.getAcceptanceCheckEndTime());
+ }
if (StringUtils.isNotBlank(eamEquipment.getOrgId())) {
//杞﹂棿缂栫爜涓嶄负绌�
List<String> productIds = mdcProductionService.recursionChildren(eamEquipment.getOrgId());
@@ -147,6 +164,9 @@
}
if (StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())) {
queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory());
+ }
+ if (StringUtils.isNotBlank(eamEquipment.getEquipmentUse())) {
+ queryWrapper.like("e.equipment_use", eamEquipment.getEquipmentUse());
}
if (StringUtils.isNotBlank(eamEquipment.getId())) {
queryWrapper.eq("e.id", eamEquipment.getId());
@@ -161,13 +181,13 @@
if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamEquipment.getOrder())) {
queryWrapper.orderByAsc("e." + oConvertUtils.camelToUnderline(column));
} else {
- queryWrapper.orderByDesc("e." + oConvertUtils.camelToUnderline(column));
+ queryWrapper.orderByAsc("e." + oConvertUtils.camelToUnderline(column));
}
} else {
- queryWrapper.orderByDesc("e.create_time");
+ queryWrapper.orderByAsc("e.equipment_code");
}
} else {
- queryWrapper.orderByDesc("e.create_time");
+ queryWrapper.orderByAsc("e.equipment_code");
}
IPage<EamEquipment> ipage = eamEquipmentMapper.queryPageList(page, queryWrapper);
--
Gitblit v1.9.3