From 876e8a1c9e6e950d51e42f265ad3027869d4f908 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期二, 22 七月 2025 18:26:06 +0800
Subject: [PATCH] 修改点检结果为异常，异常是否报修为否的情况下生成故障数据的逻辑；设备附件列表新增描述信息丢失
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSysFilesServiceImpl.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java | 9 ++++++---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentEfficiencyAnalyzeDto.java | 2 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 1 +
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
index 0228d7c..94195b3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
@@ -136,11 +136,11 @@
throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
}
if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
- throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽鍊熷嚭锛�");
+ throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽灏佸瓨锛�");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
- throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞鍊熺敤璁板綍锛�");
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞灏佸瓨璁板綍锛�");
}
request.setReportUser(sysUser.getUsername());
return equipmentSealUpMapper.insert(request) > 0;
@@ -161,9 +161,12 @@
if (equipment == null) {
throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
}
+ if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
+ throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽灏佸瓨锛�");
+ }
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
- throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫鍊熺敤璁板綍锛�");
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫灏佸瓨璁板綍锛�");
}
UpdateWrapper<EamEquipmentSealUp> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("equipment_id", request.getEquipmentId());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSysFilesServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSysFilesServiceImpl.java
index cf40724..5550f8b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSysFilesServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSysFilesServiceImpl.java
@@ -62,7 +62,7 @@
@Override
public EamSysFiles getByPath(String path) {
LambdaQueryWrapper<EamSysFiles> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EamSysFiles::getFileEncodeName, path);
+ queryWrapper.eq(EamSysFiles::getFilePath, path);
List<EamSysFiles> list = eamSysFilesMapper.selectList(queryWrapper);
if (CollectionUtil.isEmpty(list)) {
return null;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentEfficiencyAnalyzeDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentEfficiencyAnalyzeDto.java
index aabf938..72352f5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentEfficiencyAnalyzeDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentEfficiencyAnalyzeDto.java
@@ -12,6 +12,8 @@
@Data
public class EquipmentEfficiencyAnalyzeDto {
+ private String equipmentId;
+
private String equipmentName;
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
index 74ccdcb..d611c14 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
@@ -197,6 +197,7 @@
<select id="equipmentEfficiencyAnalyze" resultType="org.jeecg.modules.mdc.dto.EquipmentEfficiencyAnalyzeDto">
SELECT
+ t3.equipment_Id,
t3.equipment_name,
t1.utilization_rate AS utilizationRate,
t2.utilization_rate AS shiftUtilizationRate,
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index 55ea7fd..dc82510 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -1794,7 +1794,7 @@
List<String> equipmentIdList = equipmentList.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
List<EquipmentEfficiencyAnalyzeDto> dataList = mdcEfficiencyReportMapper.equipmentEfficiencyAnalyze(equipmentIdList, equEffVo.getMonth());
result.put("dataList", dataList);
- List<String> equipmentNameList = dataList.stream().map(EquipmentEfficiencyAnalyzeDto::getEquipmentName).collect(Collectors.toList());
+ List<String> equipmentNameList = dataList.stream().map(EquipmentEfficiencyAnalyzeDto::getEquipmentId).collect(Collectors.toList());
result.put("equipmentNameList", equipmentNameList);
}
return result;
--
Gitblit v1.9.3