From 23396e93588f52941f729fc63cea84a70847d3bc Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 11 九月 2025 11:08:12 +0800
Subject: [PATCH] 二保三保设备保养时间调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index 70be0f7..8abe1f7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,10 +20,14 @@
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
-import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
+import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder;
+import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
import org.jeecg.modules.eam.mapper.EamSecondMaintenanceOrderMapper;
import org.jeecg.modules.eam.request.EamSecondMaintenanceQuery;
import org.jeecg.modules.eam.request.EamSecondMaintenanceRequest;
@@ -40,6 +45,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -75,6 +81,8 @@
private IEamReportRepairService eamReportRepairService;
@Autowired
private IEamEquipmentExtendService eamEquipmentExtendService;
+ @Autowired
+ private IEamMaintenanceStandardService eamMaintenanceStandardService;
@Override
public IPage<EamSecondMaintenanceOrder> queryPageList(Page<EamSecondMaintenanceOrder> page, EamSecondMaintenanceQuery query) {
@@ -158,7 +166,7 @@
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
if (StringUtils.isNotBlank(order.getOperator())) {
//鍚姩娴佺▼
- flowCommonService.initActBusiness("宸ュ崟鍙�:" + order.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧浜屼繚",
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + order.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";瀹夎浣嶇疆" + equipment.getInstallationPosition(),
order.getId(), "IEamSecondMaintenanceOrderService", "second_maintenance_process", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", order.getId());
@@ -180,7 +188,7 @@
order.setActualStartTime(new Date());
eamSecondMaintenanceOrderMapper.updateById(order);
//鏇存柊璁惧淇濆吇鐘舵��
- eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name());
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name(), null, null);
return result.isSuccess();
}
}
@@ -233,7 +241,7 @@
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
if (StringUtils.isNotBlank(entity.getOperator())) {
//鍚姩娴佺▼
- flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧浜屼繚",
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + entity.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";瀹夎浣嶇疆" + equipment.getInstallationPosition(),
entity.getId(), "IEamSecondMaintenanceOrderService", "second_maintenance_process", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", entity.getId());
@@ -255,7 +263,7 @@
entity.setActualStartTime(new Date());
eamSecondMaintenanceOrderMapper.updateById(entity);
//鏇存柊璁惧淇濆吇鐘舵��
- eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name());
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name(), null, null);
return result.isSuccess();
}
@@ -287,7 +295,7 @@
eamSecondMaintenanceOrderMapper.updateById(entity);
//鍚姩娴佺▼
- flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧浜屼繚",
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + entity.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";瀹夎浣嶇疆" + equipment.getInstallationPosition(),
entity.getId(), "IEamSecondMaintenanceOrderService", "second_maintenance_process", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", entity.getId());
@@ -305,7 +313,7 @@
Result result = flowDefinitionService.startProcessInstanceByKey("second_maintenance_process", variables);
if (result != null) {
//鏇存柊璁惧淇濆吇鐘舵��
- eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name());
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name(), null, null);
return result.isSuccess();
}
return true;
@@ -356,12 +364,12 @@
switch (status) {
case UNDER_MAINTENANCE:
//鎵ц瀹屾垚
- //璁惧绠＄悊鍛樼‘璁�
- String equipmentManager = equipment.getEquipmentManager();
- if(StringUtils.isBlank(equipmentManager)) {
- throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ //杞﹂棿璁惧绠＄悊鍛樼‘璁�
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈棤鍒嗛厤缁欒溅闂磋澶囩鐞嗗憳锛屾硶杩涘叆涓嬬骇瀹℃壒锛�");
}
- userApprovalList = Collections.singletonList(equipmentManager);
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("dataId", entity.getId());
values.put("organization", "浜屼繚鎵ц缁撴潫");
values.put("comment", "浜屼繚鎵ц缁撴潫");
@@ -386,14 +394,15 @@
secondMaintenanceOrderDetailService.updateBatchById(request.getTableDetailList());
}
//鏇存柊璁惧淇濆吇鐘舵��
- eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.SECOND_MAINTENANCE_WAIT_CONFIRM.name());
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.SECOND_MAINTENANCE_WAIT_CONFIRM.name(), null, null);
break;
case WAIT_CONFIRM:
+ // 缁翠慨涓讳换纭
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0003);
if (CollectionUtil.isEmpty(userSelectors)) {
- throw new JeecgBootException("璁惧鏈垎閰嶇粰杞﹂棿鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨涓讳换锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
}
- //鐝粍闀跨‘璁�
+ //缁翠慨涓讳换纭
userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("dataId", entity.getId());
values.put("organization", request.getConfirmComment());
@@ -430,8 +439,15 @@
entity.setConfirmLeader(user.getUsername());
entity.setLeaderConfirmComment(request.getLeaderConfirmComment());
entity.setLeaderConfirmTime(new Date());
+
+ //鏌ヨ淇濆吇鏍囧噯
+ EamMaintenanceStandard standard = eamMaintenanceStandardService.getOne(new LambdaQueryWrapper<EamMaintenanceStandard>()
+ .eq(EamMaintenanceStandard::getEquipmentId, entity.getEquipmentId())
+ .eq(EamMaintenanceStandard::getMaintenanceCategory, MaintenanceCategoryEnum.SECOND_MAINTENANCE.name()));
+ LocalDate nextSecondMaintenanceDate = DateUtils.dateToLocalDate(standard.getInitialDate()).plusDays(standard.getMaintenancePeriod());
+
//鏇存柊璁惧淇濆吇鐘舵��
- eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.NORMAL.name());
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.NORMAL.name(), standard.getMaintenanceCategory(), DateUtils.localDateToDate(nextSecondMaintenanceDate));
break;
}
request.setValues(values);
--
Gitblit v1.9.3