From 99d6db0aab044b740ce02f57872c1e38ae647b58 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 19:00:50 +0800
Subject: [PATCH] 三不原则分析 中心修改 台账导入导出字段修改
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
index eb2d6fc..d91513b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -63,6 +63,8 @@
private IEamRepairOrderService iEamRepairOrderService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private IEamReportThreeNoSpareService eamReportThreeNoSpareService;
/**
* 鍒嗛〉鍒楄〃
*
@@ -197,17 +199,30 @@
EamReportProductHazards eamReportProductHazards=new EamReportProductHazards();
eamReportProductHazards.setEquipmentId(eamReportRepair.getEquipmentId());
eamReportProductHazards.setReportId(eamReportRepair.getId());
+ eamReportProductHazards.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
+ eamReportProductHazards.setConfirmStatus(EamReportProductHazardsEnum.PENDING_SUBMIT.name());
iEamReportProductHazardsService.save(eamReportProductHazards);
}
if (StrUtil.isNotEmpty(eamReportRepair.getIsAccidentsRegister())&&("1").equals(eamReportRepair.getIsAccidentsRegister())) {
//娣诲姞璁惧浜嬫晠鐧昏琛�
EamReportAccidentsRegister eamReportAccidentsRegister = new EamReportAccidentsRegister();
BeanUtils.copyProperties(eamReportRepairRequest, eamReportAccidentsRegister);
+ eamReportAccidentsRegister.setId(null);
eamReportAccidentsRegister.setReportId(eamReportRepair.getId());
- eamReportAccidentsRegister.setDelFlag(CommonConstant.DEFAULT_0);
+ eamReportAccidentsRegister.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_SUBMIT.name());
iEamReportAccidentsRegisterService.save(eamReportAccidentsRegister);
+ //鐢熸垚涓変笉鍘熷垯
+ EamReportThreeNoSpare eamReportThreeNoSpare = new EamReportThreeNoSpare();
+ BeanUtils.copyProperties(eamReportRepairRequest, eamReportThreeNoSpare);
+ eamReportThreeNoSpare.setId(null);
+ eamReportThreeNoSpare.setReportId(eamReportRepair.getId());
+ eamReportThreeNoSpare.setPreventionMeasures(eamReportAccidentsRegister.getTakeSteps());
+ eamReportThreeNoSpare.setSubmitStatus(EamReportThreeNoSpareEnum.PENDING_SUBMIT.name());
+ eamReportThreeNoSpare.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
+ eamReportThreeNoSpareService.save(eamReportThreeNoSpare);
}
- //鐢熸垚缁翠慨宸ュ崟,鍙兘浼氭湁棰嗗彇鎿嶄綔
+ //鐢熸垚缁翠慨宸ュ崟
EamRepairOrder eamRepairOrder=new EamRepairOrder();
BeanUtils.copyProperties(eamReportRepairRequest, eamRepairOrder);
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.REPAIR_ORDER_CODE_RULE);
@@ -215,6 +230,8 @@
eamRepairOrder.setId(null);
eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
eamRepairOrder.setReportId(eamReportRepair.getId());
+ eamRepairOrder.setReportPerson(eamReportRepair.getCreateBy());
+ eamRepairOrder.setFaultPhenomenon(eamReportRepair.getFaultDescription());
eamRepairOrder.setRepairStatus(EamRepairOrderRepairStatusEnum.PENDING_REPAIR.name());
iEamRepairOrderService.save(eamRepairOrder);
//鏇存柊璁惧缁翠慨鐘舵��
@@ -259,7 +276,7 @@
EamReportAccidentsRegister eamReportAccidentsRegister = new EamReportAccidentsRegister();
BeanUtils.copyProperties(eamReportRepairDto, eamReportAccidentsRegister);
eamReportAccidentsRegister.setReportId(eamReportRepairDto.getId());
- eamReportAccidentsRegister.setDelFlag(CommonConstant.DEFAULT_0);
+ eamReportAccidentsRegister.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
eamReportAccidentsRegister.setId(null);
iEamReportAccidentsRegisterService.save(eamReportAccidentsRegister);
}
--
Gitblit v1.9.3