From 22ae6b271ff0696b30c41c3011a7021608590dce Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 15 三月 2024 15:49:08 +0800
Subject: [PATCH] xg
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 76 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
index fcc616d..f618b41 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
@@ -72,6 +72,8 @@
private IFaultInfoService faultInfoService;
@Value("${jeecg.path.upload}")
private String upLoadPath;
+ @Autowired
+ private IRepairOrderService repairOrderService;
/**
@@ -279,42 +281,54 @@
@PutMapping("/accept")
public Result<?> accept(@RequestBody EquipmentReportRepair equipmentReportRepair ){
- if(equipmentReportRepair.getErrUda1().equals("yes")){
- QuanlityConfirm quanlityConfirm = quanlityConfirmService.getOne(new QueryWrapper<QuanlityConfirm>().eq("report_id",equipmentReportRepair.getId()),false);
- if(ObjectUtils.isNotNull(quanlityConfirm)){
- String isConfirm1 = quanlityConfirm.getIsConfirm();
- FaultInfo faultInfo = faultInfoService.getOne(new QueryWrapper<FaultInfo>().eq("quanlity_id",quanlityConfirm.getId()),false);
- if(ObjectUtils.isNotNull(faultInfo)){
- String isConfirm2 = faultInfo.getIsConfirm();
- if(!isConfirm1.equals("yes")||!isConfirm2.equals("yes")){
- return Result.error("楠屾敹澶辫触锛屼骇鍝佽川閲忛殣鎮ｇ‘璁ゅ拰浜嬫晠鐧昏灏氭湭瀹屾垚锛岃瀹屾垚纭鍚庡啀杩涜楠屾敹");
+ if(equipmentReportRepair.getErrUda4().equals("1")){
+ if(equipmentReportRepair.getErrUda1().equals("yes")){
+ QuanlityConfirm quanlityConfirm = quanlityConfirmService.getOne(new QueryWrapper<QuanlityConfirm>().eq("report_id",equipmentReportRepair.getId()),false);
+ if(ObjectUtils.isNotNull(quanlityConfirm)){
+ String isConfirm1 = quanlityConfirm.getIsConfirm();
+ FaultInfo faultInfo = faultInfoService.getOne(new QueryWrapper<FaultInfo>().eq("quanlity_id",quanlityConfirm.getId()),false);
+ if(ObjectUtils.isNotNull(faultInfo)){
+ String isConfirm2 = faultInfo.getIsConfirm();
+ if(!isConfirm1.equals("yes")||!isConfirm2.equals("yes")){
+ return Result.error("楠屾敹澶辫触锛屼骇鍝佽川閲忛殣鎮ｇ‘璁ゅ拰浜嬫晠鐧昏灏氭湭瀹屾垚锛岃瀹屾垚纭鍚庡啀杩涜楠屾敹");
+ }
+ }else {
+ return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜嬫晠鐧昏鍗�");
}
}else {
- return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜嬫晠鐧昏鍗�");
+ return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜у搧璐ㄩ噺纭");
}
- }else {
- return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜у搧璐ㄩ噺纭");
}
+ LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ equipmentReportRepair.setStatus("5");
+ equipmentReportRepair.setAcceptTime(new Date());
+ Date start = equipmentReportRepair.getFaultTime();
+ Date end = equipmentReportRepair.getAcceptTime();
+ if(ObjectUtils.isNotNull(start)){
+ long timeDifference =end.getTime() - start.getTime();
+ BigDecimal hours = new BigDecimal(timeDifference)
+ .divide(new BigDecimal(60 * 60 * 1000), 3, BigDecimal.ROUND_HALF_EVEN);
+ equipmentReportRepair.setFaultHour(hours);
+ }
+ equipmentReportRepairService.updateById(equipmentReportRepair);
+ String equipmentId = equipmentReportRepair.getEquipmentId();
+ if(StringUtils.isNotBlank(equipmentId)){
+ Equipment equipment = equipmentService.getById(equipmentId);
+ equipment.setEquipmentStatus("1");
+ equipmentService.updateById(equipment);
+ }
+ return Result.OK("楠屾敹鎴愬姛");
+ }else {
+ equipmentReportRepair.setStatus("2");
+ equipmentReportRepairService.updateById(equipmentReportRepair);
+ RepairOrder repairOrder = repairOrderService.getOne(new QueryWrapper<RepairOrder>().eq("report_repair_id",equipmentReportRepair.getId()),false);
+ if(ObjectUtils.isNotNull(repairOrder)){
+ repairOrder.setStatus("3");
+ repairOrderService.updateById(repairOrder);
+ }
+ return Result.OK("宸查┏鍥�");
}
- LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();
- equipmentReportRepair.setStatus("5");
- equipmentReportRepair.setAcceptTime(new Date());
- Date start = equipmentReportRepair.getFaultTime();
- Date end = equipmentReportRepair.getAcceptTime();
- if(ObjectUtils.isNotNull(start)){
- long timeDifference =end.getTime() - start.getTime();
- BigDecimal hours = new BigDecimal(timeDifference)
- .divide(new BigDecimal(60 * 60 * 1000), 3, BigDecimal.ROUND_HALF_EVEN);
- equipmentReportRepair.setFaultHour(hours);
- }
- equipmentReportRepairService.updateById(equipmentReportRepair);
- String equipmentId = equipmentReportRepair.getEquipmentId();
- if(StringUtils.isNotBlank(equipmentId)){
- Equipment equipment = equipmentService.getById(equipmentId);
- equipment.setEquipmentStatus("1");
- equipmentService.updateById(equipment);
- }
- return Result.OK("楠屾敹鎴愬姛");
+
}
/**
* 瀵煎嚭excel
--
Gitblit v1.9.3