mitao
2025-01-20 93fec20f3cf9d7801eeaa10acef4687ed110d435
land-system/src/main/java/com/zzg/system/service/state/impl/StateHouseholdServiceImpl.java
@@ -61,33 +61,6 @@
    private final ISysDeptService deptService;
    @Override
    public HouseholdDetailVO queryPage(GetProjectPageBO getProjectPageBO) {
        List<HouseholdVO> householdVOS = this.getBaseMapper().pageByConditions(getProjectPageBO);
        //总面积
        double totalArea = householdVOS.stream().mapToDouble(HouseholdVO::getHouseHoldArea).sum();
        //总人数
        long totalPersons = householdVOS.size();
        List<HouseholdVO> agreeMoveOnes = householdVOS.stream().filter(hv -> Objects.nonNull(hv.getAgreeMove()) && (hv.getAgreeMove() == 1)).collect(Collectors.toList());
        //同意迁移的总面积
        double agreeMoveArea = agreeMoveOnes.stream().mapToDouble(HouseholdVO::getHouseHoldArea).sum();
        long agreeMovePersons = agreeMoveOnes.size();
        HouseholdDetailPageVO result = new HouseholdDetailPageVO();
        result.setAllHouse(totalPersons);
        result.setAllArea(totalArea);
        result.setAgreeToMoveArea(agreeMoveArea);
        result.setAgreeToMovePersons(agreeMovePersons);
        result.setAgreeToMovePersonsRate((double) agreeMovePersons / totalPersons * 100);
        result.setAgreeToMoveAreaRate(agreeMoveArea / totalArea * 100);
        PageUtils.startPage();
        List<HouseholdVO> householdVoPage = this.getBaseMapper().pageByConditions(getProjectPageBO);
        new PageInfo<>(householdVoPage);
        return null;
    }
    @Override
    public HouseholdDetailVO queryList(HouseholdBO householdBOBody) {
        // 1. 获取所有数据并计算总人数、总面积
        List<HouseholdVO> householdVOS = this.getBaseMapper().listByConditions(householdBOBody);
@@ -259,12 +232,6 @@
            vo.setAppendData(JSON.toJSONString(stateHouseholdOwnerService.calculateCompensation(calculateCompensationBO)));
        }
        return vo;
    }
    //TODO二次评估 需要修改状态
    @Override
    public Boolean resetStatusAfterSearch(String projectId) {
        return null;
    }
    @Override