From bef4312ca5a28088c462290a9c5ad356fbb06141 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期四, 24 四月 2025 14:52:00 +0800
Subject: [PATCH] Merge branch 'main' of http://lanpucloud.cn:1111/r/eims-master
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintPlanServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintPlanServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintPlanServiceImpl.java
index f1e2647..4518514 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintPlanServiceImpl.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintPlanServiceImpl.java
@@ -99,6 +99,8 @@
lqw.eq(bo.getMaintUser() != null, EimsMaintPlan::getMaintUser, bo.getMaintUser());
lqw.eq(bo.getMaintDept() != null, EimsMaintPlan::getMaintDept, bo.getMaintDept());
lqw.eq(bo.getStatus() != null, EimsMaintPlan::getStatus, bo.getStatus());
+ // 鎸夊垱寤烘椂闂村�掑簭
+ lqw.orderByDesc(EimsMaintPlan::getCreateTime);
return lqw;
}
@@ -321,6 +323,17 @@
maintPlanBo.setMaintNextTime(nextTime);
}
+ // 濡傛灉鍏佽瑕嗙洊锛屽垯鍒犻櫎宸插瓨鍦ㄧ殑鐩稿悓鏉′欢璁板綍
+ if (updateSupport) {
+ LambdaQueryWrapper<EimsMaintPlan> deleteWrapper = Wrappers.lambdaQuery();
+ deleteWrapper.eq(EimsMaintPlan::getEquId, maintPlanBo.getEquId())
+ .eq(EimsMaintPlan::getMaintName, maintPlanBo.getMaintName())
+ .eq(EimsMaintPlan::getStatus, maintPlanBo.getStatus())
+ .eq(EimsMaintPlan::getMaintCycle, maintPlanBo.getMaintCycle())
+ .eq(EimsMaintPlan::getMaintCycleUnit, maintPlanBo.getMaintCycleUnit());
+ baseMapper.delete(deleteWrapper);
+ }
+
if (!insertByBo(maintPlanBo)) {
failureNum++;
failureMsg.append(failureNum).append("銆佽澶囷細").append(eimsEquVo.getEquName()).append("锛屽鍏ュけ璐�<br>");
--
Gitblit v1.9.3