From d61b21c50e62298f185ecafa8e0b22f7ee8c4973 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 21 八月 2025 18:13:17 +0800
Subject: [PATCH] 430报表接口与列表流程添加
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 d91513b..331183b 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
@@ -12,6 +12,7 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
@@ -65,6 +66,8 @@
private ISysBusinessCodeRuleService businessCodeRuleService;
@Autowired
private IEamReportThreeNoSpareService eamReportThreeNoSpareService;
+ @Autowired
+ private IEamBaseHFCodeService hfCodeService;
/**
* 鍒嗛〉鍒楄〃
*
@@ -201,6 +204,11 @@
eamReportProductHazards.setReportId(eamReportRepair.getId());
eamReportProductHazards.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
eamReportProductHazards.setConfirmStatus(EamReportProductHazardsEnum.PENDING_SUBMIT.name());
+ EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.REPORT_PRODUCT_HAZARDS.name());
+ if (eamBaseHFCode == null) {
+ throw new JeecgBootException("鏈厤缃骇鍝佸畨鍏ㄩ殣鎮ｇ‘璁ょ殑HF缂栫爜锛屾坊鍔犲け璐ワ紒");
+ }
+ eamReportProductHazards.setHfCode(eamBaseHFCode.getHfCode());
iEamReportProductHazardsService.save(eamReportProductHazards);
}
if (StrUtil.isNotEmpty(eamReportRepair.getIsAccidentsRegister())&&("1").equals(eamReportRepair.getIsAccidentsRegister())) {
@@ -211,6 +219,11 @@
eamReportAccidentsRegister.setReportId(eamReportRepair.getId());
eamReportAccidentsRegister.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_SUBMIT.name());
+ EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.REPORT_ACCIDENTS_REGISTER.name());
+ if (eamBaseHFCode == null) {
+ throw new JeecgBootException("鏈厤缃澶囦簨鏁呯櫥璁拌〃鐨凥F缂栫爜锛屾坊鍔犲け璐ワ紒");
+ }
+ eamReportAccidentsRegister.setHfCode(eamBaseHFCode.getHfCode());
iEamReportAccidentsRegisterService.save(eamReportAccidentsRegister);
//鐢熸垚涓変笉鍘熷垯
EamReportThreeNoSpare eamReportThreeNoSpare = new EamReportThreeNoSpare();
@@ -220,6 +233,11 @@
eamReportThreeNoSpare.setPreventionMeasures(eamReportAccidentsRegister.getTakeSteps());
eamReportThreeNoSpare.setSubmitStatus(EamReportThreeNoSpareEnum.PENDING_SUBMIT.name());
eamReportThreeNoSpare.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
+ EamBaseHFCode threeHfCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.REPORT_THREE_NO_SPARE.name());
+ if (threeHfCode == null) {
+ throw new JeecgBootException("鏈厤缃笁涓嶆斁杩囧師鍒欒〃鐨凥F缂栫爜锛屾坊鍔犲け璐ワ紒");
+ }
+ eamReportThreeNoSpare.setHfCode(threeHfCode.getHfCode());
eamReportThreeNoSpareService.save(eamReportThreeNoSpare);
}
//鐢熸垚缁翠慨宸ュ崟
@@ -232,6 +250,8 @@
eamRepairOrder.setReportId(eamReportRepair.getId());
eamRepairOrder.setReportPerson(eamReportRepair.getCreateBy());
eamRepairOrder.setFaultPhenomenon(eamReportRepair.getFaultDescription());
+ eamRepairOrder.setFaultStartTime(eamReportRepair.getFaultStartTime());
+ eamRepairOrder.setClaimStatus("0");
eamRepairOrder.setRepairStatus(EamRepairOrderRepairStatusEnum.PENDING_REPAIR.name());
iEamRepairOrderService.save(eamRepairOrder);
//鏇存柊璁惧缁翠慨鐘舵��
@@ -282,6 +302,12 @@
}
updateWrapper.eq(EamReportRepair::getId,eamReportRepairDto.getId());
this.update(eamReportRepair,updateWrapper);
+ //淇敼缁翠慨宸ュ崟
+ EamRepairOrder eamRepairOrder=iEamRepairOrderService.
+ getOne(new QueryWrapper<EamRepairOrder>().eq("report_id",eamReportRepairDto.getId()));
+ eamRepairOrder.setFaultStartTime(eamReportRepairDto.getFaultStartTime());
+ eamRepairOrder.setFaultPhenomenon(eamReportRepairDto.getFaultDescription());
+ iEamRepairOrderService.updateById(eamRepairOrder);
return true;
}
--
Gitblit v1.9.3