From 63c9ec27a1f717cff8b36ad7db23d56e41dfae8f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 七月 2025 20:01:56 +0800
Subject: [PATCH] art: 技术状态鉴定申请-Bug修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 bf42deb..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;
@@ -85,13 +86,20 @@
standard.setInitialDate(DateUtils.localDateToDate(now.minusDays(1)));
}
LocalDate generateDate = DateUtils.dateToLocalDate(standard.getInitialDate());
- //鍔犲懆鏈�
- 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;
}
//鑾峰彇淇濆吇椤规槑缁�
--
Gitblit v1.9.3