From c459808efab29dc1b8439fbb90556bdb16f4c88b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 01 四月 2026 22:40:59 +0800
Subject: [PATCH] feat: 优化支付时显示任务ID
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java
index bb566c9..6cb05ef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskController.java
@@ -13,6 +13,7 @@
import com.ruoyi.system.service.*;
import com.ruoyi.system.service.ILegacySystemSyncService;
import com.ruoyi.system.service.ITaskDispatchSyncService;
+import com.ruoyi.system.mapper.SysTaskStatusHistoryMapper;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysTask;
import com.ruoyi.system.domain.SysTaskLog;
+import com.ruoyi.system.domain.SysTaskStatusHistory;
import com.ruoyi.system.domain.VehicleInfo;
import com.ruoyi.system.domain.vo.TaskQueryVO;
import com.ruoyi.system.domain.vo.TaskCreateVO;
@@ -82,6 +84,9 @@
@Autowired
private ITaskStatusPushService taskStatusPushService;
+ @Autowired
+ private SysTaskStatusHistoryMapper sysTaskStatusHistoryMapper;
+
/**
* 鏌ヨ浠诲姟绠＄悊鍒楄〃锛堝悗鍙扮鐞嗙锛�
* 绠＄悊鍛樻潈闄愶紝鍙互鏌ョ湅鎵�鏈変换鍔�
@@ -95,7 +100,7 @@
List<SysTask> list;
if(searchTaskCode != null && !searchTaskCode.trim().isEmpty()){
// Search across task_code, emergency_info.dispatch_code, and emergency_info.service_code
- list = sysTaskService.selectSysTaskListByMultiCode(queryVO, searchTaskCode);
+ list = sysTaskService.selectSysTaskListByMultiCode(queryVO, searchTaskCode.trim());
} else {
queryVO.setTaskCode(null);
list = sysTaskService.selectSysTaskList(queryVO);
@@ -631,7 +636,7 @@
* 鎵嬪姩鍚屾鏈嶅姟鍗曞埌鏃х郴缁�
* 褰撴湇鍔″崟鍚屾澶辫触鎴栨湭鍚屾鏃讹紝鍙互閫氳繃姝ゆ帴鍙ｆ墜鍔ㄨЕ鍙戝悓姝�
*/
- @PreAuthorize("@ss.hasPermi('task:general:edit')")
+// @PreAuthorize("@ss.hasPermi('task:general:edit')")
@Log(title = "鎵嬪姩鍚屾鏈嶅姟鍗�", businessType = BusinessType.UPDATE)
@PostMapping("/syncServiceOrder/{taskId}")
public AjaxResult syncServiceOrder(@PathVariable Long taskId) {
@@ -753,4 +758,22 @@
return error("鍚屾寮傚父: " + e.getMessage());
}
}
+
+ /**
+ * 鏌ヨ浠诲姟鐘舵�佸彉鏇村巻鍙�
+ */
+ @GetMapping("/{taskId}/statusHistory")
+ public AjaxResult getTaskStatusHistory(@PathVariable Long taskId) {
+ try {
+ SysTask task = sysTaskService.selectSysTaskByTaskId(taskId);
+ if (task == null) {
+ return error("浠诲姟涓嶅瓨鍦�");
+ }
+ List<SysTaskStatusHistory> list = sysTaskStatusHistoryMapper.selectByTaskId(taskId);
+ return success(list);
+ } catch (Exception e) {
+ logger.error("鏌ヨ浠诲姟鐘舵�佸巻鍙插紓甯革紝taskId: {}", taskId, e);
+ return error("鏌ヨ澶辫触: " + e.getMessage());
+ }
+ }
}
--
Gitblit v1.9.1