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/service/impl/EimsInspectRecordServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java
index 4901462..a9b17a7 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsInspectRecordServiceImpl.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.SneakyThrows;
+import org.dromara.common.core.constant.DictConstants;
+import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -11,8 +13,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
+import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.eims.domain.EimsInspectPlan;
+import org.dromara.eims.domain.EimsInspectSt;
import org.dromara.eims.domain.EimsMaintPlan;
+import org.dromara.eims.domain.bo.EimsInspectStBo;
+import org.dromara.eims.domain.bo.InspectRecordBo;
+import org.dromara.eims.domain.vo.EimsInspectStVo;
import org.dromara.eims.domain.vo.EimsMaintOrderVo;
import org.dromara.eims.mapper.EimsInspectPlanMapper;
import org.dromara.eims.mapper.EimsMaintPlanMapper;
@@ -73,6 +80,7 @@
return TableDataInfo.build(page);
}
+
/**
* 鏌ヨ绗﹀悎鏉′欢鐨勭偣妫�璁板綍鍒楄〃
*
@@ -96,6 +104,8 @@
lqw.eq(bo.getInspTime() != null, EimsInspectRecord::getInspTime, bo.getInspTime());
lqw.eq(bo.getPlanTime() != null, EimsInspectRecord::getPlanTime, bo.getPlanTime());
lqw.eq(bo.getVerifyUser() != null, EimsInspectRecord::getVerifyUser, bo.getVerifyUser());
+ // 鎸夊垱寤烘椂闂村�掑簭
+ lqw.orderByDesc(EimsInspectRecord::getCreateTime);
return lqw;
}
@@ -106,17 +116,25 @@
qw.like(StringUtils.isNotBlank(bo.getInspName()),"ir.insp_name", bo.getInspName());
qw.like(bo.getEquName() != null, "equ.equ_name", bo.getEquName());
qw.like(bo.getAssetNo() != null, "equ.asset_no", bo.getAssetNo());
+ if (params.get("searchValue") != null && StringUtils.isNotBlank(params.get("searchValue").toString())) {
+ qw.and(wq -> wq.like("equ.equ_name", params.get("searchValue"))
+ .or().like("equ.asset_no", params.get("searchValue"))
+ );
+ }
qw.like(bo.getEquId() != null, "equ.equ_id", bo.getEquId());
qw.eq(StringUtils.isNotBlank(bo.getInspType()), "ir.insp_type", bo.getInspType());
qw.eq(bo.getInspUser() != null, "ir.insp_user", bo.getInspUser());
qw.in(bo.getInspDept() != null, "ir.insp_dept", getAllDescendantIds(bo.getInspDept()));
qw.eq(bo.getStatus() != null, "ir.status", bo.getStatus());
qw.eq(bo.getInspResult() != null, "ir.insp_result", bo.getInspResult());
+ qw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null,
+ "ir.plan_time", params.get("beginPlanTime"), params.get("endPlanTime"));
qw.eq(bo.getPlanTime()!=null,
"ir.plan_time", bo.getPlanTime());
qw.orderByDesc("ir.create_time");
return qw;
}
+
/**
@@ -161,7 +179,7 @@
Long planId = bo.getPlanId();
if(planId!=null){
EimsInspectPlan plan = planMapper.selectById(planId);
- setInspNextTime(plan);
+ // setInspNextTime(plan);
planMapper.updateById(plan);
}
@@ -229,6 +247,19 @@
return baseMapper.updateById(update) > 0;
}
+ @Override
+ public Boolean updateBatchByBo(InspectRecordBo bo) {
+// LoginUser loginUser = LoginHelper.getLoginUser();
+ List<EimsInspectRecord> inspRecordList = MapstructUtils.convert(bo.getInspRecordList(), EimsInspectRecord.class);
+ inspRecordList.forEach(item->{
+ // 鏇存柊涓哄凡鐐规
+ item.setStatus(DictConstants.EIMS_INSPECT_STATUS_DETAIL.Y);
+// item.setInspTime(new Date());
+// item.setInspUser(loginUser.getUserId());
+ });
+ return baseMapper.updateBatchById(inspRecordList);
+ }
+
/**
* 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
*/
--
Gitblit v1.9.3