From d4d757f2d1a32deecb5e13111d6e753dfa18a58e Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期一, 08 九月 2025 14:49:05 +0800
Subject: [PATCH] 故障报修流程审批节点字段调整
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index a44565e..c0fac1b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -24,22 +24,20 @@
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamReportRepair;
+import org.jeecg.modules.eam.entity.RepairWarehouse;
import org.jeecg.modules.eam.mapper.EamRepairOrderMapper;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
import org.jeecg.modules.eam.request.EamRepairOrderRequest;
import org.jeecg.modules.eam.request.EamRepairOrderResponse;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
-import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEamRepairOrderService;
-import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.util.DateUtils;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
-import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
@@ -91,6 +89,9 @@
@Autowired
private ISysUserService sysUserService;
+
+ @Autowired
+ private IRepairWarehouseService repairWarehouseService;
/**
* 鍒嗛〉鍒楄〃
@@ -221,6 +222,7 @@
eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_INTERNAL_CONFIRM.name());
eamRepairOrder.setActualStartTime(DateUtils.getNow());
eamRepairOrder.setRepairer(eamReportRepairQuery.getRepairer());
+ eamRepairOrder.setReportId(eamReportRepairQuery.getId());
super.save(eamRepairOrder);
EamEquipment eamEquipment = eamEquipmentService.getById(eamReportRepair.getEquipmentId());
// 鍚姩缁翠慨娴佺▼
@@ -298,6 +300,8 @@
Map<String, Object> values = new HashMap<>();
List<UserSelector> userSelectors;
List<String> userApprovalList;
+
+ RepairWarehouse repairWarehouse = null;
switch (status) {
case WAIT_INTERNAL_CONFIRM:
order.setRepairConfirm(request.getRepairConfirm());
@@ -324,7 +328,7 @@
//鎻愪氦鏈哄姩鍔炵淮淇紝杞﹂棿绠＄悊鍛樼‘璁�
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("NextAssignee", userApprovalList);
@@ -344,6 +348,17 @@
order.setFaultReason(request.getFaultReason());
order.setRepairDescription(request.getRepairDescription());
order.setActualEndTime(new Date());
+ order.setFaultType(request.getFaultType());
+ order.setFaultPart(request.getFaultPart());
+ order.setFaultChildPart(request.getFaultChildPart());
+ order.setSeverity(request.getSeverity());
+ order.setRepairDescription(request.getRepairDescription());
+
+ //淇濆瓨缁翠慨鐭ヨ瘑搴�
+ repairWarehouse = new RepairWarehouse();
+ BeanUtils.copyProperties(request, repairWarehouse);
+ repairWarehouseService.saveData(repairWarehouse);
+
// 澶勭悊闄勪欢
if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
@@ -431,6 +446,17 @@
order.setFaultReason(request.getFaultReason());
order.setRepairDescription(request.getRepairDescription());
order.setActualEndTime(new Date());
+ order.setFaultType(request.getFaultType());
+ order.setFaultPart(request.getFaultPart());
+ order.setFaultChildPart(request.getFaultChildPart());
+ order.setSeverity(request.getSeverity());
+ order.setRepairDescription(request.getRepairDescription());
+
+ //淇濆瓨缁翠慨鐭ヨ瘑搴�
+ repairWarehouse = new RepairWarehouse();
+ BeanUtils.copyProperties(request, repairWarehouse);
+ repairWarehouseService.saveData(repairWarehouse);
+
// 澶勭悊闄勪欢
if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
@@ -458,6 +484,17 @@
order.setFaultReason(request.getFaultReason());
order.setRepairDescription(request.getRepairDescription());
order.setActualEndTime(new Date());
+ order.setFaultType(request.getFaultType());
+ order.setFaultPart(request.getFaultPart());
+ order.setFaultChildPart(request.getFaultChildPart());
+ order.setSeverity(request.getSeverity());
+ order.setRepairDescription(request.getRepairDescription());
+
+ //淇濆瓨缁翠慨鐭ヨ瘑搴�
+ repairWarehouse = new RepairWarehouse();
+ BeanUtils.copyProperties(request, repairWarehouse);
+ repairWarehouseService.saveData(repairWarehouse);
+
// 澶勭悊闄勪欢
if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
--
Gitblit v1.9.3