From 5362cfd2ee1cad8dd41401870d6791ee043460a0 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Sun, 14 Sep 2025 23:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=B4=E4=BF=AE=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E8=AE=B0=E5=BD=95=E9=80=BB=E8=BE=91=EF=BC=8C=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E4=BB=BB=E5=8A=A1=E6=98=AF=E5=90=A6=E5=AE=9A=E6=8D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉部分冗余代码，包括设置维修数量和新增维修费用记录的操作 - 修改 getCostCount 查询条件，使用 task_id 替代 repair_id，并添加 is_ds = 1 的条件 - 优化判断逻辑，将 count <= 0 改为 count == 0 --- .../service/impl/LossAssessmentServiceImpl.java | 2 +- .../repair/service/impl/RepairServiceImpl.java | 11 +++++------ .../resources/mapper/material/repair/RepairMapper.xml | 3 ++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java index fec10498..98565a99 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java @@ -465,7 +465,7 @@ public class LossAssessmentServiceImpl implements LossAssessmentService { } BigDecimal sfCosts = countPartCosts(partList, BigDecimal.ZERO); // SQL: 新增【维修费用记录表】 - repairApplyRecord.setRepairNum(partList.get(0).getPartNum() != null ? BigDecimal.valueOf(partList.get(0).getPartNum()) : BigDecimal.ZERO); + //repairApplyRecord.setRepairNum(partList.get(0).getPartNum() != null ? BigDecimal.valueOf(partList.get(0).getPartNum()) : BigDecimal.ZERO); mapper.addRepairCost(repairApplyRecord, sfCosts, "1"); } else { 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 96b3d103..ebf9d7fc 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 @@ -650,7 +650,7 @@ public class RepairServiceImpl implements RepairService { .setPartType(bean.getCodeScrapRepairPartList().get(0).getPartType()).setRepairType(3); // SQL: 新增【报废费用记录表】 - repairMapper.addRepairCost(scrapCostsRecord, details.getBuyPrice(), bean.getCodeScrapRepairPartList().get(0).getScrapType()); + //repairMapper.addRepairCost(scrapCostsRecord, details.getBuyPrice(), bean.getCodeScrapRepairPartList().get(0).getScrapType()); // 更新报废数量 repairMapper.updateScrapNumAndStatus(bean.getId(), BigDecimal.ONE, 1, loginUser.getUserid()); @@ -805,7 +805,6 @@ public class RepairServiceImpl implements RepairService { throw new ServiceException("此维修记录不存在，请检查后提交!"); } - // 分拆维修单, 准备数据 scrapNum = Optional.ofNullable(bean.getNumberScrapRepairPartList().get(0).getScrapNum()).orElse(BigDecimal.ZERO); RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); @@ -1061,10 +1060,10 @@ public class RepairServiceImpl implements RepairService { BigDecimal sfCosts = countPartCosts(partList, BigDecimal.ZERO); // TODO: 判断是否是收费配件，因数据存在多条，可能有些是免费配件 有些收费，所以这里用价格统一做处理，后续讨论 // SQL: 新增【维修费用记录表】 - repairApplyRecord.setRepairNum(partList.get(0).getPartNum() != null ? BigDecimal.valueOf(partList.get(0).getPartNum()) : BigDecimal.ZERO); + //repairApplyRecord.setRepairNum(partList.get(0).getPartNum() != null ? BigDecimal.valueOf(partList.get(0).getPartNum()) : BigDecimal.ZERO); //查询定损是否把价格已经添加 int count = repairMapper.getCostCount(repairApplyRecord); - if (count <= 0) { + if (count == 0) { repairMapper.addRepairCost(repairApplyRecord, sfCosts, partList.get(0).getPartType().toString()); } } @@ -1116,10 +1115,10 @@ public class RepairServiceImpl implements RepairService { // TODO: 判断是否是收费配件，因数据存在多条，可能有些是免费配件 有些收费，所以这里用价格统一做处理，后续讨论 // SQL: 新增【维修费用记录表】 - repairApplyRecord.setRepairNum(partList.get(i).getPartNum() != null ? BigDecimal.valueOf(partList.get(i).getPartNum()) : BigDecimal.ZERO); + //repairApplyRecord.setRepairNum(partList.get(i).getPartNum() != null ? BigDecimal.valueOf(partList.get(i).getPartNum()) : BigDecimal.ZERO); //查询定损是否把价格已经添加 int count = repairMapper.getCostCount(repairApplyRecord); - if (count <= 0) { + if (count == 0) { repairMapper.addRepairCost(repairApplyRecord, sfCosts, partList.get(i).getPartType().toString()); } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 063c272b..8e68a689 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -964,7 +964,8 @@