From 1bf6cb4c0bfc149737afa37a1df1c809b29c6139 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 13:57:43 +0800
Subject: [PATCH] 点检测试修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
index 26bc963..8dc1de8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -140,9 +140,9 @@
String id = (String)record.get("id");
// String equipmentId = (String)record.get("equipmentId");
// String status = (String)record.get("status");
-// String inspectionStandardId = (String)record.get("inspectionStandardId");
-// List<InspectionCycleVo> inspectionCycles = inspectionOrderService.getInspectionCycleByEqId(inspectionStandardId);
-// record.put("inspectionCycles",inspectionCycles);
+ String inspectionStandardId = (String)record.get("inspectionStandardId");
+ List<InspectionCycleVo> inspectionCycles = inspectionOrderService.getInspectionCycleByEqId(inspectionStandardId);
+ record.put("inspectionCycles",inspectionCycles);
List<Map<String, Object>> inspectionOrderDetails = inspectionOrderService.getInspectionOrderDetailByOrderId(id);
record.put("inspectionOrderDetails",inspectionOrderDetails);
@@ -720,11 +720,13 @@
String workCenterId = equipment.getWorkCenterId();
Area area = areaService.getById(workCenterId);
- DailyInspectionStandard standard = dailyInspectionStandardService.getOne(new LambdaQueryWrapper<DailyInspectionStandard>()
- .eq(DailyInspectionStandard::getEquipmentId, equipment.getId())
+// DailyInspectionStandard standard = dailyInspectionStandardService.getOne(new LambdaQueryWrapper<DailyInspectionStandard>()
+// .eq(DailyInspectionStandard::getEquipmentId, equipment.getId())
+// .eq(DailyInspectionStandard::getDelFlag, 0)
+// .eq(DailyInspectionStandard::getVersionStatus, "2"));
+ List<DailyInspectionStandard> list = dailyInspectionStandardService.lambdaQuery().eq(DailyInspectionStandard::getEquipmentId, equipment.getId())
.eq(DailyInspectionStandard::getDelFlag, 0)
- .eq(DailyInspectionStandard::getVersionStatus, "2"));
-
+ .eq(DailyInspectionStandard::getVersionStatus, "2").list();
List<Map<String, Object>> list1 = this.getInspectionStandars(equipmentNum,"day",dataTime);
@@ -741,8 +743,10 @@
if(area != null){
mapResult.put("workCenterName",area.getName());
}
- if(standard != null){
- mapResult.put("regulations",standard.getDisUda1());
+ if(list.size() > 0){
+ mapResult.put("regulations",list.get(0).getDisUda1());
+ }else{
+ mapResult.put("regulations","-");
}
mapResult.put("list1",list1);
mapResult.put("list2",list2);
--
Gitblit v1.9.3