From be8a6f171bd41aa50fb7310b2ccbe753dac20b89 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 16:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 75 insertions(+), 24 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index ba3283b..8e13fa6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -163,6 +164,10 @@
List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
+ List<Map<String, Object>> operationUserDetails = dailyMaintenanceOrderService.getOperationUser(id);
+ record.put("operationUserDetails", operationUserDetails);
+ List<Map<String, Object>> repairUserDetails = dailyMaintenanceOrderService.getRepairUser(id);
+ record.put("repairUserDetails", repairUserDetails);
//缁熻宸ユ椂瀹氶
// BigDecimal workingHourQuota = new BigDecimal(0);
// for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){
@@ -201,13 +206,21 @@
.eq(FinishTransferOrder::getEquipmentId, equipmentId).list();
for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
String operateUser = finishTransferOrder.getOperateUser();
- record.put("operateUserName", operateUser);
+// record.put("operateUserName", operateUser+"/"+finishTransferOrder.getTransferOrderUda1());
+// record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1()));
+ record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser));
String repairUser = finishTransferOrder.getRepairUser();
- record.put("repairUserName", repairUser);
+// record.put("repairUserName", repairUser+"/"+finishTransferOrder.getTransferOrderUda2());
+// record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2()));
+ record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser));
String repairDirectorUser = finishTransferOrder.getRepairDirectorUser();
- record.put("repairDirectorUserName", repairDirectorUser);
+// record.put("repairDirectorUserName", repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3());
+// record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()));
+ record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser));
String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser();
- record.put("equipmentInspectorUserName", equipmentInspectorUser);
+// record.put("equipmentInspectorUserName", equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4());
+// record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()));
+ record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser));
}
}
@@ -225,7 +238,7 @@
List<Map<String, Object>> records = dailyMaintenanceOrderList.getRecords();
for (Map<String, Object> record : records) {
String id = (String) record.get("id");
- String equipmentId = (String) record.get("equipmentId");
+// String equipmentId = (String) record.get("equipmentId");
String maintenanceStandardId = (String) record.get("maintenanceStandardId");
List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
record.put("maintenanceCycles", maintenanceCycles);
@@ -293,21 +306,23 @@
Date planStartTime = dailyMaintenanceOrder.getPlanStartTime();
String maintenanceCycleId = dailyMaintenanceOrder.getMaintenanceCycleId();
MaintenanceCycle maintenanceCycle = maintenanceCycleService.getById(maintenanceCycleId);
- String unit = maintenanceCycle.getUnit();
- int effectiveTime = maintenanceCycle.getEffectiveTime().intValue();
- Date date = null;
- if ("min".equals(unit)) {
- date = DateUtils.getMinAfter(planStartTime, effectiveTime);
- } else if ("hour".equals(unit)) {
- date = DateUtils.getHourAfter(planStartTime, effectiveTime);
- } else if ("day".equals(unit)) {
- date = DateUtils.getDayAfter(planStartTime, effectiveTime);
- }
- dailyMaintenanceOrder.setPlanEndTime(date);//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
+// String unit = maintenanceCycle.getUnit();
+// int effectiveTime = maintenanceCycle.getEffectiveTime().intValue();
+// Date date = null;
+// if ("min".equals(unit)) {
+// date = DateUtils.getMinAfter(planStartTime, effectiveTime);
+// } else if ("hour".equals(unit)) {
+// date = DateUtils.getHourAfter(planStartTime, effectiveTime);
+// } else if ("day".equals(unit)) {
+// date = DateUtils.getDayAfter(planStartTime, effectiveTime);
+// }
+// dailyMaintenanceOrder.setPlanEndTime(date);//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
+ dailyMaintenanceOrder.setPlanEndTime(null);//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
dailyMaintenanceOrder.setCreateType("1");//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
dailyMaintenanceOrder.setConfirmStatus("0");//绉讳氦纭鐘舵�侊紙0鏈‘璁わ紝1涓讳换纭锛�2妫�楠屽憳纭锛�
dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//绮惧害妫�楠屽崟娴佺▼鐘舵�侊紙0鏈‘璁わ紝1绮惧害妫�楠岃�咃紝2缁翠慨瀹や富浠伙紝3璁惧妫�楠屽憳锛�4浣跨敤鍗曚綅鎶�鏈富绠★紝5璁惧妫�楠屽憳锛堢洊绔狅級锛�
dailyMaintenanceOrder.setStoveExemptStatus("0");//鐐夌被璁惧璞佸厤20椤圭姸鎬侊紙0鏈‘璁わ紝1缁翠慨瀹や富浠伙紝2淇濆吇浜哄憳锛�3浠〃宸ワ級
+ dailyMaintenanceOrder.setStatus("3");//3:鏈紑濮�
dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
@@ -367,7 +382,9 @@
* 鑻ユ灉鍘熸爣鍑嗗師鍛ㄦ湡鍙戠敓鍙樺寲锛屽垹闄ゅ師宸ュ崟鏄庣粏 閲嶆柊缁存姢
*/
if (!oldMaintenanceStandardId.equals(maintenanceStandardId) || !oldMaintenanceCycleId.equals(maintenanceCycleId)) {
- List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrderDetailService.lambdaQuery().eq(DailyMaintenanceOrderDetail::getDailyMaintenanceOrderId, orderId).eq(DailyMaintenanceOrderDetail::getDelFlag, 0).list();
+ List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrderDetailService
+ .lambdaQuery().eq(DailyMaintenanceOrderDetail::getDailyMaintenanceOrderId, orderId)
+ .eq(DailyMaintenanceOrderDetail::getDelFlag, 0).list();
for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
dailyMaintenanceOrderDetailService.removeById(dailyMaintenanceOrderDetail);
}
@@ -642,24 +659,29 @@
public Result<String> report(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
- dailyMaintenanceOrder.setMaintenanceUserId(userId);
+// dailyMaintenanceOrder.setMaintenanceUserId(userId);
dailyMaintenanceOrder.setActualEndTime(new Date());
boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);
+
+ List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
+ for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
+ maintenanceOrderDetail.setMaintenanceOrderDetailUda1(dailyMaintenanceOrder.getMaintenanceUserId());
+ dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
+ }
String id = dailyMaintenanceOrder.getId();
DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
FinishTransferOrder finishTransferOrder = new FinishTransferOrder();
finishTransferOrder.setEquipmentId(maintenanceOrder.getEquipmentId());
finishTransferOrder.setMaintenanceOrderId(maintenanceOrder.getId());
-// finishTransferOrder.setOperateUser(userId);
-// finishTransferOrder.setRepairUser(userId);
finishTransferOrder.setStatus("1");
finishTransferOrder.setDelFlag(0);
finishTransferOrderService.save(finishTransferOrder);
-// this.createPrecisionInspection(maintenanceOrder);
-//
-// this.createMaintenanceStoveExempt(maintenanceOrder);
+ String equipmentId = maintenanceOrder.getEquipmentId();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ equipment.setSecondMaintenanceTime(new Date());
+ equipmentService.updateById(equipment);
if (!b) {
return Result.error("鎶ュ伐澶辫触!");
@@ -674,9 +696,15 @@
public Result<String> report3M(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
- dailyMaintenanceOrder.setMaintenanceUserId(userId);
+// dailyMaintenanceOrder.setMaintenanceUserId(userId);
dailyMaintenanceOrder.setActualEndTime(new Date());
boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);
+
+ List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
+ for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
+ maintenanceOrderDetail.setMaintenanceOrderDetailUda1(dailyMaintenanceOrder.getMaintenanceUserId());
+ dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
+ }
String id = dailyMaintenanceOrder.getId();
DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
@@ -699,6 +727,20 @@
this.createPrecisionInspection(maintenanceOrder);
this.createMaintenanceStoveExempt(maintenanceOrder);
+
+ /**
+ * 涓変繚鎶ュ伐鏃� 鏇存柊鏈涓変繚鏃ユ湡 鍜屼笅娆′笁淇濇棩鏈�
+ */
+ String equipmentImportanceId = equipment.getEquipmentImportanceId();
+ equipment.setThirdMaintenanceTime(new Date());
+ if("A".equals(equipmentImportanceId)){
+ equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),3));
+ }else if("B".equals(equipmentImportanceId)){
+ equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),4));
+ }else if("C".equals(equipmentImportanceId)){
+ equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),4));
+ }
+ equipmentService.updateById(equipment);
if (!b) {
return Result.error("鎶ュ伐澶辫触!");
@@ -768,10 +810,12 @@
String orderId = dailyMaintenanceOrder.getId();
String maintenanceOrderUda3 = dailyMaintenanceOrder.getMaintenanceOrderUda3();
String confirmStatus = dailyMaintenanceOrder.getConfirmStatus();
+ Date maintenanceDate = dailyMaintenanceOrder.getMaintenanceDate();
DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(orderId);
String equipmentId = maintenanceOrder.getEquipmentId();
String orderUda3 = maintenanceOrder.getMaintenanceOrderUda3();
+ maintenanceOrder.setMaintenanceDate(maintenanceDate);
if(StringUtils.isBlank(orderUda3)){
maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
}
@@ -783,6 +827,7 @@
FinishTransferOrder finishTransferOrder = finishTransferOrders.get(0);
if("1".equals(confirmStatus)){
finishTransferOrder.setOperateUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda1(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -794,6 +839,7 @@
finishTransferOrder.setRepairDirectorUser("");
finishTransferOrder.setRepairUser("");
finishTransferOrder.setOperateUser("");
+ finishTransferOrder.setTransferOrderUda1("");
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -802,6 +848,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曟搷浣滀汉鍛�",maintenanceOrder.getNum());
}else if("3".equals(confirmStatus)){
finishTransferOrder.setRepairUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda2(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -812,6 +859,7 @@
finishTransferOrder.setEquipmentInspectorUser("");
finishTransferOrder.setRepairDirectorUser("");
finishTransferOrder.setRepairUser("");
+ finishTransferOrder.setTransferOrderUda2("");
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -820,6 +868,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇汉鍛�",maintenanceOrder.getNum());
}else if("5".equals(confirmStatus)){
finishTransferOrder.setRepairDirectorUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda3(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -828,6 +877,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曟楠屽憳",maintenanceOrder.getNum());
}else if("6".equals(confirmStatus)){
finishTransferOrder.setRepairDirectorUser("");
+ finishTransferOrder.setTransferOrderUda3("");
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -836,6 +886,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇涓讳换",maintenanceOrder.getNum());
}else if("7".equals(confirmStatus)){
finishTransferOrder.setEquipmentInspectorUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda4(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
--
Gitblit v1.9.3