From 70b395283425c1396d0face519b32575b028d0e8 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 22 四月 2025 17:27:27 +0800
Subject: [PATCH] 维修工单维修报修
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index 44eb13a..fe9da42 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -37,10 +37,7 @@
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;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -82,9 +79,6 @@
private IFlowTaskService flowTaskService;
@Resource
- private ISysUserService sysUserService;
-
- @Resource
private IEamEquipmentExtendService eamEquipmentExtendService;
/**
@@ -121,7 +115,7 @@
eamRepairOrder.setActualStartTime(DateUtils.getNow());
eamRepairOrder.setIsUseSpare(0);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- eamRepairOrder.setRepairer(user.getRealname());
+ eamRepairOrder.setRepairer(user.getUsername());
super.save(eamRepairOrder);
EamEquipment eamEquipment = eamEquipmentService.getById(eamReportRepair.getEquipmentId());
// 鍚姩缁翠慨娴佺▼
@@ -202,15 +196,40 @@
if (StringUtils.isBlank(equipment.getEquipmentManager())) {
throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
}
- values.put("dataId", eamRepairOrder.getId());
- values.put("organization", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
- values.put("comment", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
- values.put("NextAssignee", Arrays.asList(equipment.getEquipmentManager().split(",")));
- values.put("status", 1);
- request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
- eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
- eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_SPARES.name());
- eamRepairOrder.setIsUseSpare(1);
+ if (StringUtils.isBlank(eamRepairOrder.getRepairDescription())) {
+ values.put("dataId", eamRepairOrder.getId());
+ values.put("organization", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
+ values.put("comment", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
+ values.put("NextAssignee", Arrays.asList(equipment.getEquipmentManager().split(",")));
+ values.put("status", 1);
+ request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
+ eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
+ eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_SPARES.name());
+ eamRepairOrder.setIsUseSpare(1);
+ } else {
+ values.put("dataId", eamRepairOrder.getId());
+ values.put("organization", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
+ values.put("comment", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
+ values.put("NextAssignee", Arrays.asList(eamReportRepair.getCreateBy().split(",")));
+ request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
+ eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_CONFIRM.name());
+ eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_CONFIRM.name());
+ eamRepairOrder.setFaultReason(request.getFaultReason());
+ eamRepairOrder.setRepairDescription(request.getRepairDescription());
+ // 澶勭悊闄勪欢
+ if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
+ List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(fileUploadResultList);
+ eamRepairOrder.setImageFiles(referenceFile);
+ } catch (JsonProcessingException e) {
+ log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ }
+ }
+ //鏇存柊璁惧缁翠慨鐘舵��
+ eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.WAIT_CONFIRM.name());
+ }
} else {
// 涓嶉渶瑕�
values.put("dataId", eamRepairOrder.getId());
--
Gitblit v1.9.3