From c6acf648b8bcee16df04dcc26e146c5d2dfb00b4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 08 七月 2025 11:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 18 +++++++-----------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java | 7 ++-----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java | 13 ++++---------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 3 +--
6 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index 9697509..0b445f4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -108,8 +108,7 @@
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
eamInspectionOrderRequest.setOrderNum(codeSeq);
eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL));
- eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
- return Result.OK("娣诲姞鎴愬姛锛�");
+ return eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java
index 7f309aa..fd93774 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java
@@ -59,11 +59,8 @@
return;
}
for (EamInspectionOrder order : unCompleteOrderList) {
- if (InspectionStatus.WAIT_INSPECTION.name().equals(order.getInspectionStatus())) {
- order.setInspectionStatus(InspectionStatus.EXPIRED.name());
- } else if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus())) {
- //宸茬粡琚帴鍗� 浣嗘湭鎵ц瀹屾垚
- order.setInspectionStatus(InspectionStatus.EXPIRED.name());
+ order.setInspectionStatus(InspectionStatus.EXPIRED.name());
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus())) {
//寮哄埗缁撴潫娴佺▼ 鍒犻櫎鐢ㄦ埛鐨勬寰呭姙浠诲姟
FlowMyBusiness flowMyBusiness = flowMyBusinessService.selectByDataId(order.getId());
if (flowMyBusiness != null) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java
index c0ada13..bf42deb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java
@@ -69,7 +69,7 @@
*/
List<EamMaintenanceStandard> standardList = eamMaintenanceStandardService.queryListByCategory(MaintenanceCategoryEnum.POINT_INSPECTION.name());
if (CollectionUtil.isEmpty(standardList)) {
- log.warn("娌℃湁閰嶇疆浠讳綍鍛ㄤ繚鏍囧噯锛屼换鍔＄粨鏉�");
+ log.warn("娌℃湁閰嶇疆浠讳綍鐐规鏍囧噯锛屼换鍔＄粨鏉�");
return;
}
//褰撳墠鏃ユ湡
@@ -85,21 +85,18 @@
standard.setInitialDate(DateUtils.localDateToDate(now.minusDays(1)));
}
LocalDate generateDate = DateUtils.dateToLocalDate(standard.getInitialDate());
-// if (standard.getLastGenerateTime() != null) {
-// generateDate = DateUtils.dateToLocalDate(standard.getLastGenerateTime());
-// }
//鍔犲懆鏈�
do {
//鍒濆鏃ユ湡璁剧疆鐨勬瘮杈冩棭锛屾垨浠诲姟闀挎椂闂存病鎵ц锛屽繀椤诲懆鏈熷埌浠婂ぉ鎵嶄細鐢熸垚宸ュ崟
generateDate = generateDate.plusDays(standard.getMaintenancePeriod());
} while (now.isAfter(generateDate));
- if(!now.isEqual(generateDate)) {
+ if (!now.isEqual(generateDate)) {
//杩樻湭鍒扮敓鎴愭棩鏈燂紝璺宠繃鎵ц
continue;
}
//鑾峰彇淇濆吇椤规槑缁�
List<EamMaintenanceStandardDetail> standardDetailList = eamMaintenanceStandardDetailService.selectByStandardId(standard.getId());
- if(CollectionUtil.isEmpty(standardDetailList)) {
+ if (CollectionUtil.isEmpty(standardDetailList)) {
log.error("鐐规鏍囧噯娌℃湁淇濆吇鏄庣粏锛岃鍏堥厤缃繚鍏绘槑缁�, standard:{}", standard);
continue;
}
@@ -112,13 +109,11 @@
request.setCreationMethod(OrderCreationMethodEnum.AUTO.name());
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
request.setOrderNum(codeSeq);
- List<EamInspectionOrderDetail> collect = standardDetailList.stream().map(EamInspectionOrderDetail::new).collect(Collectors.toList());
- request.setTableDetailList(collect);
eamInspectionOrderService.addInspectionOrder(request);
}
quartzLog.setIsSuccess(0);
} catch (Exception e) {
- log.error("鍛ㄤ繚杩囩敓鎴愭墽琛屽畾鏃朵换鍔″け璐ワ紝{}", e.getMessage(), e);
+ log.error("鐐规鐢熸垚鎵ц瀹氭椂浠诲姟澶辫触锛寋}", e.getMessage(), e);
quartzLog.setIsSuccess(-1);
quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
index a86ae83..669eff0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
@@ -27,7 +27,7 @@
* @param eamInspectionOrderRequest
* @return
*/
- boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest);
+ Result<String> addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest);
/**
* 缂栬緫鐐规宸ュ崟
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("娣诲姞鎴愬姛锛�");
}
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 5c3d56a..2f1b8f8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -327,7 +327,7 @@
LambdaQueryWrapper<EamMaintenanceStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EamMaintenanceStandard::getDelFlag, CommonConstant.DEL_FLAG_0);
queryWrapper.eq(EamMaintenanceStandard::getMaintenanceCategory, maintenanceCategory);
- queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
+ queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.START.name());
return eamMaintenanceStandardMapper.selectList(queryWrapper);
}
--
Gitblit v1.9.3