From e5a85d904ce028a35229ab6245ab894afbca6531 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 26 七月 2025 17:07:30 +0800
Subject: [PATCH] 维修工单
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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 92eb973..15ca1f2 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
@@ -212,14 +212,16 @@
}
eamReportRepair.setReportStatus(EamRepairOrderRepairStatusEnum.UNDER_MAINTENANCE.name());
eamReportRepairService.updateById(eamReportRepair);
+ List<EamRepairPerson> eamRepairPersonList=new ArrayList<>();
iEamRepairPersonService.remove(new QueryWrapper<EamRepairPerson>().eq("repair_id",eamRepairOrderDto.getId()));
- if(CollectionUtils.isNotEmpty(eamRepairOrderDto.getEamRepairPersonList())) {
- List<EamRepairPerson> persons = eamRepairOrderDto.getEamRepairPersonList().stream()
- .map(person -> new EamRepairPerson()
- .setRepairId(eamRepairOrder.getId())
- .setDelFlag(CommonConstant.DEL_FLAG_0))
- .collect(Collectors.toList());
- iEamRepairPersonService.saveBatch(persons);
+ if (CollectionUtils.isNotEmpty(eamRepairOrderDto.getEamRepairPersonList())) {
+ eamRepairOrderDto.getEamRepairPersonList().forEach(eamRepairPerson -> {
+ eamRepairPerson.setId(null);
+ eamRepairPerson.setRepairId(eamRepairOrder.getId());
+ eamRepairPerson.setDelFlag(CommonConstant.DEL_FLAG_0);
+ eamRepairPersonList.add(eamRepairPerson);
+ });
+ iEamRepairPersonService.saveBatch(eamRepairPersonList);
}
return true;
}
@@ -233,7 +235,27 @@
if (CollectionUtils.isEmpty(eamRepairPersonList)) {
throw new RuntimeException("缁翠慨浜哄憳涓嶈兘涓虹┖");
}
- if (StrUtil.isEmpty(eamRepairOrder.getRepairCode())) {}
+ if (StrUtil.isEmpty(eamRepairOrder.getRepairCode())) {
+ throw new RuntimeException("宸ュ崟缂栧彿涓虹┖");
+ }
+ if (eamRepairOrder.getActualStartTime()==null){
+ throw new RuntimeException("缁翠慨寮�濮嬫椂闂翠负绌�");
+ }
+ if (eamRepairOrder.getActualEndTime()==null){
+ throw new RuntimeException("缁翠慨缁撴潫鏃堕棿涓虹┖");
+ }
+ if (StrUtil.isEmpty(eamRepairOrder.getFaultReason())){
+ throw new RuntimeException("鏁呴殰鍘熷洜涓虹┖");
+ }
+ if (StrUtil.isEmpty(eamRepairOrder.getFaultAnalysis())){
+ throw new RuntimeException("鏁呴殰鍒嗘瀽涓虹┖");
+ }
+ if (StrUtil.isEmpty(eamRepairOrder.getFaultProcess())){
+ throw new RuntimeException("鎺掓晠杩囩▼涓虹┖");
+ }
+ if (StrUtil.isEmpty(eamRepairOrder.getFaultPrevent())){
+ throw new RuntimeException("鏁呴殰棰勯槻涓虹┖");
+ }
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
EamEquipment eamEquipment = eamEquipmentService.getById(eamRepairOrder.getEquipmentId());
List<UserSelector> userSelectorList = sysUserService.selectOperatorList(eamEquipment.getEquipmentCode(), eamEquipment.getFactoryOrgCode(), BusinessCodeConst.PCR0001);
@@ -325,7 +347,7 @@
if ("1".equals(request.getConfirmResult())) {
order.setRepairStatus(EamRepairOrderRepairStatusEnum.REPAIR_COMPLETED.name());
}else {
- order.setRepairStatus(EamRepairOrderRepairStatusEnum.UNDER_MAINTENANCE.name());
+ order.setRepairStatus(EamRepairOrderRepairStatusEnum.REJECTED.name());
}
}
order.setConfirmer(user.getUsername());
@@ -334,7 +356,7 @@
order.setConfirmComment(request.getConfirmComment());
this.baseMapper.updateById(order);
EamReportRepair eamReportRepair=eamReportRepairService.getById(order.getReportId());
- eamReportRepair.setReportStatus(EamRepairOrderRepairStatusEnum.UNDER_MAINTENANCE.name());
+ eamReportRepair.setReportStatus(order.getRepairStatus());
eamReportRepairService.updateById(eamReportRepair);
return order;
}
--
Gitblit v1.9.3