diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index e2df4cf8..b5eed3de 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -456,31 +456,19 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService */ @Override public int outerAudit(@NotNull List repairAuditDetails) { - // 提取所有需要更新的 ID List taskIds = repairAuditDetails.stream() .filter(Objects::nonNull) .map(RepairAuditDetails::getTaskId) .filter(Objects::nonNull) .collect(Collectors.toList()); - if (taskIds.isEmpty()) { return 0; } - List repairAuditDetailsByQuery = repairAuditDetailsMapper.selectRepairAuditDetailsByTaskIds(taskIds); - if (CollectionUtils.isEmpty(repairAuditDetailsByQuery)) { return 0; } - - List inputList = new ArrayList<>(); - for (RepairAuditDetails details : repairAuditDetailsByQuery) { - RepairInputDetails inputVo = new RepairInputDetails(); - BeanUtils.copyProperties(details, inputVo); - inputList.add(inputVo); - } - repairInputDetailsMapper.batchInsertRepairInputDetails(inputList); - + batchInsertRepairInputDetails(repairAuditDetailsByQuery); try { List ids = repairAuditDetailsByQuery.stream() .filter(Objects::nonNull) @@ -501,33 +489,33 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService */ @Override public int updateRepairAuditDetailsBatch(@NotNull List repairAuditDetails) { - // 提取所有需要更新的 ID List ids = repairAuditDetails.stream() .filter(Objects::nonNull) .map(RepairAuditDetails::getId) .filter(Objects::nonNull) .collect(Collectors.toList()); - if (ids.isEmpty()) { return 0; } - - List inputList = new ArrayList<>(); - for (RepairAuditDetails details : repairAuditDetails) { - RepairInputDetails inputVo = new RepairInputDetails(); - BeanUtils.copyProperties(details, inputVo); - inputList.add(inputVo); - } - repairInputDetailsMapper.batchInsertRepairInputDetails(inputList); - + batchInsertRepairInputDetails(repairAuditDetails); try { - // 调用 Mapper 方法进行批量更新 return repairAuditDetailsMapper.updateRepairAuditDetailsBatch(ids, String.valueOf(repairAuditDetails.get(0).getStatus())); } catch (Exception e) { throw new ServiceException("错误信息描述"); } } + private void batchInsertRepairInputDetails(List repairAuditDetailsByQuery) { + List inputList = new ArrayList<>(); + for (RepairAuditDetails details : repairAuditDetailsByQuery) { + RepairInputDetails inputVo = new RepairInputDetails(); + BeanUtils.copyProperties(details, inputVo); + inputVo.setAuditId(details.getId()); + inputList.add(inputVo); + } + repairInputDetailsMapper.batchInsertRepairInputDetails(inputList); + } + /** * 批量删除修试审核详细 *