From ae33e68baf21878ce145d75ac377d14c1e2b2a82 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 14:59:26 +0800
Subject: [PATCH] 设备台账
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 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 a867a9c..aa77ba7 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
@@ -1547,6 +1547,15 @@
@PutMapping(value = "/report")
@Transactional(rollbackFor = {Exception.class})
public Result<?> orderReport(@RequestBody RepairOrder repairOrder){
+ String id = repairOrder.getId();
+ List<RepairOrderActualWorkHours> hoursList = repairOrderActualWorkHoursService.list(new QueryWrapper<RepairOrderActualWorkHours>().eq("repair_order_id",id).eq("del_flag",0));
+ List<RepairOrderActualWorkHours> mainStuff = repairOrderActualWorkHoursService.list(new QueryWrapper<RepairOrderActualWorkHours>().eq("repair_order_id",id).eq("del_flag",0).eq("principal_contractor","1"));
+ if(hoursList.size()<2){
+ return Result.error("鎿嶄綔澶辫触锛岃鑷冲皯娣诲姞涓や釜鎵夸慨浜�");
+ }
+ if(mainStuff.size()!=1){
+ return Result.error("鎿嶄綔澶辫触锛岃娣诲姞涓绘壙淇汉锛屾湁涓斿彧鏈変竴涓�");
+ }
if(StringUtils.isNotBlank(repairOrder.getProjectMaintenanceOrderId())){
//鍒ゆ柇椤圭洰鎬х淮淇瓙琛ㄧ姸鎬�
ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder.getProjectMaintenanceOrderId());
@@ -1587,8 +1596,13 @@
repairOrder.setStatus("4");
repairOrder.setActualEndTime(now);
repairOrder.setActualHour(hours);
- repairOrder.setRecipientUserId(user.getId());
+ repairOrder.setRecipientUserId(mainStuff.get(0).getUserId());
repairOrderService.updateById(repairOrder);
+ if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());
+ equipment.setEquipmentStatus("4");
+ equipmentService.updateById(equipment);
+ }
return Result.OK("鎶ュ伐鎴愬姛");
}
/**
@@ -1650,6 +1664,11 @@
repairOrder.setRepairOrderUda2(new Date());
repairOrder.setRepairOrderUda1("needSpare");
repairOrderService.updateById(repairOrder);
+ if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());
+ equipment.setEquipmentStatus("8");
+ equipmentService.updateById(equipment);
+ }
return Result.OK("鎿嶄綔鎴愬姛");
}
/**
@@ -1669,6 +1688,11 @@
repairOrder.setRepairOrderUda1("normal");
repairOrder.setSpareTime(hours);
repairOrderService.updateById(repairOrder);
+ if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());
+ equipment.setEquipmentStatus("7");
+ equipmentService.updateById(equipment);
+ }
return Result.OK("鎿嶄綔鎴愬姛");
}
/**
@@ -1682,6 +1706,11 @@
repairOrder.setRepairOrderUda4(new Date());
repairOrder.setRepairOrderUda1("needPart");
repairOrderService.updateById(repairOrder);
+ if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());
+ equipment.setEquipmentStatus("9");
+ equipmentService.updateById(equipment);
+ }
return Result.OK("鎿嶄綔鎴愬姛");
}
/**
@@ -1701,6 +1730,11 @@
repairOrder.setRepairOrderUda1("normal");
repairOrder.setPartTime(hours);
repairOrderService.updateById(repairOrder);
+ if(StringUtils.isNotBlank(repairOrder.getEquipmentId())){
+ Equipment equipment = equipmentService.getById(repairOrder.getEquipmentId());
+ equipment.setEquipmentStatus("7");
+ equipmentService.updateById(equipment);
+ }
return Result.OK("鎿嶄綔鎴愬姛");
}
@@ -1716,4 +1750,17 @@
jsonObject.put("data",list);
return jsonObject;
}
+
+ /**
+ * 璁惧鍙紑鍔ㄧ巼
+ *
+ * @return
+ */
+ @GetMapping("/getStartRate")
+ public JSONObject getStartRate(@RequestParam Map<String, String> query) throws ParseException {
+ List<EquipmentAvailabilityVo> list = repairOrderService.getStartRate(query);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data",list);
+ return jsonObject;
+ }
}
--
Gitblit v1.9.3