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/InspectionOrderDetailController.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionOrderDetailController.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml | 6 +++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 26 +++++++++++++++-----------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyInspectionOrderDetailMapper.xml | 1 +
5 files changed, 21 insertions(+), 16 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();
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderDetailController.java
index 5ec07c6..c2edd7b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderDetailController.java
@@ -99,7 +99,7 @@
String inspectionProjectId = record.getInspectionProjectId();
InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
- if ("1".equals(inspectionProject.getAnalysisMethod())) {
+ if ("1".equals(inspectionProject.getTestValueType())) {
BigDecimal surfaceValue = inspectionProject.getSurfaceValue();
BigDecimal upValue = inspectionProject.getUpValue();
BigDecimal downValue = inspectionProject.getDownValue();
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionOrderDetailController.java
index f818e55..3a613dc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionOrderDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionOrderDetailController.java
@@ -121,7 +121,7 @@
String inspectionProjectId = (String) record.get("inspectionProjectId");
InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
- if ("1".equals(inspectionProject.getAnalysisMethod())) {
+ if ("1".equals(inspectionProject.getTestValueType())) {
BigDecimal surfaceValue = inspectionProject.getSurfaceValue();
BigDecimal upValue = inspectionProject.getUpValue();
BigDecimal downValue = inspectionProject.getDownValue();
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml
index a66abea..0c8ec70 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml
@@ -13,9 +13,9 @@
t1.quantity,
t1.is_lock isLock,
t2.num as sparePartNum,
- IFNULL(t5.use_quantity,0) as useQuantity,
- IFNULL(t5.outbound_main_quantity,0) as mainQuantity,
- (IFNULL(t5.outbound_main_quantity,0)-IFNULL(t5.use_quantity,0)) as availableQuantity,
+ ISNULL(t5.use_quantity,0) as useQuantity,
+ ISNULL(t5.outbound_main_quantity,0) as mainQuantity,
+ (ISNULL(t5.outbound_main_quantity,0)-ISNULL(t5.use_quantity,0)) as availableQuantity,
t2.name as sparePartName,
t2.model as model,
t2.specification as specification,
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyInspectionOrderDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyInspectionOrderDetailMapper.xml
index 8c1d141..ceb8e03 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyInspectionOrderDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyInspectionOrderDetailMapper.xml
@@ -21,6 +21,7 @@
t1.specialty_inspection_standard_detail_id as specialtyInspectionStandardDetailId,
t1.inspection_project_id as inspectionProjectId,
t2.name as inspectionProjectName,
+ t1.test_value_type as testValueType,
t1.location,
t1.photo,
t1.detection_standard as detectionStandard,
--
Gitblit v1.9.3