From 4545af9041b432cbe79214d52be599e4ce8659aa Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 14 八月 2025 15:55:39 +0800
Subject: [PATCH] 二保结构树代码 维修工单添加 领取按钮 领取后 生成维修开始时间 提交后 生成维修结束时间 计算 维修时长 故障时长 添加导出
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
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..631bf9a 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
@@ -1,12 +1,13 @@
package org.jeecg.modules.eam.job;
import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
-import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
@@ -69,7 +70,7 @@
*/
List<EamMaintenanceStandard> standardList = eamMaintenanceStandardService.queryListByCategory(MaintenanceCategoryEnum.POINT_INSPECTION.name());
if (CollectionUtil.isEmpty(standardList)) {
- log.warn("娌℃湁閰嶇疆浠讳綍鍛ㄤ繚鏍囧噯锛屼换鍔＄粨鏉�");
+ log.warn("娌℃湁閰嶇疆浠讳綍鐐规鏍囧噯锛屼换鍔＄粨鏉�");
return;
}
//褰撳墠鏃ユ湡
@@ -85,21 +86,25 @@
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 (!generateDate.equals(now)) {
+ //鍔犲懆鏈�
+ do {
+ //鍒濆鏃ユ湡璁剧疆鐨勬瘮杈冩棭锛屾垨浠诲姟闀挎椂闂存病鎵ц锛屽繀椤诲懆鏈熷埌浠婂ぉ鎵嶄細鐢熸垚宸ュ崟
+ generateDate = generateDate.plusDays(standard.getMaintenancePeriod());
+ } while (now.isAfter(generateDate));
+ if (!now.isEqual(generateDate)) {
+ //杩樻湭鍒扮敓鎴愭棩鏈燂紝璺宠繃鎵ц
+ continue;
+ }
+ }
+ //鏍￠獙鐢熸垚鏃ユ湡鏄惁宸叉湁宸ュ崟
+ List<EamInspectionOrder> list = eamInspectionOrderService.list(new LambdaQueryWrapper<EamInspectionOrder>().eq(EamInspectionOrder::getEquipmentId, standard.getEquipmentId()).eq(EamInspectionOrder::getInspectionDate, DateUtils.localDateToDate(generateDate)));
+ if (!CollectionUtil.isEmpty(list)) {
continue;
}
//鑾峰彇淇濆吇椤规槑缁�
List<EamMaintenanceStandardDetail> standardDetailList = eamMaintenanceStandardDetailService.selectByStandardId(standard.getId());
- if(CollectionUtil.isEmpty(standardDetailList)) {
+ if (CollectionUtil.isEmpty(standardDetailList)) {
log.error("鐐规鏍囧噯娌℃湁淇濆吇鏄庣粏锛岃鍏堥厤缃繚鍏绘槑缁�, standard:{}", standard);
continue;
}
@@ -112,13 +117,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));
}
--
Gitblit v1.9.3