优化房屋费用报表

wuxw

2023-11-03 bbf3d14567fb58e475e235168760080b9d07730d

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

@@ -13,8 +13,7 @@
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.intf.store.IStoreV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -62,9 +61,25 @@
        int row = reqJson.getIntValue("row");
        Calendar calendar = Calendar.getInstance();
        int year = calendar.get(Calendar.YEAR);

        if(!reqJson.containsKey("startTime") || StringUtil.isEmpty(reqJson.getString("startTime"))){
            reqJson.put("startTime", year + "-01-01");
        }
        if(!reqJson.containsKey("endTime") || StringUtil.isEmpty(reqJson.getString("endTime"))){
            reqJson.put("endTime", (year + 1) + "-01-01");
        }
        //todo 查询房屋物业费信息
        reqJson.put("startTime", year + "-01-01");
        reqJson.put("endTime", (year + 1) + "-01-01");
        if(reqJson.containsKey("roomName") && !StringUtil.isEmpty(reqJson.getString("roomName"))){
            String[] roomNames = reqJson.getString("roomName").split("-",3);
            if(roomNames.length != 3){
                throw new CmdException("房屋名称查询条件错误");
            }
            reqJson.put("floorNum",roomNames[0]);
            reqJson.put("unitNum",roomNames[1]);
            reqJson.put("roomNum",roomNames[2]);
        }



        // todo 查询总数量
        int total = baseDataStatisticsInnerServiceSMOImpl.getPropertyFeeSummaryDataCount(reqJson);
@@ -105,7 +120,7 @@
        for(CommunityDto tmpCommunityDto : communityDtos){
            for(StoreDto tmpStoreDto: storeDtos){
                if(tmpStoreDto.getStoreId().equals(tmpCommunityDto.getStoreId())){
                    tmpCommunityDto.setStoreName(tmpStoreDto.getStoreName());
                    tmpCommunityDto.setStoreName(tmpStoreDto.getName());
                }
            }
        }
@@ -142,13 +157,16 @@
        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);
                }
            }

            roomInfo.put("monthData", monthDatas);
            roomInfo.put("monthData", months);
        }
    }
}