Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetServiceImpl.java

@@ -202,16 +202,47 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
             cabinetDto.setOrgName(sortedCabinets.get(0).getOrgName());
             List<CabinetBoxDto> cabinetBoxList = new ArrayList<>();
             for (Cabinet cabinet : sortedCabinets) {
-                CabinetBoxDto cabinetBoxDto = new CabinetBoxDto();
-                BeanPlusUtil.copyProperties(cabinet, cabinetBoxDto);
-                cabinetBoxDto.setNum(cabinet.getNumber());
-                cabinetBoxDto.setPoliceId(cabinet.getPoliceId());
-                cabinetBoxDto.setId(cabinet.getBoxId());
-                // 设置其他属性...
-
-                cabinetBoxList.add(cabinetBoxDto);
+                // 在 cabinetBoxList 中查找是否已存在相同 id 的 CabinetBoxDto
+                Optional<CabinetBoxDto> existingCabinetBox = cabinetBoxList.stream()
+                        .filter(box -> box.getId().equals(cabinet.getBoxId()))
+                        .findFirst();
+
+                if (existingCabinetBox.isPresent()) {
+                    // 如果已存在，则在现有对象的 policeName 和 policeId 字段分别继续拼接
+                    CabinetBoxDto cabinetBoxDto = existingCabinetBox.get();
+                    String existingPoliceName = cabinetBoxDto.getPoliceName();
+                    String existingPoliceId = cabinetBoxDto.getPoliceId();
+                    String currentPoliceName = cabinet.getPoliceName();
+                    String currentPoliceId = cabinet.getPoliceId();
+
+                    // 拼接 policeName，使用逗号分隔
+                    String updatedPoliceName = existingPoliceName + "," + currentPoliceName;
+                    cabinetBoxDto.setPoliceName(updatedPoliceName);
+
+                    // 拼接 policeId，使用逗号分隔
+                    String updatedPoliceId = existingPoliceId + "," + currentPoliceId;
+                    cabinetBoxDto.setPoliceId(updatedPoliceId);
+
+                    // 更新其他属性...
+                } else {
+                    // 如果不存在，则创建新的对象并添加到 cabinetBoxList 中
+                    CabinetBoxDto cabinetBoxDto = new CabinetBoxDto();
+                    BeanPlusUtil.copyProperties(cabinet, cabinetBoxDto);
+                    cabinetBoxDto.setNum(cabinet.getNumber());
+                    cabinetBoxDto.setPoliceId(cabinet.getPoliceId());
+                    cabinetBoxDto.setId(cabinet.getBoxId());
+
+                    // 直接拼接 policeName 和 policeId，使用逗号分隔
+                    cabinetBoxDto.setPoliceName(cabinet.getPoliceName());
+                    cabinetBoxDto.setPoliceId(cabinet.getPoliceId());
+
+                    // 设置其他属性...
+
+                    cabinetBoxList.add(cabinetBoxDto);
+                }
             }
 
+
             cabinetDto.setCabinetBoxList(cabinetBoxList);
             cabinetList.add(cabinetDto);
         });