From 22d31632a106266333bee84149f6af5c88415e85 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 08 七月 2025 11:30:15 +0800
Subject: [PATCH] 定期生成点检工单，定期扫描已过期点检工单
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 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 78f13f7..b22c19d 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
@@ -156,15 +156,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
+ public Result<String> addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
+ List<EamInspectionOrder> eamInspectionOrders = eamInspectionOrderMapper.selectList(new LambdaQueryWrapper<EamInspectionOrder>().eq(EamInspectionOrder::getStandardId, eamInspectionOrderRequest.getStandardId()).eq(EamInspectionOrder::getInspectionDate, eamInspectionOrderRequest.getInspectionDate()).ne(EamInspectionOrder::getInspectionStatus, InspectionStatus.ABOLISH.name()));
+ if (CollectionUtils.isNotEmpty(eamInspectionOrders)) {
+ return Result.error("娣诲姞澶辫触,绯荤粺宸插瓨鍦ㄥ綋鍓嶆棩鏈熷伐鍗曪紒");
+ }
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
//淇敼鐘舵��
- if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
- eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
- } else {
- eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
- }
+ eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
eamInspectionOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
save(eamInspectionOrder);
//澶勭悊鏃ョ偣妫�鏄庣粏鏁版嵁
@@ -199,11 +199,7 @@
}
}
}
-
-// if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
-// triggerProcess(eamInspectionOrder);
-// }
- return true;
+ return Result.OK("娣诲姞鎴愬姛锛�");
}
/**
--
Gitblit v1.9.3