From 567f923ff6b9147229def8562258493922232a33 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 23 十月 2024 17:55:53 +0800
Subject: [PATCH] 关于修改可靠性产品重复
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index 9f974e2..0829c56 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -354,9 +354,9 @@
currentStatusDto.setX2(nextStatusDto.getX1());
statusDtoListNew.add(new TimeDiagramStatusDto(nextStatusDto.getX1(), nextStatusDto.getX2(), nextStatusDto.getStatus()));
} else if (nextStatusDto.getX1() > currentStatusDto.getX1() && nextStatusDto.getX2() < currentStatusDto.getX2()) {
- currentStatusDto.setX2(nextStatusDto.getX1());
statusDtoListNew.add(new TimeDiagramStatusDto(nextStatusDto.getX1(), nextStatusDto.getX2(), nextStatusDto.getStatus()));
statusDtoListOld.add(new TimeDiagramStatusDto(nextStatusDto.getX2(), currentStatusDto.getX2(), currentStatusDto.getStatus()));
+ currentStatusDto.setX2(nextStatusDto.getX1());
}
} else {
if (nextStatusDto.getX1() >= currentStatusDto.getX2()) {
@@ -1193,11 +1193,13 @@
return failureModel;
}
- private boolean isRepairDirac(boolean repairDiracFlag, TaskPhaseModel taskPhaseModel, Long productId) {
+ private boolean isRepairDirac(Boolean repairDiracFlag, TaskPhaseModel taskPhaseModel, Long productId) {
boolean result = false;
- if (repairDiracFlag) {
- if (taskPhaseModel.getPhaseConstraints() != null) {
+ if (repairDiracFlag != null && repairDiracFlag) {
+ if (taskPhaseModel.getPhaseConstraints() == null) {
+ result = true;
+ } else {
List<TaskPhaseConstraintDto> list = taskPhaseModel.getPhaseConstraints().stream().filter(item ->
productId.equals(item.getProductId())).collect(Collectors.toList());
if (list.size() == 0) {
--
Gitblit v1.9.1