From a6d0ac5aa6de25da83b714f2361b6690b780f826 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 12 Dec 2024 11:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E7=A7=9F=E6=A3=80=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/lease/domain/LeaseRecordDto.java |  3 ---
 .../impl/LeaseRepairRecordServiceImpl.java    | 24 +++++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRecordDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRecordDto.java
index 5b0f901..01217a5 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRecordDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRecordDto.java
@@ -23,9 +23,6 @@ public class LeaseRecordDto {
     @ApiModelProperty(value = "订单编号")
     private String code;
 
-    @ApiModelProperty(value = "装备Id")
-    private Integer maId;
-
     @ApiModelProperty(value = "装备套数")
     private Integer maNumber;
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
index 530f429..245a741 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
@@ -187,13 +187,23 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
         if (leaseRecordDto == null || leaseRecordDto.getOrderId() == null || leaseRecordDto.getCode() == null) {
             return AjaxResult.error(HttpCodeEnum.TO_PARAM_NULL.getCode(), HttpCodeEnum.TO_PARAM_NULL.getMsg());
         }
-        List<Integer> maIdList = new ArrayList<>();
-        if (Objects.isNull(leaseRecordDto.getMaId())) {
-            List<OrderDetailDto> list = orderMapper.selectOrderDetailsByOderId(leaseRecordDto.getOrderId());
-            maIdList = list.stream().map(OrderDetailDto::getMaId).collect(Collectors.toList());
-        } else {
-            maIdList = Arrays.asList(leaseRecordDto.getMaId());
+        Set<Integer> maIdSet = new HashSet<>();
+        List<Integer> maIds_repair = new ArrayList<>();
+        List<Integer> maIds_scrap = new ArrayList<>();
+        List<Integer> maIds_loss = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(leaseRecordDto.getRepairRecordList())) {
+            maIds_repair = leaseRecordDto.getRepairRecordList().stream().map(LeaseRepairRecord::getMaId).collect(Collectors.toList());
         }
+        if (CollectionUtils.isNotEmpty(leaseRecordDto.getScrapRecordList())) {
+            maIds_scrap = leaseRecordDto.getRepairRecordList().stream().map(LeaseRepairRecord::getMaId).collect(Collectors.toList());
+        }
+        if (CollectionUtils.isNotEmpty(leaseRecordDto.getLossRecordList())) {
+            maIds_loss = leaseRecordDto.getRepairRecordList().stream().map(LeaseRepairRecord::getMaId).collect(Collectors.toList());
+        }
+        maIdSet.addAll(maIds_repair);
+        maIdSet.addAll(maIds_scrap);
+        maIdSet.addAll(maIds_loss);
+
         LeaseRepairRecord leaseRepairRecord = createLeaseRepairRecord(leaseRecordDto);
         // 校验所有记录是否为空
         if (isAllRecordListsEmpty(leaseRecordDto)) {
@@ -201,7 +211,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
         }
         try {
             // 处理维修、报废、丢失记录的情况
-            return handleAllRecords(leaseRecordDto, maIdList);
+            return handleAllRecords(leaseRecordDto, new ArrayList<>(maIdSet));
         } catch (Exception e) {
             log.error("新增退租检修异常: ", e.getMessage());
             return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), e.getMessage());