fix(jg):设备移交bug修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEquipTransferServiceImpl.java

@@ -174,12 +174,48 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 transfer.setEquListCode(equListCode);
                 transfer.setEquCategory(equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, idxBizJgRegisterInfoServiceImpl.lambdaQuery().eq(IdxBizJgRegisterInfo::getRecord, equipList.get(0).get(record)).one().getEquCategory())).getName());
                 transfer.setEquDefine(equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, idxBizJgRegisterInfoServiceImpl.lambdaQuery().eq(IdxBizJgRegisterInfo::getRecord, equipList.get(0).get(record)).one().getEquDefine())).getName());
-                transfer.setSupervisoryCode(org.apache.commons.lang3.StringUtils.join(idxBizJgOtherInfoServiceImpl.lambdaQuery().in(IdxBizJgOtherInfo::getRecord, records).list().stream().filter(Objects::nonNull).map(IdxBizJgOtherInfo::getSupervisoryCode).collect(Collectors.toList()), ","));
-                transfer.setProductName(org.apache.commons.lang3.StringUtils.join(idxBizJgRegisterInfoServiceImpl.lambdaQuery().in(IdxBizJgRegisterInfo::getRecord, records).list().stream().filter(Objects::nonNull).map(IdxBizJgRegisterInfo::getProductName).collect(Collectors.toList()), ","));
+                transfer.setSupervisoryCode(org.apache.commons.lang3.StringUtils.join(
+                        idxBizJgOtherInfoServiceImpl.lambdaQuery()
+                                .in(IdxBizJgOtherInfo::getRecord, records)
+                                .list()
+                                .stream()
+                                .filter(Objects::nonNull)
+                                .map(IdxBizJgOtherInfo::getSupervisoryCode)
+                                .filter(Objects::nonNull)
+                                .distinct()
+                                .collect(Collectors.toList()), ","
+                ));
+                transfer.setProductName(org.apache.commons.lang3.StringUtils.join(
+                        idxBizJgRegisterInfoServiceImpl.lambdaQuery()
+                                .in(IdxBizJgRegisterInfo::getRecord, records)
+                                .list()
+                                .stream()
+                                .filter(Objects::nonNull)
+                                .map(IdxBizJgRegisterInfo::getProductName)
+                                .filter(Objects::nonNull)
+                                .distinct()
+                                .collect(Collectors.toList()), ","
+                ));
                 transfer.setUseRegistCode(projectContraption.getUseRegistrationCode());
-                transfer.setUseInnerCode(org.apache.commons.lang3.StringUtils.join(idxBizJgUseInfoServiceImpl.lambdaQuery().in(IdxBizJgUseInfo::getRecord, records).list().stream().filter(Objects::nonNull).map(IdxBizJgUseInfo::getUseInnerCode).collect(Collectors.toList()), ","));
+                transfer.setUseInnerCode(org.apache.commons.lang3.StringUtils.join(
+                        idxBizJgUseInfoServiceImpl.lambdaQuery()
+                                .in(IdxBizJgUseInfo::getRecord, records)
+                                .list()
+                                .stream()
+                                .filter(Objects::nonNull)
+                                .map(IdxBizJgUseInfo::getUseInnerCode)
+                                .distinct()
+                                .collect(Collectors.toList()), ","));
                 transfer.setEquAddress(projectContraption.getAddress());
-                transfer.setEquCode(org.apache.commons.lang3.StringUtils.join(idxBizJgRegisterInfoServiceImpl.lambdaQuery().in(IdxBizJgRegisterInfo::getRecord, records).list().stream().filter(Objects::nonNull).map(IdxBizJgRegisterInfo::getEquCode).collect(Collectors.toList()), ","));
+                transfer.setEquCode(org.apache.commons.lang3.StringUtils.join(
+                        idxBizJgRegisterInfoServiceImpl.lambdaQuery()
+                                .in(IdxBizJgRegisterInfo::getRecord, records)
+                                .list()
+                                .stream()
+                                .filter(Objects::nonNull)
+                                .map(IdxBizJgRegisterInfo::getEquCode)
+                                .distinct()
+                                .collect(Collectors.toList()), ","));
                 transferList.add(transfer);
             } else {
                 JgEquipTransferEq jgEquipTransferEq = buildJgEquipTransferEq(obj, applyNo);