From 3880de9f96b068dfa8b1f35fcac0060f3d4ad604 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 15:08:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
index efaf774..e6646ec 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
@@ -15,12 +15,16 @@
import com.aps.core.domain.ApsPartPlan;
import com.aps.core.domain.ApsResourceDateStat;
import com.aps.core.domain.ApsResourceGroup;
+import com.aps.core.mapper.ApsAbnormalProcessAnalysisMapper;
import com.aps.core.mapper.ApsResourceGroupMapper;
+import com.aps.core.service.IApsAbnormalProcessAnalysisService;
+import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.IOUtils;
+import org.apache.poi.util.Removal;
import org.apache.poi.xssf.streaming.SXSSFCell;
import org.apache.poi.xssf.streaming.SXSSFRow;
import org.apache.poi.xssf.streaming.SXSSFSheet;
@@ -51,6 +55,9 @@
private ApsResourceGroupMapper resourceGroupMapper;
@Autowired
private ApsResourceGroupMapper apsResourceGroupMapper;
+
+ @Resource
+ private IApsAbnormalProcessAnalysisService analysisService;
/**
* 鏌ヨ闆朵欢缁熻琛�
@@ -160,7 +167,7 @@
if (stat.getCurrentProcessNumber().compareTo(stat.getRoadProcessNumber()) < 0) {
if (last != null) {
LocalDateTime lastStartDate = LocalDateTime.ofInstant(last.getProcessPlanStartDay().toInstant(), ZoneId.systemDefault());
- lastStartDate.plusHours(last.getProcessTotalTime());
+ lastStartDate.plusHours(last.getProcessTotalTime().longValue());
stat.setProcessPlanStartDay(Date.from(lastStartDate.atZone(ZoneId.systemDefault()).toInstant()));
}
}
@@ -168,10 +175,13 @@
last = stat;
stat.setId(IdUtils.fastUUID().toString());
stat.setBatchNumber(batchNum);
+ stat.setDelFlag("0");
apsPartRouteStatMapper.insertApsPartRouteStat(stat);
}
}
apsPartRouteStatMapper.deleteLastBatch(batchNum);
+ /*璁＄畻骞朵繚瀛� 宸ュ簭寮傚父淇℃伅*/
+ analysisService.batchSaveAbnormalInfo();
}
/** 鏌ヨ璧勬簮鏃ュ巻琛�
*/
--
Gitblit v1.9.3