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); 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); } 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> 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); } 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); } }