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 fef054ef..93b09538 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 @@ -617,7 +617,9 @@ public class RepairServiceImpl implements RepairService { repairMapper.updateRepairedNum(bean.getId(), innerRepairNum.add(outerRepairNum) , loginUser.getUserid(), loginUser.getUserid()); repairMapper.updateScrapNum(bean.getId(), scrapNum, loginUser.getUserid()); } else { - repairMapper.updateThisRepairedAndScrapNum(bean.getId(), innerRepairNum.add(outerRepairNum), scrapNum, loginUser.getUserid(), loginUser.getUserid()); + repairMapper.updateRepairedNum(bean.getId(), innerRepairNum.add(outerRepairNum) , loginUser.getUserid(), loginUser.getUserid()); + repairMapper.updateScrapNum(bean.getId(), scrapNum, loginUser.getUserid()); +// repairMapper.updateThisRepairedAndScrapNum(bean.getId(), innerRepairNum.add(outerRepairNum), scrapNum, loginUser.getUserid(), loginUser.getUserid()); } } @@ -697,7 +699,7 @@ public class RepairServiceImpl implements RepairService { .setPartNum(partDetails.getPartNum()) .setRepairContent(partDetails.getRepairContent()) .setPartType(partDetails.getPartType()) - .setPartId(partDetails.getPartId() == null ? 0L : partDetails.getPartId()); + .setPartId(Optional.ofNullable(partDetails.getPartId()).orElse(0L)); // 添加【维修记录表】 repairMapper.addRecord(repairApplyRecord); } else {