事件处置记录

zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java

@@ -1423,10 +1423,7 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> 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<DcEventMapper, DcEvent> 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<DcEventMapper, DcEvent> impl
         dcEventProcess.setProcessId(6L);
         dcEventProcess.setProcessName("清障结束");
 
-        dcEventProcess.setContext("选择不需要清障");
+        dcEventProcess.setContext("选择无需清障");
         dcEventProcessService.insertDcEventProcess(dcEventProcess);
         return AjaxResult.success("无需清障成功");
     }