From 0bc74278ff8130936bc7aed763e8901fedb4f3b0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 01 八月 2025 11:44:49 +0800
Subject: [PATCH] 故障报修新增hf编码
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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 e59f21d..a24b234 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
@@ -114,6 +114,9 @@
}
//鏌ヨ鏉′欢杩囨护
if (query != null) {
+ if (StringUtils.isNotBlank(query.getId())){
+ queryWrapper.eq("wmo.id", query.getId());
+ }
if (StringUtils.isNotBlank(query.getEquipmentId())) {
queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
}
@@ -180,6 +183,7 @@
eamMaintenanceStandardDetailList.forEach(item -> {
EamSecondMaintenanceOrderDetail detail = new EamSecondMaintenanceOrderDetail();
BeanUtils.copyProperties(item, detail);
+ detail.setId(null);
detail.setOrderId(order.getId());
requestTableDetailList.add(detail);
});
@@ -374,8 +378,9 @@
entity.setOperator(user.getUsername());
values.put("organization", "浜屼繚鎿嶄綔宸ユ墽琛岀粨鏉�");
values.put("comment", "浜屼繚鎿嶄綔宸ユ墽琛岀粨鏉�");
+ request.setComment("浜屼繚鎿嶄綔宸ユ墽琛岀粨鏉�");
//澶勭悊瀵瑰簲璇︽儏
- if (CollectionUtils.isNotEmpty(request.getOperatorDetailList())){
+ if (CollectionUtils.isNotEmpty(request.getTableDetailList())){
//鍒犻櫎鍘熸湁鏁版嵁
List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
//鍏堝垹闄ゅ師鏈�
@@ -383,10 +388,11 @@
queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, entity.getId());
queryWrapper.eq(EamSecondMaintenanceOrderDetail::getItemCategory,EamMaintenanceStandardDetailCategory.OPERATOR_MAINTENANCE.name());
secondMaintenanceOrderDetailService.remove(queryWrapper);
- request.getOperatorDetailList().forEach(tableDetail -> {
+ request.getTableDetailList().forEach(tableDetail -> {
EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
eamMaintenanceStandardDetail.setOrderId(entity.getId());
+ eamMaintenanceStandardDetail.setCreateBy(user.getUsername());
addList.add(eamMaintenanceStandardDetail);
});
secondMaintenanceOrderDetailService.saveBatch(addList);
@@ -395,8 +401,9 @@
entity.setRepairman(user.getUsername());
values.put("organization", "浜屼繚缁翠慨宸ユ墽琛岀粨鏉�");
values.put("comment", "浜屼繚缁翠慨宸ユ墽琛岀粨鏉�");
+ request.setComment("浜屼繚缁翠慨宸ユ墽琛岀粨鏉�");
//澶勭悊瀵瑰簲璇︽儏
- if (CollectionUtils.isNotEmpty(request.getRepairmanDetailList())){
+ if (CollectionUtils.isNotEmpty(request.getTableDetailList())){
//鍒犻櫎鍘熸湁鏁版嵁
List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
//鍏堝垹闄ゅ師鏈�
@@ -404,10 +411,11 @@
queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, entity.getId());
queryWrapper.eq(EamSecondMaintenanceOrderDetail::getItemCategory,EamMaintenanceStandardDetailCategory.REPAIRER_MAINTENANCE.name());
secondMaintenanceOrderDetailService.remove(queryWrapper);
- request.getRepairmanDetailList().forEach(tableDetail -> {
+ request.getTableDetailList().forEach(tableDetail -> {
EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
eamMaintenanceStandardDetail.setOrderId(entity.getId());
+ eamMaintenanceStandardDetail.setCreateBy(user.getUsername());
addList.add(eamMaintenanceStandardDetail);
});
secondMaintenanceOrderDetailService.saveBatch(addList);
@@ -417,35 +425,49 @@
break;
case WAIT_ADMIN_CONFIRM:
//绠＄悊鍛樼‘璁�
- userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0003);
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0006);
if (CollectionUtil.isEmpty(userSelectors)) {
throw new JeecgBootException("璁惧鏈瓨鍦ㄦ鏌ヤ汉锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
}else{
userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("NextAssignee", userApprovalList);
values.put("dataId", entity.getId());
- values.put("organization",request.getComment());
- values.put("comment", request.getComment());
+ if (StrUtil.isEmpty(request.getDealDescription())){
+ request.setDealDescription("");
+ }
+ values.put("organization",request.getDealDescription());
+ values.put("comment", request.getDealDescription());
values.put("manageUserResult",request.getManageUserResult());
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_INSPECTOR_CONFIRM.name());
entity.setManageUser(user.getUsername());
entity.setProblemDescription(request.getProblemDescription());
entity.setManageUserResult(request.getManageUserResult());
- entity.setDealDescription(request.getComment());
+ entity.setDealDescription(request.getDealDescription());
entity.setConfirmTime(new Date());
+ request.setComment(request.getDealDescription());
+ if (request.getManageUserResult().equals("2")){
+ entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.REJECTED.name());
+ }
}
break;
case WAIT_INSPECTOR_CONFIRM:
//妫�鏌ヤ汉纭
+ if (StrUtil.isEmpty(request.getDealDescription())){
+ request.setDealDescription("");
+ }
values.put("dataId", entity.getId());
- values.put("organization",request.getComment());
- values.put("comment", request.getComment());
+ values.put("organization",request.getInspectConfirmComment());
+ values.put("comment", request.getInspectConfirmComment());
values.put("inspectorResult",request.getInspectorResult());
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.COMPLETE.name());
entity.setInspector(user.getUsername());
entity.setInspectorResult(request.getInspectorResult());
entity.setInspectConfirmComment(request.getInspectConfirmComment());
entity.setInspectConfirmTime(new Date());
+ request.setComment(request.getDealDescription());
+ if (request.getInspectorResult().equals("2")){
+ entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.REJECTED.name());
+ }
break;
default:
throw new JeecgBootException("瀹℃壒澶辫触");
--
Gitblit v1.9.3