From 1def07febf17e36217228569a0b4352adaae6189 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 23 四月 2024 11:52:03 +0800
Subject: [PATCH] 保修数量修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 8812d22..2f108ad 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -1144,6 +1144,15 @@
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
Integer userType = user.getUserType();
List<Map<String, Object>> list = calibrationOrderService.getAreaEquipmentList(equipmentNum,"",null);
+ for (Map<String, Object> map : list) {
+ String equipmentId = (String)map.get("id");
+ List<Map<String, Object>> counts = calibrationOrderService.getEquipmentReportRepairCount(equipmentId);
+ if(counts.size()>0){
+ map.put("repairCount",counts.get(0).get("repairCount"));
+ }else{
+ map.put("repairCount","0");
+ }
+ }
return Result.ok(list);
}
@@ -1160,6 +1169,15 @@
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
if(area != null){
list = calibrationOrderService.getAreaEquipmentList("",area.getId(),null);
+ for (Map<String, Object> map : list) {
+ String equipmentId = (String)map.get("id");
+ List<Map<String, Object>> counts = calibrationOrderService.getEquipmentReportRepairCount(equipmentId);
+ if(counts.size()>0){
+ map.put("repairCount",counts.get(0).get("repairCount"));
+ }else{
+ map.put("repairCount","0");
+ }
+ }
}
}else{
List<Map<String, Object>> operationCertificatelist = calibrationOrderService.getOperationCertificate(user.getUsername());
@@ -1167,6 +1185,15 @@
String equipmentIds = (String)operationCertificatelist.get(0).get("equipmentIds");
List<String> strings = Arrays.asList(equipmentIds.split(","));
list = calibrationOrderService.getAreaEquipmentList("","",strings);
+ for (Map<String, Object> map : list) {
+ String equipmentId = (String)map.get("id");
+ List<Map<String, Object>> counts = calibrationOrderService.getEquipmentReportRepairCount(equipmentId);
+ if(counts.size()>0){
+ map.put("repairCount",counts.get(0).get("repairCount"));
+ }else{
+ map.put("repairCount","0");
+ }
+ }
}
}
return Result.ok(list);
--
Gitblit v1.9.3