diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEventProcessController.java b/zc-business/src/main/java/com/zc/business/controller/DcEventProcessController.java index a68418e1..00cb1f23 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcEventProcessController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcEventProcessController.java @@ -111,12 +111,20 @@ public class DcEventProcessController extends BaseController return AjaxResult.error(UniversalEnum.THE_FRONT_NODE_IS_NOT_LIT.getValue()); } } - if ((dcEvent.getEventType() == 1 || dcEvent.getEventType() == 2) && dcEventProcess.getProcessId() == 3){ - //中间库 更新清障到达时间 - MdEvent mdEvent = new MdEvent(); - mdEvent.setFusionId(dcEventProcess.getEventId()); - mdEvent.setClearArriveTime(new Date()); - middleDatabaseService.updateMiddleDatabaseEvent(mdEvent); + if (dcEvent.getEventType() == 1 || dcEvent.getEventType() == 2 || dcEvent.getEventType() == 6){ + if (dcEventProcess.getProcessId() == 3) { + //中间库 更新清障到达时间 + MdEvent mdEvent = new MdEvent(); + mdEvent.setFusionId(dcEventProcess.getEventId()); + mdEvent.setClearArriveTime(new Date()); + middleDatabaseService.updateMiddleDatabaseEvent(mdEvent); + } else if (dcEventProcess.getProcessId() == 6){ + //中间库 更新清障结束时间 + MdEvent mdEvent = new MdEvent(); + mdEvent.setFusionId(dcEventProcess.getEventId()); + mdEvent.setClearEndTime(new Date()); + middleDatabaseService.updateMiddleDatabaseEvent(mdEvent); + } } return toAjax(dcEventProcessService.insertDcEventProcess(dcEventProcess)); } diff --git a/zc-business/src/main/resources/mapper/business/MiddleDatabaseMapper.xml b/zc-business/src/main/resources/mapper/business/MiddleDatabaseMapper.xml index bb56bc5f..c699a14f 100644 --- a/zc-business/src/main/resources/mapper/business/MiddleDatabaseMapper.xml +++ b/zc-business/src/main/resources/mapper/business/MiddleDatabaseMapper.xml @@ -443,7 +443,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" DeleterUserId = #{deleterUserId}, DeletionTime = #{deletionTime}, start_time = #{startTime}, - clear_arriveTime = #{clearArriveTime}, + clear_arrive_time = #{clearArriveTime}, clear_end_time = #{clearEndTime}, car = #{car}, bus = #{bus},