From 643e1af242a139b408969dfa1ba2f52e554c8c41 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 25 十月 2023 17:03:53 +0800
Subject: [PATCH] 已经处理的问题
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
index cfa62f0..073cfe2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
@@ -92,6 +92,12 @@
@Autowired
@Lazy
private IProjectMaintenanceOrderService projectMaintenanceOrderService;
+ @Autowired
+ @Lazy
+ private IdentityService sysIdentityService;
+
+
+
@@ -1491,7 +1497,18 @@
* @return
*/
@PutMapping(value = "/start")
+ @Transactional(rollbackFor = Exception.class)
public Result<?> orderStart(@RequestBody RepairOrder repairOrder){
+ if(StringUtils.isNotBlank(repairOrder.getReportRepairId())){
+ EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(repairOrder.getReportRepairId());
+ equipmentReportRepair.setStatus("3");
+ equipmentReportRepairService.updateById(equipmentReportRepair);
+ if(StringUtils.isNotBlank(equipmentReportRepair.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
+ equipment.setEquipmentStatus("7");
+ equipmentService.updateById(equipment);
+ }
+ }
if(StringUtils.isNotBlank(repairOrder.getProjectMaintenanceOrderId())){
//鍒ゆ柇椤圭洰鎬х淮淇瓙琛ㄧ姸鎬�
ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder.getProjectMaintenanceOrderId());
@@ -1578,5 +1595,28 @@
}
return Result.OK(repairOrderService.update(new UpdateWrapper<RepairOrder>().set("status",7).eq("id",repairOrder.getId())));
}
-
+ @PostMapping("addBySelectReport")
+ public Result<?> addBySelectReport(@RequestBody List<EquipmentReportRepair> equipmentReportRepairs){
+ LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ for(EquipmentReportRepair equipmentReportRepair:equipmentReportRepairs){
+ String num = sysIdentityService.getNumByTypeAndLength("RepairOrder",4);
+ Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
+ equipmentReportRepair.setStatus("2");
+ RepairOrder repairOrder = new RepairOrder();
+ repairOrder.setNum(num);
+ repairOrder.setReportRepairId(equipmentReportRepair.getId());
+ repairOrder.setStatus("2");
+ repairOrder.setEquipmentId(equipment.getId());
+ repairOrder.setTeamId(equipment.getTeamId());
+ repairOrder.setDepartId(equipment.getUseId());
+ repairOrder.setFaultDescription(equipmentReportRepair.getFaultDescription());
+ repairOrder.setFaultTime(equipmentReportRepair.getFaultTime());
+ repairOrder.setResponsibilityId(user.getId());
+ repairOrder.setRepairOrderType(0);
+ repairOrder.setDelFlag(0);
+ repairOrderService.save(repairOrder);
+ }
+ equipmentReportRepairService.updateBatchById(equipmentReportRepairs);
+ return Result.OK("棰嗗彇鎴愬姛");
+ }
}
--
Gitblit v1.9.3