From 88abda34da2c7437c8191da83972279d18ff9418 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期五, 20 六月 2025 20:17:45 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/service/WorkflowLinkService.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorkflowLinkService.java b/src/main/java/com/whyc/service/WorkflowLinkService.java
index f3acc30..d7b1737 100644
--- a/src/main/java/com/whyc/service/WorkflowLinkService.java
+++ b/src/main/java/com/whyc/service/WorkflowLinkService.java
@@ -72,7 +72,7 @@
link.setDealAndClose(1);
}
}break;
- //璁惧鍏ュ簱鐢宠 TODO 鍏ュ簱褰卞搷搴撳瓨
+ //璁惧鍏ュ簱鐢宠
case 2:
//璁惧鎶ュ簾鐢宠
case 3:{
@@ -149,19 +149,26 @@
link.setDealAndClose(1);
}
}break;
- case 4:{ //TODO 鍑哄簱鐢宠
+ case 4:{ // 鍑哄簱鐢宠
if(link.getStatus() == WorkflowEnum.LINK_STATUS_PASS.getValue().intValue()){
- mainInDB.setStatus(WorkflowEnum.MAIN_STATUS_WAIT_FOR_DEALING.getValue());
+ mainInDB.setStatus(WorkflowEnum.MAIN_STATUS_END_PASS.getValue());
+ mainInDB.setEndTime(now);
+ mainInDB.setEndReason(link.getDealReason());
mainService.updateById(mainInDB);
+ //鑾峰彇鍑哄簱鐢宠鍗曡澶�
+ List<WorkflowDevice> deviceListInDB = deviceService.getByMainId(mainInDB.getId());
+ List<DeviceSpare> spareList = new ArrayList<>();
+ deviceListInDB.forEach(device -> {
+ DeviceSpare spare = new DeviceSpare();
+ BeanUtils.copyProperties(device,spare);
+ spareList.add(spare);
+ });
+ //鏇存柊搴撳瓨
+ deviceSpareService.outBound(spareList);
}else if(link.getStatus() == WorkflowEnum.LINK_STATUS_REJECT.getValue().intValue()){
mainInDB.setStatus(WorkflowEnum.MAIN_STATUS_END_REJECT.getValue());
mainInDB.setEndReason(link.getDealRejectReason());
mainInDB.setEndTime(now);
- //妫�鏌ユ槸鍚︽湁鍏宠仈宸ュ崟.濡傛灉鏈夊叧鑱斿伐鍗�,鍏宠仈宸ュ崟鐘舵�侀噸缃负瀹岀粨寰呭鐞�,瀹屾垚鏃堕棿閲嶇疆涓虹┖
- if(mainInDB.getRelatedId() != null){
- Integer relatedId = mainInDB.getRelatedId();
- //mainService.resetRepairStatus(relatedId,mainInDB.getQuantity());
- }
mainService.updateById(mainInDB);
link.setDealAndClose(1);
}
--
Gitblit v1.9.1