From c514ef8b1efc890ef2db476b4e2d26b31805c575 Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Tue, 31 Mar 2026 17:38:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(web):=20=E6=B7=BB=E5=8A=A0=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E7=BB=88=E6=AD=A2=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E5=AE=9E=E7=8E=B0=E6=8C=89=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在EightworkInfoController中新增forceTerminate接口，支持强制终止工作流并传入关闭原因
- 添加StatisticsByWorkTypeCO数据传输对象用于统计结果返回
- 实现statisticsByWorkType接口，提供按作业类型的统计数据查询功能
- 修改forceTerminate方法参数，支持传递关闭原因到工作流终止处理
- 添加安全措施处理逻辑，在暂存和提交时同步处理安全措施确认步骤
- 新增强制终止命令ForceTerminateCmd和统计相关DTO类
- 在数据库映射文件中添加按作业类型统计数据查询的SQL语句
- 修复任务日志状态检查逻辑，确保正确的流转状态验证
---
 .../eightwork/command/EightworkInfoSaveDraftExe.java  | 11 +----------
 .../com/zcloud/eightwork/command/TaskLogAddExe.java   |  9 +--------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoSaveDraftExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoSaveDraftExe.java
index 0d8c66e..611a94b 100644
--- a/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoSaveDraftExe.java
+++ b/web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoSaveDraftExe.java
@@ -123,7 +123,7 @@ public class EightworkInfoSaveDraftExe {
         handleOtherMeasures(existingInfo.getWorkId(), cmd.getWorkType(), cmd.getOthers());
 
         // 8. 处理安全措施
-        deleteTaskLogsExceptFirst(existingInfo.getWorkId());
+        measuresLogsRepository.physicalDeleteByWorkId(existingInfo.getWorkId());
         if(ObjectUtil.isNotEmpty(cmd.getOthers()) && cmd.getOthers().containsKey("measures")) {
             handleMeasuresStep(cmd,existingInfo.getWorkId());
         }
@@ -312,15 +312,6 @@ public class EightworkInfoSaveDraftExe {
         log.info("暂存时已保存其他安全措施: workId={}, content={}", workId, otherMeasures);
     }
 
-    /**
-     * 删除除申请步骤外的所有 task_log
-     */
-    private void deleteTaskLogsExceptFirst(String workId) {
-        taskLogRepository.physicalDeleteByWorkId(workId);
-        log.info("已删除除申请步骤外的 task_log: workId={}", workId);
-    }
-
-
     /**
      * 处理安全措施确认步骤
      * 保存安全措施记录
diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java
index 4b06939..58953ca 100644
--- a/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java
+++ b/web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java
@@ -148,7 +148,7 @@ public class TaskLogAddExe {
         taskLogRepository.saveBatch(taskLogs);
 
         // 10. 处理安全措施
-        deleteTaskLogsExceptFirst(existingInfo.getWorkId());
+        measuresLogsRepository.physicalDeleteByWorkId(existingInfo.getWorkId());
         if(ObjectUtil.isNotEmpty(cmd.getOthers()) && cmd.getOthers().containsKey("measures")) {
             handleMeasuresStep(cmd,existingInfo.getWorkId());
         }
@@ -445,13 +445,6 @@ public class TaskLogAddExe {
 
         return mergedJson.toJSONString();
     }
-    /**
-     * 删除除申请步骤外的所有 task_log
-     */
-    private void deleteTaskLogsExceptFirst(String workId) {
-        taskLogRepository.physicalDeleteByWorkId(workId);
-        log.info("已删除除申请步骤外的 task_log: workId={}", workId);
-    }
 
     /**
      * 处理安全措施确认步骤