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/ISysTaskService.java | 76 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 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 d0630b0..ce9ae98 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
@@ -18,7 +18,16 @@
* @date 2024-01-15
*/
public interface ISysTaskService {
-
+
+ public Boolean dispatchSyncEvent(Long taskId);
+
+ /**
+ * 鍒ゆ柇浠诲姟鏄惁鎬婚儴鎺ㄩ��
+ * @param taskCreatorId
+ * @param taskDeptId
+ * @return
+ */
+ public Boolean isTaskHeaderPush(Long taskCreatorId,Long taskDeptId);
/**
* 鏌ヨ浠诲姟绠＄悊
*
@@ -34,6 +43,15 @@
* @return 浠诲姟绠＄悊闆嗗悎
*/
public List<SysTask> selectSysTaskList(TaskQueryVO queryVO);
+
+ /**
+ * 鏍规嵁浠诲姟缂栧彿銆佽皟搴﹀崟缂栧彿鎴栨湇鍔″崟缂栧彿鏌ヨ浠诲姟鍒楄〃
+ *
+ * @param queryVO 浠诲姟鏌ヨ瀵硅薄
+ * @param taskCode 浠诲姟缂栧彿
+ * @return 浠诲姟绠＄悊闆嗗悎
+ */
+ public List<SysTask> selectSysTaskListByMultiCode(TaskQueryVO queryVO, String taskCode);
/**
* 鏂板浠诲姟绠＄悊
@@ -53,7 +71,7 @@
* @param updateTime 鏇存柊鏃堕棿
* @return 缁撴灉
*/
- public int insertTask(TaskCreateVO createVO,String serviceOrderId,String dispatchOrderId, String serviceOrdNo, Long userId,String userName, Long deptId, Date createTime, Date updateTime);
+ public int insertTask(TaskCreateVO createVO,Long serviceOrderId,Long dispatchOrderId, String serviceOrdNo, Long userId,String userName, Long deptId, Date createTime, Date updateTime);
/**
* 淇敼浠诲姟绠＄悊
@@ -76,7 +94,7 @@
* @param updateTime
* @return
*/
- public int updateTask(TaskUpdateVO updateVO, String serviceOrderId, String dispatchOrderId, String serviceOrdNo, Long userId, String userName, Long deptId, Date createTime, Date updateTime);
+ public int updateTask(TaskUpdateVO updateVO, Long serviceOrderId, Long dispatchOrderId, String serviceOrdNo, Long userId, String userName, Long deptId, Date createTime, Date updateTime);
/**
* 鎵归噺鍒犻櫎浠诲姟绠＄悊
@@ -107,6 +125,14 @@
public int changeTaskStatus(Long taskId, TaskStatus newStatus, String remark);
/**
+ * 寮哄埗瀹屾垚浠诲姟锛堟寚瀹氬疄闄呭紑濮嬫椂闂村拰缁撴潫鏃堕棿锛�
+ *
+ * @param task 浠诲姟淇℃伅锛堝寘鍚玹askId銆乼askStatus銆乤ctualStartTime銆乤ctualEndTime銆乺emark锛�
+ * @return 缁撴灉
+ */
+ public int forceCompleteTask(SysTask task);
+
+ /**
* 鍙樻洿浠诲姟鐘舵�侊紙鍚獹PS浣嶇疆淇℃伅锛�
*
* @param taskId 浠诲姟ID
@@ -117,6 +143,23 @@
*/
public int changeTaskStatusWithLocation(Long taskId, TaskStatus newStatus, String remark, SysTaskLog locationLog);
+ /**
+ * 淇濆瓨浠诲姟鍙栨秷淇℃伅锛堜粎闄愯浆杩愪换鍔★級
+ *
+ * @param taskId 浠诲姟ID
+ * @param cancelReason 鍙栨秷鍘熷洜锛堟暟鎹瓧鍏竧ask_cancel_reason鐨剉alue锛�
+ * @return 缁撴灉
+ */
+ public int saveCancelInfo(Long taskId, String cancelReason);
+
+ /**
+ * 淇濆瓨浠诲姟鍙栨秷淇℃伅锛堝惈鍙栨秷浜猴級
+ * @param taskId
+ * @param cancelReason
+ * @param cancelBy
+ * @return
+ */
+ public int saveCancel(Long taskId, String cancelReason,String cancelBy,Date cancelTime);
/**
* 涓婁紶浠诲姟闄勪欢
*
@@ -284,4 +327,31 @@
*/
public com.ruoyi.common.core.domain.AjaxResult checkTaskCanDepart(Long taskId);
+ /**
+ * 鎵ц浜虹偣鍑诲氨缁�
+ *
+ * @param taskId 浠诲姟ID
+ * @param userId 鐢ㄦ埛ID
+ * @return 缁撴灉
+ */
+ public com.ruoyi.common.core.domain.AjaxResult setAssigneeReady(Long taskId, Long userId);
+
+ /**
+ * 鍙栨秷鎵ц浜哄氨缁�
+ *
+ * @param taskId 浠诲姟ID
+ * @param userId 鐢ㄦ埛ID
+ * @return 缁撴灉
+ */
+ public com.ruoyi.common.core.domain.AjaxResult cancelAssigneeReady(Long taskId, Long userId);
+
+ /**
+ * 妫�鏌ヤ换鍔℃槸鍚﹂噸澶嶏紙鏍规嵁鑱旂郴浜虹數璇濆拰鍒涘缓鏃ユ湡锛�
+ *
+ * @param phone 鑱旂郴浜虹數璇�
+ * @param createDate 浠诲姟鍒涘缓鏃ユ湡锛堟牸寮忥細YYYY-MM-DD锛�
+ * @return true-瀛樺湪閲嶅锛宖alse-涓嶉噸澶�
+ */
+ public boolean checkTaskDuplicate(String phone, String createDate);
+
}
--
Gitblit v1.9.1