From a5b427bc39acc0cea80e3ca44d5744968778bc74 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 12 十二月 2023 15:25:13 +0800
Subject: [PATCH] 维修履历
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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 f3b4005..595167d 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
@@ -17,10 +17,7 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.eam.entity.Equipment;
-import org.jeecg.modules.eam.entity.EquipmentReportRepair;
-import org.jeecg.modules.eam.entity.FaultDescription;
-import org.jeecg.modules.eam.entity.QuanlityConfirm;
+import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
@@ -30,6 +27,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -61,6 +59,8 @@
@Autowired
@Lazy
private IdentityService sysIdentityService;
+ @Autowired
+ private IFaultInfoService faultInfoService;
/**
@@ -121,6 +121,19 @@
quanlityConfirm.setQuantity(equipmentReportRepair.getQuantity());
quanlityConfirm.setOperator(curUser.getId());
quanlityConfirmService.save(quanlityConfirm);
+ String fNum = sysIdentityService.getNumByTypeAndLength("FaultInfo",4);
+ FaultInfo faultInfo = new FaultInfo();
+ faultInfo.setNum(fNum);
+ faultInfo.setQuanlityId(quanlityConfirm.getId());
+ faultInfo.setOperater(quanlityConfirm.getOperator());
+ faultInfo.setIsConfirm(IS_PRODUCT_NO);
+ String eId = equipmentReportRepair.getEquipmentId();
+ Equipment equipment = equipmentService.getById(eId);
+ faultInfo.setEquipModel(equipment.getModel());
+ faultInfo.setEquipName(equipment.getName());
+ faultInfo.setEquipNum(equipment.getNum());
+ faultInfoService.save(faultInfo);
+
}
Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
equipment.setEquipmentStatus("2");
@@ -244,8 +257,34 @@
@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("楠屾敹澶辫触锛屼骇鍝佽川閲忛殣鎮ｇ‘璁ゅ拰浜嬫晠鐧昏灏氭湭瀹屽満锛岃瀹屾垚纭鍚庡啀杩涜楠屾敹");
+ }
+ }else {
+ 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)){
--
Gitblit v1.9.3