From 8b02d0d3ec8d56a6df749ed5706f848af1c7b528 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 18 Nov 2024 18:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86-null?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/service/impl/RepairServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 81993905..31de3f9e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -323,7 +323,7 @@ public class RepairServiceImpl implements RepairService { // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 - int repairNum = details.getRepairedNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); + int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); // 统计报废数量 + 维修合计数量 int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { @@ -344,7 +344,7 @@ public class RepairServiceImpl implements RepairService { // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 - int repairNum = details.getRepairedNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); + int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); // 统计报废数量 + 维修合计数量 int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { @@ -388,7 +388,7 @@ public class RepairServiceImpl implements RepairService { // -------------校验维修数量开始---------------- // 统计历史已报废数量 + 本次报废数量 = 报废总数 // TODO : get数组的维修数量不对，后续修改对象 - int scrapNum = details.getScrapNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); + int scrapNum = OptionalInt.of(details.getScrapNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); // 统计 报废总数 + 历史已维修数量, int num = scrapNum + details.getRepairedNum(); // 不能大与总的待维修数量