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/EamEquipmentSealUpServiceImpl.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 a0fbad9..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
@@ -18,12 +18,12 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
+import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import org.jeecg.modules.eam.mapper.EamEquipmentSealUpMapper;
import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
@@ -124,7 +124,6 @@
} else {
queryWrapper.orderByDesc("wmo.create_time");
}
-
return equipmentSealUpMapper.queryPageList(page, queryWrapper);
}
@@ -137,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;
@@ -162,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());
@@ -213,7 +215,7 @@
if (result != null) {
entity.setSealEndTime(new Date());
entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_UNSEALING_AUDIT.name());
- //淇濆瓨宸ュ崟
+ //淇濆瓨宸ュ崟
equipmentSealUpMapper.updateById(entity);
return result.isSuccess();
}
@@ -281,6 +283,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.SEAL_UP, businessTable = "eam_equipment_seal_up")
public EamEquipmentSealUp approval(EamEquipmentSealUpRequest request) {
EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(request.getId());
if (entity == null) {
@@ -320,7 +323,7 @@
Map<String, Object> values = new HashMap<>();
switch (status) {
// 瀹℃壒
- case WAIT_UNSEALING_AUDIT:
+ case WAIT_CHECK:
//鎵ц瀹屾垚
values.put("dataId", entity.getId());
values.put("organization", request.getApprovalComment());
@@ -339,14 +342,14 @@
values.put("NextAssignee", userApprovalList);
} else {
//璁剧疆entity
- entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_SUBMIT.name());
+ entity.setSealStatus(EquipmentSealUpStatusEnum.COMPLETE.name());
// 淇敼璁惧鐘舵��
equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
eamEquipmentService.updateById(equipment);
}
break;
// 宸插皝瀛�
- case SEALED:
+ case WAIT_UNSEALING_AUDIT:
values.put("dataId", entity.getId());
values.put("organization", request.getUnsealApprovalComment());
values.put("comment", request.getUnsealApprovalComment());
@@ -360,11 +363,11 @@
} else {
//璁剧疆entity
entity.setSealStatus(EquipmentSealUpStatusEnum.SEALED.name());
+ entity.setSealEndTime(null);
}
entity.setUnsealApprovalUser(user.getUsername());
entity.setUnsealApprovalComment(request.getUnsealApprovalComment());
entity.setUnsealApprovalTime(new Date());
-
// 淇敼璁惧鐘舵��
equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
eamEquipmentService.updateById(equipment);
--
Gitblit v1.9.3