From e016e05c506a9f9957de1e5965b319cd4d744c8f Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 27 五月 2025 10:13:37 +0800 Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java index e6fd4b6..f541366 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java @@ -34,8 +34,8 @@ import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity; import com.iailab.module.model.mcs.sche.service.*; import com.iailab.module.model.mcs.sche.vo.StScheduleRecordRespVO; -import com.iailab.module.model.mcs.sche.vo.StSuggestOperationRecordReqVO; import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO; +import com.iailab.module.model.mcs.sche.vo.StSuggestOperationRecordReqVO; import com.iailab.module.model.mdk.vo.ItemVO; import com.iailab.module.model.mpk.service.ChartParamService; import com.iailab.module.model.mpk.service.ChartService; @@ -1012,6 +1012,7 @@ @Override public Boolean saveSuggestOperationRecord(SuggestOperationRecordReqVO reqVO) { StSuggestOperationRecordReqVO operationRecordVo = new StSuggestOperationRecordReqVO(); + operationRecordVo.setSuggestId(reqVO.getId()); operationRecordVo.setOperate(reqVO.getOperate()); operationRecordVo.setReason(reqVO.getReason()); operationRecordVo.setHandler(reqVO.getHandler()); @@ -1035,7 +1036,6 @@ stSuggestOperationRecordService.create(operationRecordVo); return true; } - private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) { Date[] result = new Date[3]; Date predictTime = predictItem.getLastTime(); -- Gitblit v1.9.3