bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退租检修

This commit is contained in:
sxu 2024-12-12 11:09:28 +08:00
parent d98fdf7a8f
commit a6d0ac5aa6
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRecordDto.java
View File

@ -23,9 +23,6 @@ public class LeaseRecordDto {
@ApiModelProperty(value = "订单编号") @ApiModelProperty(value = "订单编号")
private String code; private String code;
@ApiModelProperty(value = "装备Id")
private Integer maId;
@ApiModelProperty(value = "装备套数") @ApiModelProperty(value = "装备套数")
private Integer maNumber; private Integer maNumber;

24
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
View File

@ -187,13 +187,23 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
if (leaseRecordDto == null || leaseRecordDto.getOrderId() == null || leaseRecordDto.getCode() == null) { if (leaseRecordDto == null || leaseRecordDto.getOrderId() == null || leaseRecordDto.getCode() == null) {
return AjaxResult.error(HttpCodeEnum.TO_PARAM_NULL.getCode(), HttpCodeEnum.TO_PARAM_NULL.getMsg()); return AjaxResult.error(HttpCodeEnum.TO_PARAM_NULL.getCode(), HttpCodeEnum.TO_PARAM_NULL.getMsg());
} }
List<Integer> maIdList = new ArrayList<>(); Set<Integer> maIdSet = new HashSet<>();
if (Objects.isNull(leaseRecordDto.getMaId())) { List<Integer> maIds_repair = new ArrayList<>();
List<OrderDetailDto> list = orderMapper.selectOrderDetailsByOderId(leaseRecordDto.getOrderId()); List<Integer> maIds_scrap = new ArrayList<>();
maIdList = list.stream().map(OrderDetailDto::getMaId).collect(Collectors.toList()); List<Integer> maIds_loss = new ArrayList<>();
} else { if (CollectionUtils.isNotEmpty(leaseRecordDto.getRepairRecordList())) {
maIdList = Arrays.asList(leaseRecordDto.getMaId()); 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); LeaseRepairRecord leaseRepairRecord = createLeaseRepairRecord(leaseRecordDto);
// 校验所有记录是否为空 // 校验所有记录是否为空
if (isAllRecordListsEmpty(leaseRecordDto)) { if (isAllRecordListsEmpty(leaseRecordDto)) {
@ -201,7 +211,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
} }
try { try {
// 处理维修、报废、丢失记录的情况 // 处理维修、报废、丢失记录的情况
return handleAllRecords(leaseRecordDto, maIdList); return handleAllRecords(leaseRecordDto, new ArrayList<>(maIdSet));
} catch (Exception e) { } catch (Exception e) {
log.error("新增退租检修异常: ", e.getMessage()); log.error("新增退租检修异常: ", e.getMessage());
return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), e.getMessage()); return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), e.getMessage());