From 4fdde57a837b47b0a04aa17a7627c21b7425eda2 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期五, 26 十二月 2025 23:25:11 +0800
Subject: [PATCH] feat: 优化取消时，调度单中显示原因
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java
index 98a4b8f..72e4127 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusPushServiceImpl.java
@@ -1,11 +1,14 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.common.config.LegacySystemConfig;
+import com.ruoyi.common.utils.LongUtil;
import com.ruoyi.system.domain.SysTask;
import com.ruoyi.system.domain.SysTaskEmergency;
import com.ruoyi.system.domain.enums.TaskStatus;
import com.ruoyi.system.mapper.SysTaskMapper;
import com.ruoyi.system.service.IDispatchOrdService;
+import com.ruoyi.system.service.IServiceOrderService;
+import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysTaskEmergencyService;
import com.ruoyi.system.service.ITaskStatusPushService;
import com.ruoyi.system.utils.TaskStatusPushConverter;
@@ -40,6 +43,12 @@
@Autowired
private IDispatchOrdService dispatchOrdService;
+
+ @Autowired
+ private IServiceOrderService serviceOrderService;
+
+ @Autowired
+ private ISysDictDataService sysDictDataService;
/**
* 灏嗗崟涓换鍔＄姸鎬佹帹閫佸埌鏃х郴缁�
@@ -115,7 +124,16 @@
// currentLegacyStatus, TaskStatusPushConverter.getLegacyStatusDescription(currentLegacyStatus));
return true; // 杩斿洖true锛屽洜涓鸿繖涓嶇畻澶辫触锛屽彧鏄笉闇�瑕佹帹閫�
}
-
+ if(newTaskStatus.equals(TaskStatus.CANCELLED)){
+ if(LongUtil.isNotEmpty(emergency.getLegacyServiceOrdId()) ) {
+ log.info("鍙栨秷杞繍浠诲姟: {}", emergency.getLegacyServiceOrdId());
+ cancelTask(emergency.getLegacyServiceOrdId(), emergency.getCancelReason(), emergency.getCancelBy());
+ }
+ if(LongUtil.isNotEmpty(emergency.getLegacyDispatchOrdId())){
+ log.info("鍙栨秷璋冨害鍗�: {}", emergency.getLegacyDispatchOrdId());
+ cancelDispatch(emergency.getLegacyDispatchOrdId(), emergency.getCancelReason(), emergency.getCancelBy());
+ }
+ }
// 鎺ㄩ�佺姸鎬佸埌鏃х郴缁�
boolean result = updateLegacyTaskStatus(emergency.getLegacyDispatchOrdId(), targetStatusCode);
@@ -136,7 +154,11 @@
return false;
}
}
-
+
+ private void cancelDispatch(Long legacyDispatchOrdId, String cancelReason, String cancelReasonText) {
+ dispatchOrdService.cancelDispatchOrd(legacyDispatchOrdId, Integer.parseInt(cancelReason), cancelReasonText);
+ }
+
/**
* 鎵归噺鎺ㄩ�佷换鍔＄姸鎬佸埌鏃х郴缁�
* 浣跨敤鍒嗛〉鏌ヨ锛岀‘淇濇墍鏈夌鍚堟潯浠剁殑浠诲姟閮借兘琚帹閫�
@@ -204,7 +226,52 @@
return 0;
}
}
-
+
+
+ private void cancelTask(Long serviceOrderId, String cancelReason, String cancelBy){
+ // 鍙栨秷浠诲姟锛屾洿鏂癝QL Server涓殑ServiceOrder琛�
+ try {
+ if (LongUtil.isEmpty(serviceOrderId)) {
+ log.warn("ServiceOrderID涓虹┖锛屾棤娉曞彇娑堜换鍔�");
+ return;
+ }
+
+ // 瑙ｆ瀽鍙栨秷鍘熷洜ID
+ Integer cancelReasonId = null;
+ String cancelReasonText = "";
+
+ if (cancelReason != null && !cancelReason.isEmpty()) {
+ try {
+ cancelReasonId = Integer.parseInt(cancelReason);
+ // 浠庢暟鎹瓧鍏告煡璇㈠彇娑堝師鍥犳枃鏈�
+ String dictLabel = sysDictDataService.selectDictLabel("task_cancel_reason", cancelReason);
+ if (dictLabel != null && !dictLabel.isEmpty()) {
+ cancelReasonText = "[鍙栨秷鎿嶄綔:" + (cancelBy != null ? cancelBy : "绯荤粺") + "] " + dictLabel;
+ } else {
+ cancelReasonText = "[鍙栨秷鎿嶄綔:" + (cancelBy != null ? cancelBy : "绯荤粺") + "]";
+ }
+ } catch (NumberFormatException e) {
+ log.warn("鍙栨秷鍘熷洜ID鏍煎紡閿欒: {}", cancelReason);
+ cancelReasonText = "[鍙栨秷鎿嶄綔:" + (cancelBy != null ? cancelBy : "绯荤粺") + "] " + cancelReason;
+ }
+ } else {
+ cancelReasonText = "[鍙栨秷鎿嶄綔:" + (cancelBy != null ? cancelBy : "绯荤粺") + "]";
+ }
+
+ // 璋冪敤Service鏇存柊ServiceOrder琛�
+ int rows = serviceOrderService.updateServiceOrderCancelInfo(serviceOrderId, cancelReasonId, cancelReasonText);
+
+ if (rows > 0) {
+ log.info("鎴愬姛鏇存柊鏃х郴缁烻erviceOrder鍙栨秷淇℃伅锛孲erviceOrdID: {}, 鍙栨秷鍘熷洜ID: {}, 鍙栨秷鍘熷洜鏂囨湰: {}",
+ serviceOrderId, cancelReasonId, cancelReasonText);
+ } else {
+ log.warn("鏇存柊鏃х郴缁烻erviceOrder鍙栨秷淇℃伅澶辫触锛屾湭鎵惧埌瀵瑰簲璁㈠崟锛孲erviceOrdID: {}", serviceOrderId);
+ }
+
+ } catch (Exception e) {
+ log.error("鏇存柊鏃х郴缁烻erviceOrder鍙栨秷淇℃伅寮傚父锛孲erviceOrdID: {}", serviceOrderId, e);
+ }
+ }
/**
* 鏇存柊鏃х郴缁熻皟搴﹀崟鐘舵�侊紙鐩存帴鎿嶄綔SQL Server鏁版嵁搴擄級
*
--
Gitblit v1.9.1