优化房屋费用报表

wuxw

2023-11-03 bbf3d14567fb58e475e235168760080b9d07730d

优化房屋费用报表

 service-report/src/main/java/com/java110/report/cmd/admin/GetParkingFeeSummaryCmd.java

@@ -62,22 +62,21 @@
        Calendar calendar = Calendar.getInstance();
        int year = calendar.get(Calendar.YEAR);

        if(!reqJson.containsKey("startTime") || StringUtil.isEmpty(reqJson.getString("startTime"))){
        if (!reqJson.containsKey("startTime") || StringUtil.isEmpty(reqJson.getString("startTime"))) {
            reqJson.put("startTime", year + "-01-01");
        }
        if(!reqJson.containsKey("endTime") || StringUtil.isEmpty(reqJson.getString("endTime"))){
        if (!reqJson.containsKey("endTime") || StringUtil.isEmpty(reqJson.getString("endTime"))) {
            reqJson.put("endTime", (year + 1) + "-01-01");
        }
        //todo 查询房屋物业费信息
        if(reqJson.containsKey("psName") && !StringUtil.isEmpty(reqJson.getString("psName"))){
            String[] psNames = reqJson.getString("psName").split("-",2);
            if(psNames.length != 2){
        if (reqJson.containsKey("psName") && !StringUtil.isEmpty(reqJson.getString("psName"))) {
            String[] psNames = reqJson.getString("psName").split("-", 2);
            if (psNames.length != 2) {
                throw new CmdException("车位编号错误");
            }
            reqJson.put("paNum",psNames[0]);
            reqJson.put("psNum",psNames[1]);
            reqJson.put("paNum", psNames[0]);
            reqJson.put("psNum", psNames[1]);
        }



        // todo 查询总数量
@@ -116,20 +115,20 @@
        storeDto.setStoreTypeCd(StoreDto.STORE_TYPE_PROPERTY);
        List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);

        for(CommunityDto tmpCommunityDto : communityDtos){
            for(StoreDto tmpStoreDto: storeDtos){
                if(tmpStoreDto.getStoreId().equals(tmpCommunityDto.getStoreId())){
        for (CommunityDto tmpCommunityDto : communityDtos) {
            for (StoreDto tmpStoreDto : storeDtos) {
                if (tmpStoreDto.getStoreId().equals(tmpCommunityDto.getStoreId())) {
                    tmpCommunityDto.setStoreName(tmpStoreDto.getName());
                }
            }
        }

        for(Map info: infos){
            for(CommunityDto tmpCommunityDto : communityDtos){
                if(info.get("communityId").equals(tmpCommunityDto.getCommunityId())){
                    info.put("communityName",tmpCommunityDto.getName());
                    info.put("storeId",tmpCommunityDto.getStoreId());
                    info.put("storeName",tmpCommunityDto.getStoreName());
        for (Map info : infos) {
            for (CommunityDto tmpCommunityDto : communityDtos) {
                if (info.get("communityId").equals(tmpCommunityDto.getCommunityId())) {
                    info.put("communityName", tmpCommunityDto.getName());
                    info.put("storeId", tmpCommunityDto.getStoreId());
                    info.put("storeName", tmpCommunityDto.getStoreName());
                }
            }
        }
@@ -156,6 +155,9 @@
        for (Map roomInfo : infos) {
            months = new ArrayList<>();
            for (Map monthInfo : monthDatas) {
                if (roomInfo.get("configId") == null || monthInfo.get("configId") == null) {
                    continue;
                }
                if (roomInfo.get("carId").equals(monthInfo.get("roomId"))
                        && roomInfo.get("configId").equals(monthInfo.get("configId"))) {
                    months.add(monthInfo);

 service-report/src/main/java/com/java110/report/cmd/admin/GetPropertyFeeSummaryCmd.java

@@ -157,6 +157,9 @@
        for (Map roomInfo : infos) {
            months = new ArrayList<>();
            for (Map monthInfo : monthDatas) {
                if (roomInfo.get("configId") == null || monthInfo.get("configId") == null) {
                    continue;
                }
                if (roomInfo.get("roomId").equals(monthInfo.get("roomId"))
                        && roomInfo.get("configId").equals(monthInfo.get("configId"))) {
                    months.add(monthInfo);