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/SysTaskServiceImpl.java | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
index abbeaab..f79c520 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
@@ -931,6 +931,67 @@
}
/**
+ * 寮哄埗瀹屾垚浠诲姟锛堟寚瀹氬疄闄呭紑濮嬫椂闂村拰缁撴潫鏃堕棿锛�
+ *
+ * @param task 浠诲姟淇℃伅
+ * @return 缁撴灉
+ */
+ @Override
+ public int forceCompleteTask(SysTask task) {
+ if (task == null || task.getTaskId() == null) {
+ throw new RuntimeException("浠诲姟淇℃伅涓嶈兘涓虹┖");
+ }
+
+ SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(task.getTaskId());
+ if (oldTask == null) {
+ throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ // 鏍￠獙寮�濮嬫椂闂村拰缁撴潫鏃堕棿
+ if (task.getActualStartTime() == null || task.getActualEndTime() == null) {
+ throw new RuntimeException("瀹為檯寮�濮嬫椂闂村拰缁撴潫鏃堕棿涓嶈兘涓虹┖");
+ }
+
+ if (task.getActualStartTime().after(task.getActualEndTime())) {
+ throw new RuntimeException("缁撴潫鏃堕棿蹇呴』澶т簬寮�濮嬫椂闂�");
+ }
+
+ // 璁板綍鏃х姸鎬�
+ String oldStatus = oldTask.getTaskStatus();
+ TaskStatus oldTaskStatus = TaskStatus.getByCode(oldStatus);
+
+ // 鏇存柊浠诲姟
+ int result = sysTaskMapper.updateTaskStatus(task);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ recordTaskLog(task.getTaskId(), "FORCE_COMPLETE", "寮哄埗瀹屾垚浠诲姟",
+ oldStatus, task.getTaskStatus(),
+ SecurityUtils.getUserId(), SecurityUtils.getUsername());
+
+ // 鍙戝竷浠诲姟鐘舵�佸彉鏇翠簨浠�
+ TaskStatus newTaskStatus = TaskStatus.getByCode(task.getTaskStatus());
+ eventPublisher.publishEvent(new TaskStatusChangedEvent(
+ this,
+ task.getTaskId(),
+ oldTask.getTaskCode(),
+ oldStatus,
+ task.getTaskStatus(),
+ oldTaskStatus != null ? oldTaskStatus.getInfo() : "鏈煡",
+ newTaskStatus != null ? newTaskStatus.getInfo() : "鏈煡",
+ null, // assigneeIds
+ SecurityUtils.getUserId(),
+ SecurityUtils.getUserId(),
+ null, // longitude
+ null, // latitude
+ null // address
+ ));
+ }
+
+ return result;
+ }
+
+ /**
* 鍙樻洿浠诲姟鐘舵�侊紙鍚獹PS浣嶇疆淇℃伅锛�
*
* @param taskId 浠诲姟ID
@@ -1717,6 +1778,19 @@
public AjaxResult cancelAssigneeReady(Long taskId, Long userId) {
return sysTaskAssigneeService.cancelAssigneeReady(taskId, userId);
}
+
+ /**
+ * 妫�鏌ヤ换鍔℃槸鍚﹂噸澶嶏紙鏍规嵁鑱旂郴浜虹數璇濆拰鍒涘缓鏃ユ湡锛�
+ *
+ * @param phone 鑱旂郴浜虹數璇�
+ * @param createDate 浠诲姟鍒涘缓鏃ユ湡锛堟牸寮忥細YYYY-MM-DD锛�
+ * @return true-瀛樺湪閲嶅锛宖alse-涓嶉噸澶�
+ */
+ @Override
+ public boolean checkTaskDuplicate(String phone, String createDate) {
+ int count = sysTaskMapper.countTaskByPhoneAndDate(phone, createDate);
+ return count > 0;
+ }
--
Gitblit v1.9.1