From c74a01d4ad70898d08acacde828aaa1cca960f6a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 09 一月 2024 10:56:36 +0800
Subject: [PATCH] ABC评分null值处理
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
index 6ddd177..6be2495 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java
@@ -615,7 +615,7 @@
List<EquipmentMaintenancePlanDetail> details = new ArrayList<>();
for(ABCAssessment abcAssessment:abcAssessments){
Equipment equipment = equipmentService.getById(abcAssessment.getEquipmentId());
- String oldStandard = equipment.getEquipmentImportanceId();
+ String oldStandard = abcAssessment.getOldStandard();
String newStandard = abcAssessment.getFinalStandard();
LocalDate currentDate = LocalDate.now();
@@ -628,11 +628,10 @@
Date nextDayAsDate =Date.from(nextDay.atStartOfDay(ZoneId.systemDefault()).toInstant());
Date nextMonthAsDate = Date.from(nextMonth.atStartOfDay(ZoneId.systemDefault()).toInstant());
Date needingDate = equipment.getNextThirdMaintenanceTime();
- Boolean a = StringUtils.isNotBlank(oldStandard);
- Boolean b = oldStandard.equals("B")||oldStandard.equals("C");
- Boolean c = newStandard.equals("A");
- Boolean d = ObjectUtils.isNotNull(needingDate)&&needingDate.compareTo(currentDateAsDate)<0;
- if(a&&b&&c&&d){
+ Boolean a = StringUtils.isNotBlank(oldStandard)&&(oldStandard.equals("B")||oldStandard.equals("C"));
+ Boolean b = StringUtils.isNotBlank(newStandard)&&newStandard.equals("A");;
+ Boolean c = ObjectUtils.isNotNull(needingDate)&&needingDate.compareTo(currentDateAsDate)<0;
+ if(a&&b&&c){
EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail = new EquipmentMaintenancePlanDetail();
equipmentMaintenancePlanDetail.setPlanId(hexString);
equipmentMaintenancePlanDetail.setEquipmentId(equipment.getId());
--
Gitblit v1.9.3