From 4a42e08604da919ec975f4c1a04132499ba16728 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 21 八月 2023 18:05:41 +0800
Subject: [PATCH] qsw 优化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 7ce31aa..93ed2a8 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
@@ -118,9 +118,13 @@
if(StringUtils.isNotBlank(equipment.getTechnologyStatus())){
queryWrapper.eq("technology_status",equipment.getTechnologyStatus());
}
+ if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
+ queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
+ }
queryWrapper.eq("status","1");
queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
@@ -138,17 +142,17 @@
eq.setPrecisionParametersTemplateName("");
}
- String processParametersTemplateId = eq.getProcessParametersTemplateId();
- if(StringUtils.isNotBlank(processParametersTemplateId)){
- ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
- if(processParametersTemplate != null){
- eq.setProcessParametersTemplateName(processParametersTemplate.getName());
- }else{
- eq.setProcessParametersTemplateName("");
- }
- }else{
- eq.setProcessParametersTemplateName("");
- }
+// String processParametersTemplateId = eq.getProcessParametersTemplateId();
+// if(StringUtils.isNotBlank(processParametersTemplateId)){
+// ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
+// if(processParametersTemplate != null){
+// eq.setProcessParametersTemplateName(processParametersTemplate.getName());
+// }else{
+// eq.setProcessParametersTemplateName("");
+// }
+// }else{
+// eq.setProcessParametersTemplateName("");
+// }
//鏌ヨ灏佸瓨鍘熷洜鍜屽皝瀛樻棩鏈�
List<EquipmentSealDetail> equipmentSealDetailList = equipmentSealDetailService.lambdaQuery().eq(EquipmentSealDetail::getEquipmentId,eq.getId())
.eq(EquipmentSealDetail::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(EquipmentSealDetail::getCreateTime).list();
--
Gitblit v1.9.3