From 24996ea75ec4ca3b7d154387bfe37ec9dd387255 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 29 五月 2025 14:40:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 5 +++--
1 files changed, 3 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..c956528 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());
@@ -1021,6 +1022,7 @@
if (entity != null){
operationRecordVo.setTitle(entity.getTitle());
operationRecordVo.setContent(entity.getContent());
+ operationRecordVo.setScheduleObj(entity.getScheduleObj());
if (StringUtils.isNotBlank(entity.getModelId())){
//获取模型记录信息
StScheduleRecordRespVO scheduleRecordVO = stScheduleRecordService.getInfoByModelIdAndScheduleTime(entity.getModelId(), entity.getScheduleTime());
@@ -1035,7 +1037,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