From 4dd33cbe7be8c0e552962b64d9f323a9cc04db45 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 13 六月 2025 10:54:35 +0800
Subject: [PATCH] 设备打卡率定时任务。设备打卡率列表接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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..0228d7c 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);
}
@@ -213,7 +212,7 @@
if (result != null) {
entity.setSealEndTime(new Date());
entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_UNSEALING_AUDIT.name());
- //淇濆瓨宸ュ崟
+ //淇濆瓨宸ュ崟
equipmentSealUpMapper.updateById(entity);
return result.isSuccess();
}
@@ -281,6 +280,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 +320,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 +339,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 +360,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