fix:修复维修单扫码查询问题。

main
HuangHuiKang 4 weeks ago
parent 291ad8fcf5
commit 9d46335391

@ -159,12 +159,22 @@ public class DvRepairServiceImpl implements DvRepairService {
} }
if (StringUtils.isNotBlank(pageReqVO.getKeyword())) { if (StringUtils.isNotBlank(pageReqVO.getKeyword())) {
String keyword = pageReqVO.getKeyword().trim();
pageReqVO.setKeyword(keyword);
LambdaQueryWrapperX<DeviceLedgerDO> keywordDeviceQuery = new LambdaQueryWrapperX<>(); LambdaQueryWrapperX<DeviceLedgerDO> keywordDeviceQuery = new LambdaQueryWrapperX<>();
keywordDeviceQuery.and(w -> w if (keyword.startsWith("EQUIPMENT-")) {
.like(DeviceLedgerDO::getDeviceCode, pageReqVO.getKeyword()) try {
.or() keywordDeviceQuery.eq(DeviceLedgerDO::getId, Long.valueOf(keyword.substring("EQUIPMENT-".length())));
.like(DeviceLedgerDO::getDeviceName, pageReqVO.getKeyword()) } catch (NumberFormatException e) {
); keywordDeviceQuery.eq(DeviceLedgerDO::getId, -1L);
}
} else {
keywordDeviceQuery.and(w -> w
.like(DeviceLedgerDO::getDeviceCode, keyword)
.or()
.like(DeviceLedgerDO::getDeviceName, keyword)
);
}
List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(keywordDeviceQuery); List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(keywordDeviceQuery);
pageReqVO.setKeywordMachineryIds(deviceLedgerDOS.stream() pageReqVO.setKeywordMachineryIds(deviceLedgerDOS.stream()
.map(DeviceLedgerDO::getId) .map(DeviceLedgerDO::getId)

Loading…
Cancel
Save