From 3b97f4ff54e1d7162486d57023985339baed8208 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期三, 09 四月 2025 13:30:17 +0800 Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency --- inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java index 8ed35ba..ab3572e 100644 --- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java @@ -106,24 +106,6 @@ otherParam.setCheckUserFlag(checkUserFlag); otherParam.setCheckUserId(SecurityUtils.getUserId()); IPage<SampleOrderDto> sampleOrderDtoIPage = insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), otherParam); - // 鎷兼帴妫�楠屼汉鏍规嵁妫�楠岄」鏉� - if(CollectionUtils.isEmpty(sampleOrderDtoIPage.getRecords())){ - return sampleOrderDtoIPage; - } - List<Integer> orderIds = new ArrayList<>(); - for (SampleOrderDto record : sampleOrderDtoIPage.getRecords()) { - orderIds.add(record.getId()); - } - List<CheckUserDto> checkUserDtoList = insProductMapper.selectCheckUserNameByOrderIds(orderIds); - for (SampleOrderDto record : sampleOrderDtoIPage.getRecords()) { - Integer orderId = record.getId(); - for (CheckUserDto checkUserDto : checkUserDtoList) { - if(orderId.equals(checkUserDto.getOrderId())) { - record.setTestingName(checkUserDto.getCheckUserNames()); - break; - } - } - } return sampleOrderDtoIPage; } -- Gitblit v1.9.3