From 613a81a88dfcf9b4327b7c2a84c458a6ab49be77 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Sat, 11 May 2024 16:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=BD=AE=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zc/business/service/impl/DcEventServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java index be761f69..970b0110 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java @@ -1423,10 +1423,7 @@ public class DcEventServiceImpl extends ServiceImpl impl @Override public AjaxResult skipClear(String eventId) { - int i = dcEventMapper.selectClearInfo(eventId); - if (i > 0) { - return AjaxResult.error("已跳过清障,无法重复操作!"); - } + DcEvent dcEvent = dcEventMapper.selectDcEventById(eventId); if (dcEvent.getEventType() == null || (dcEvent.getEventType() != 1 && dcEvent.getEventType() != 2 && dcEvent.getEventType() != 6)){ return AjaxResult.error("该事件类型无需清障!"); @@ -1434,6 +1431,10 @@ public class DcEventServiceImpl extends ServiceImpl impl if (dcEvent.getEventState() != null && dcEvent.getEventState() == 2){ return AjaxResult.error("该事件已结束，无法进行操作!"); } + int i = dcEventMapper.selectClearInfo(eventId); + if (i > 0) { + return AjaxResult.error("该事件已清障结束，无法进行操作!"); + } //事件处置流程记录 DcEventProcess dcEventProcess = new DcEventProcess(); @@ -1443,7 +1444,7 @@ public class DcEventServiceImpl extends ServiceImpl impl dcEventProcess.setProcessId(6L); dcEventProcess.setProcessName("清障结束"); - dcEventProcess.setContext("选择不需要清障"); + dcEventProcess.setContext("选择无需清障"); dcEventProcessService.insertDcEventProcess(dcEventProcess); return AjaxResult.success("无需清障成功"); }