From b6d533f17a997e58133b825c5bbcc5ed3f2e5579 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 01 七月 2025 13:19:33 +0800
Subject: [PATCH] fix(eims): 修复计划生成逻辑
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java
index cb01ba0..662a8f3 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java
@@ -4,6 +4,7 @@
import com.aizuda.snailjob.client.job.core.dto.JobArgs;
import com.aizuda.snailjob.client.model.ExecuteResult;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -40,32 +41,31 @@
// 鑾峰彇浠婂ぉ鏃ユ湡
Date today = new Date();
- LambdaQueryWrapper<EimsMaintPlan> planBoQueryWrapper = Wrappers.lambdaQuery();
+ QueryWrapper<EimsMaintPlan> planBoQueryWrapper = Wrappers.query();
// 鏌ヨ鍚敤鐨勪繚鍏昏鍒�
- planBoQueryWrapper.eq(EimsMaintPlan::getStatus, DictConstants.SYS_NORMAL_DISABLE_DETAIL.NORMAL);
- // 杩囨护娌℃湁涓嬫杩愯鏃堕棿
- planBoQueryWrapper.isNotNull(EimsMaintPlan::getMaintNextTime);
- // 杩囨护娌℃湁淇濆吇鍛ㄦ湡鐨勬暟鎹�
- planBoQueryWrapper.isNotNull(EimsMaintPlan::getMaintCycle);
- planBoQueryWrapper.isNotNull(EimsMaintPlan::getMaintCycleUnit);
- planBoQueryWrapper.isNotNull(EimsMaintPlan::getMaintRule);
- List<EimsMaintPlanVo> planVoList = planMapper.selectVoList(planBoQueryWrapper);
+ planBoQueryWrapper.eq("mp.status", DictConstants.SYS_NORMAL_DISABLE_DETAIL.NORMAL);
+ planBoQueryWrapper .eq("equ.status", DictConstants.EIMS_EQU_STATUS_DETAIL.SHIYONG);
+ // 杩囨护涓嬫杩愯鏃堕棿绛変簬褰撳ぉ鏃堕棿鐨�
+// planBoQueryWrapper.eq("mp.maint_next_time", DateUtils.getDate());
+ // 杩囨护娌℃湁淇濆吇鍛ㄦ湡鐨勬暟鎹�
+ planBoQueryWrapper.isNotNull("mp.maint_cycle");
+ planBoQueryWrapper.isNotNull("mp.maint_cycle_unit");
+ planBoQueryWrapper.isNotNull("mp.maint_rule");
+
+ List<EimsMaintPlanVo> planVoList = planMapper.selectVoListJoinEqu(planBoQueryWrapper);
for (int i = 0; i < planVoList.size(); i++) {
EimsMaintPlanVo planVo = planVoList.get(i);
// 淇濆吇璁″垝add鐨勬椂鍊欎細鑷姩鐢熸垚涓嬫杩愯鏃堕棿
Date oldNext = planVo.getMaintNextTime();
int day = DateUtils.differentDays(today, oldNext);
// 濡傛灉璁″垝鐢熸垚宸ュ崟鏃ユ湡澶т簬浠婂ぉ鍒欎笉鐢熸垚宸ュ崟
- if (day >= 1) {
+ if (today.before(oldNext)) {
continue;
}
// 璁＄畻鐢熸垚宸ュ崟鏃堕棿
Long maintCycle = planVo.getMaintCycle();
- String maintRule = planVo.getMaintRule();
- Date firstTime = planVo.getMaintFirstTime();
- Date lastTime = planVo.getMaintLastTime();
Date newNext = null;
String maintCycleUnit = planVo.getMaintCycleUnit();
switch (maintCycleUnit) {
@@ -99,6 +99,7 @@
order.setStatus(DictConstants.MAINT_ORDER_STATUS_DETAIL.DAIBAOYANG);
order.setPlanTime(oldNext);
order.setPlanId(planVo.getId());
+ order.setMaintName(planVo.getMaintName());
order.setMaintCode(codeService.generateCode("BYZD"));
EimsMaintPlan plan = MapstructUtils.convert(planVo, EimsMaintPlan.class);
assert plan != null;
--
Gitblit v1.9.3