From 2f0009c750de4d47a18cce4a5a403fa83ba0c209 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 02 七月 2025 08:58:27 +0800
Subject: [PATCH] feat(report): 新增设备稼动率统计功能
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.java
index e5d8f1e..0c31efe 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/InspectPlanToRecordJob.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;
@@ -43,19 +44,20 @@
@SneakyThrows
@Transactional(rollbackFor = Exception.class)
public ExecuteResult jobExecute(JobArgs jobArgs) {
- // 鑾峰彇浠婂ぉ鏃ユ湡
- Date today = new Date();
- LambdaQueryWrapper<EimsInspectPlan> planBoQueryWrapper = Wrappers.lambdaQuery();
+ QueryWrapper<EimsInspectPlan> planBoQueryWrapper = Wrappers.query();
// 鏌ヨ鍚敤鐨勭偣妫�璁″垝
- planBoQueryWrapper.eq(EimsInspectPlan::getStatus, DictConstants.SYS_NORMAL_DISABLE_DETAIL.NORMAL);
+ planBoQueryWrapper.eq("ip.status", DictConstants.SYS_NORMAL_DISABLE_DETAIL.NORMAL)
+ .eq("equ.status", DictConstants.EIMS_EQU_STATUS_DETAIL.SHIYONG);
+ // 澧炲姞杩囨护鏉′欢 涓婃鐢熸垚鏃ユ湡灏忎簬褰撳墠鏃ユ湡
+ planBoQueryWrapper.and(wrapper -> wrapper.le("ip.insp_next_time", DateUtils.getDate()).or().isNull("ip.insp_next_time"));
// // 杩囨护娌℃湁涓嬫杩愯鏃堕棿
// planBoQueryWrapper.isNotNull(EimsInspectPlan::getInspNextTime);
// // 杩囨护娌℃湁鐐规鍛ㄦ湡鐨勬暟鎹�
// planBoQueryWrapper.isNotNull(EimsInspectPlan::getInspCycle);
// planBoQueryWrapper.isNotNull(EimsInspectPlan::getInspCycleUnit);
- List<EimsInspectPlanVo> planVoList = planMapper.selectVoList(planBoQueryWrapper);
+ List<EimsInspectPlanVo> planVoList = planMapper.selectVoListJoinEqu(planBoQueryWrapper);
for (int i = 0; i < planVoList.size(); i++) {
EimsInspectPlanVo planVo = planVoList.get(i);
// // 鐐规璁″垝add鐨勬椂鍊欎細鑷姩鐢熸垚涓嬫杩愯鏃堕棿
--
Gitblit v1.9.3