1

src/main/java/com/fdkankan/sale/service/impl/RepairPersonnelService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.sale.service.impl;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -25,9 +25,6 @@ import org.springframework.stereotype.Service;
 
 import javax.swing.text.EditorKit;
 import javax.swing.text.html.parser.Entity;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
@@ -262,12 +259,9 @@ public class RepairPersonnelService {
         List<RepairFault> repairFaults = repairFaultService.getByRepairId(repairId);
         List<Integer> collect = repairFaults.stream().map(RepairFault::getFaultId).collect(Collectors.toList());
         if(!collect.isEmpty()){
-            List<Fault> faults = faultService.listByIds(collect);
-            List<Integer> parentIds = faults.stream().map(Fault::getParentId).collect(Collectors.toList());
-            parentIds.addAll(collect);
-            vo.setFaultIds(parentIds);
+            vo.setFaultIds(Arrays.asList(collect));
         }else {
-            vo.setFaultIds(collect);
+            vo.setFaultIds(Arrays.asList(collect));
         }
 
         List<RepairRegisterPart> byRepairId = repairRegisterPartService.getByRepairId(repairId);

src/main/java/com/fdkankan/sale/vo/response/RepairRegisterCheckVo.java

@@ -7,6 +7,6 @@ import java.util.List;
 
 @Data
 public class RepairRegisterCheckVo extends RepairRegister {
-    private List<Integer> faultIds;
+    private List<List<Integer>> faultIds;
     private List<RepairRegisterPartVo> partList;
 }