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); - } /** * 处理安全措施确认步骤