From deba25af7b2a6fefce0e477782274ffd600abac8 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 06 五月 2025 10:38:18 +0800
Subject: [PATCH] art: 设备管理-点检-设备台账状态变更，点检流程更新设备保养状态
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 9d99aa3..e79f405 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -22,6 +22,8 @@
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.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.InspectionStatus;
import org.jeecg.modules.eam.entity.EamEquipment;
@@ -30,10 +32,7 @@
import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
-import org.jeecg.modules.eam.service.IEamInspectionOrderService;
-import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
@@ -82,6 +81,8 @@
private IMdcUserProductionService mdcUserProductionService;
@Autowired
private IEamReportRepairService eamReportRepairService;
+ @Autowired
+ private IEamEquipmentExtendService eamEquipmentExtendService;
@Override
public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -179,6 +180,8 @@
}
if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
triggerProcess(eamInspectionOrder);
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(eamInspectionOrder.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_INSPECTION.name());
}
return true;
}
@@ -218,11 +221,15 @@
@Override
+ @Transactional(rollbackFor = {Exception.class})
public boolean editInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
if (StrUtil.isNotEmpty(eamInspectionOrder.getOperator())) {
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
+ triggerProcess(eamInspectionOrder);
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(eamInspectionOrder.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_INSPECTION.name());
}
super.updateById(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
@@ -245,8 +252,12 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean takeInspectionOrder(String id) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if(user == null || !BusinessCodeConst.PCR0001.equals(user.getPost())) {
+ throw new JeecgBootException("涓嶆槸鎿嶄綔宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒");
+ }
EamInspectionOrder eamInspectionOrder = this.getById(id);
if (eamInspectionOrder == null) {
return false;
@@ -256,6 +267,8 @@
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
this.triggerProcess(eamInspectionOrder);
this.updateById(eamInspectionOrder);
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(eamInspectionOrder.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_INSPECTION.name());
return true;
}
}
@@ -441,6 +454,8 @@
}
eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId()));
eamInspectionOrderDetailService.saveBatch(request.getTableDetailList());
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.INSPECTION_CONFIRM.name());
} else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getConfirmDealType())) {
// 鐝粍闀跨‘璁や换鍔�
order.setInspectionStatus(InspectionStatus.COMPLETE.name());
@@ -448,6 +463,8 @@
order.setConfirmComment(request.getConfirmComment());
order.setConfirmDealType(request.getConfirmDealType());
order.setConfirmTime(new Date());
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.NORMAL.name());
}
}
}
@@ -493,6 +510,8 @@
if (InspectionStatus.UNDER_INSPECTION.name().equals(type)) {
eamInspectionOrder.setOperator(loginUser.getUsername());
this.triggerProcess(eamInspectionOrder);
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentInspectionStatus(eamInspectionOrder.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_INSPECTION.name());
} else {
eamInspectionOrder.setOperator(null);
}
--
Gitblit v1.9.3