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/service/ICalibrationOrderService.java | 6 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml | 10 ++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java | 7 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java | 9 +++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 27 +++++++++++++++++++++++++++
5 files changed, 59 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);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
index 9af04ae..a710239 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
@@ -158,4 +158,11 @@
*/
List<Map<String, Object>> getOperationCertificate(@Param("username")String username);
+
+ /**
+ *棣栭〉鍏徃绾� 鎶�鏈姸鎬佹暟閲忕粺璁�
+ * qsw 2024-4-22
+ */
+ List<Map<String, Object>> getEquipmentReportRepairCount(@Param("equipmentId")String equipmentId);
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
index 89d2608..ab99082 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
@@ -228,5 +228,15 @@
where t1.del_flag = '0' and t1.user_id = #{username}
</select>
+ <select id="getEquipmentReportRepairCount" parameterType="String" resultType="Map">
+ SELECT
+ count(0) AS repairCount
+ FROM
+ mom_eam_equipment_report_repair t1
+ where t1.del_flag = '0'
+ and SUBSTRING(CONVERT(VARCHAR(10), t1.fault_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
+ and t1.equipment_id = #{equipmentId}
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
index e3cded3..c32fd45 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderService.java
@@ -181,5 +181,11 @@
*/
List<Map<String, Object>> getOperationCertificate(String username);
+ /**
+ *棣栭〉 绗洓绾� 璁惧鏈湀缁翠慨娆℃暟锛�
+ * qsw 2024-4-22
+ */
+ List<Map<String, Object>> getEquipmentReportRepairCount(String equipmentId);
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
index fd03c61..ba59e67 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
@@ -360,4 +360,13 @@
public List<Map<String, Object>> getOperationCertificate(String username) {
return this.baseMapper.getOperationCertificate(username);
}
+
+ /**
+ *棣栭〉 绗洓绾� 瀵瑰簲宸ュ尯涓嬶紝璁惧鍙拌处淇℃伅灞曠ず锛�
+ * qsw 2024-4-22
+ */
+ @Override
+ public List<Map<String, Object>> getEquipmentReportRepairCount(String equipmentId) {
+ return this.baseMapper.getEquipmentReportRepairCount(equipmentId);
+ }
}
--
Gitblit v1.9.3