feat: 完善备注

yanghb

2025-01-07 1ea7e38d7d2152012db3f49934e84d164a07d613

 land-system/src/main/java/com/zzg/system/service/state/impl/StateAgreementServiceImpl.java

@@ -52,7 +52,6 @@
    @Override
    public PageInfo<StateAgreementVO> listDataByCondition(StateAgreementBO request) {
        PageUtils.startPage();

        List<StateAgreementVO> sqlResult = this.getBaseMapper().listDataByConditions(request);
        if (CollectionUtils.isEmpty(sqlResult)) {
            return new PageInfo<>();
@@ -81,9 +80,6 @@
        } else {
            useList = stateHouseholdOwners;
        }
//        if (CollectionUtils.isEmpty(useList)) {
//            return new PageInfo<>();
//        }

        Map<String, List<StateHouseholdOwner>> map = useList.stream().collect(Collectors.groupingBy(StateHouseholdOwner::getStateHouseholdId));

@@ -107,18 +103,7 @@
                }
                if (map.containsKey(innerData.getStateHouseholdId())) {
                    List<StateHouseholdOwner> innerOwner = map.get(innerData.getStateHouseholdId());
//                    String ownerName = innerOwner.stream()
//                            .map(StateHouseholdOwner::getOwnerName)
//                            .distinct()
//                            .collect(Collectors.joining("|"));

//                    long countPersons = innerOwner.stream()
//                            .map(StateHouseholdOwner::getOwnerName)
//                            .distinct()
//                            .count();
                    innerData.setOwnerType(innerOwner.get(0).getOwnerType());
//                    innerData.setOwnerName(ownerName);
//                    innerData.setPersonNum(countPersons);
                }
            });

@@ -267,7 +252,7 @@
                                return String.join(",", list);
                            }
                        }));
        ;

        String ownerPhone = ownerList.stream()
                .map(StateHouseholdOwner::getPhoneNumber)
                .filter(Objects::nonNull)  // 过滤掉 null 值
@@ -281,7 +266,7 @@
                                return String.join(",", list);
                            }
                        }));
        ;


        String concatenatedIdForPerson = ownerList.stream()
                .filter(e -> Objects.nonNull(e.getPersonIdCard()))
@@ -321,7 +306,6 @@
        agreementWrapper.eq(StateAgreement::getId, stateAgreementId);
        agreementWrapper.isNotNull(StateAgreement::getAgreementNumber);
        StateAgreement one = this.getOne(agreementWrapper);


        Map<String, Object> dataMap = new HashMap<>();
        if (StringUtils.isNotBlank(ownerName)) {
@@ -384,7 +368,6 @@
                StateAgreement virtualAgreement = virtual.get();
                StateAgreement dbAgreement = agreement.get();


                dbAgreement.setMoney(virtualAgreement.getMoney());
                dbAgreement.setEffectiveDate(virtualAgreement.getEffectiveDate());
                dbAgreement.setAppendFileName("(转)" + virtualAgreement.getAppendFileName());
@@ -406,7 +389,6 @@
                    e.printStackTrace();
                }
                agreementList.add(dbAgreement);

            }
        }
        if (CollectionUtils.isEmpty(agreementList)) {