From 66e943c91e133eec5a0822ea22fd92cbc04bc9f3 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 12 三月 2025 16:04:14 +0800
Subject: [PATCH] 保养工单汇总
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintPlanServiceImpl.java | 42 ++----------------------------------------
1 files changed, 2 insertions(+), 40 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 8cbc9af..937832b 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
@@ -106,6 +106,7 @@
qw.eq(bo.getMaintUser() != null, "mp.maint_user", bo.getMaintUser());
qw.in(bo.getMaintDept() != null, "mp.maint_dept", getAllDescendantIds(bo.getMaintDept()));
qw.eq(bo.getStatus() != null, "mp.status", bo.getStatus());
+ qw.orderByDesc("mp.create_time");
return qw;
}
@@ -144,7 +145,7 @@
*/
@Override
public Boolean insertByBo(EimsMaintPlanBo bo) {
- setMaintNextTime(bo);
+ //setMaintNextTime(bo);
EimsMaintPlan add = MapstructUtils.convert(bo, EimsMaintPlan.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
@@ -154,46 +155,7 @@
return flag;
}
- /**
- * 璁＄畻淇濆吇璁″垝涓嬫鎵ц鏃堕棿
- */
- @SneakyThrows
- private void setMaintNextTime(EimsMaintPlanBo bo) {
- Date maintFirstTime = bo.getMaintFirstTime();
- Date maintLastTime = bo.getMaintLastTime();
- //涓嬫淇濆吇鏃堕棿璁＄畻瑙勫垯 0-鎸夊浐瀹氬懆鏈� 1-鎸変笂娆′繚鍏绘椂闂�
- Date nextDate = (maintLastTime != null && bo.getMaintRule().equals(DictConstants.MAINT_TIME_RULE_DETAIL.LAST)) ? maintLastTime :maintFirstTime;
- //棣栨鎵ц鏃堕棿涓虹┖鎶涘嚭寮傚父
- if (maintFirstTime == null) {
- throw new Exception("棣栨鎵ц鏃堕棿涓嶈兘涓虹┖!");
- }
- //鍛ㄦ湡
- Long maintCycle = bo.getMaintCycle();
- //鍗曚綅 1-澶� 2-鍛� 3-鏈� 4-瀛� 5-骞�
- String maintCycleUnit = bo.getMaintCycleUnit();
- switch (maintCycleUnit) {
- case "1":
- nextDate = DateUtils.addDays(nextDate, maintCycle.intValue());
- break;
- case "2":
- nextDate = DateUtils.addWeeks(nextDate, maintCycle.intValue());
- break;
- case "3":
- nextDate = DateUtils.addMonths(nextDate, maintCycle.intValue());
- break;
- case "4":
- nextDate = DateUtils.addMonths(nextDate, maintCycle.intValue() * 3);
- break;
- case "5":
- nextDate = DateUtils.addYears(nextDate, maintCycle.intValue());
- break;
-
- }
- bo.setMaintNextTime(nextDate);
-
-
- }
/**
* 淇敼淇濆吇璁″垝
--
Gitblit v1.9.3