From caf56217dc2bf898b63b0e1f31a7098202c32825 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 15 十一月 2025 16:50:17 +0800
Subject: [PATCH] Merge branch 'feature_gps'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTaskService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTaskService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTaskService.java
index de3a1c3..a5cdf19 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTaskService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTaskService.java
@@ -99,7 +99,7 @@
* @param category 闄勪欢鍒嗙被
* @return 缁撴灉
*/
- public int uploadAttachment(Long taskId, MultipartFile file, String category);
+ public Long uploadAttachment(Long taskId, MultipartFile file, String category);
/**
* 浠庡井淇ediaId涓婁紶浠诲姟闄勪欢
@@ -108,9 +108,9 @@
* @param accessToken 寰俊AccessToken
* @param mediaId 寰俊mediaId
* @param category 闄勪欢鍒嗙被
- * @return 缁撴灉
+ * @return
*/
- public int uploadAttachmentFromWechat(Long taskId, String accessToken, String mediaId, String category);
+ public Long uploadAttachmentFromWechat(Long taskId, String accessToken, String mediaId, String category);
/**
* 鍒犻櫎浠诲姟闄勪欢
@@ -128,6 +128,8 @@
*/
public SysTaskAttachment getAttachmentById(Long attachmentId);
+
+ public List<SysTaskAttachment> getAttachmentsByTaskId(Long taskId);
/**
* 鍒嗛厤杞﹁締缁欎换鍔�
*
@@ -203,4 +205,13 @@
* @return 浠诲姟璇︽儏
*/
public SysTask getTaskDetail(Long taskId);
+
+ /**
+ * 妫�鏌ヨ溅杈嗘槸鍚︽湁姝ｅ湪杩涜涓殑浠诲姟
+ * 姝ｅ湪杩涜涓殑浠诲姟鏄寚鐘舵�佷笉涓猴細PENDING锛堝緟澶勭悊锛夈�丆OMPLETED锛堝凡瀹屾垚锛夈�丆ANCELLED锛堝凡鍙栨秷锛夌殑浠诲姟
+ *
+ * @param vehicleId 杞﹁締ID
+ * @return 姝ｅ湪杩涜涓殑浠诲姟鍒楄〃
+ */
+ public List<SysTask> checkVehicleActiveTasks(Long vehicleId);
}
--
Gitblit v1.9.1