Merge remote-tracking branch 'origin/dev' into dev

mitao

2025-04-02 d4e5a4f25cd925a0ee772f1adec0784aba3fa5e3

Merge remote-tracking branch 'origin/dev' into dev

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.THouse;
@@ -72,14 +73,17 @@
    @ApiOperation(value = "租户数量趋势统计")
    public R<List<TenantCountTrendVO>> getTenantCountTrend() {

        String businessDeptId = SecurityUtils.getBusinessDeptId();
        Date currentDate = new Date();
        Date targetDate = DateUtils.addMonths(currentDate, -3 * 6);
        Map<String, Date> startQuarterDate = DateUtils.getQuarterDate(targetDate);


        Date targetDate2 = DateUtils.addMonths(currentDate, 0);
        Map<String, Date> endQuarterDate = DateUtils.getQuarterDate(targetDate2);

        List<TContract> contracts = contractService.list(new LambdaQueryWrapper<TContract>()
                .eq(!"0".equals(businessDeptId),TContract::getBusinessDeptId, businessDeptId)
                .isNotNull(TContract::getSignTime)
                .between(TContract::getSignTime, startQuarterDate.get("first"), endQuarterDate.get("last"))
                .orderByAsc(TContract::getSignTime));
@@ -109,7 +113,9 @@
    @ApiOperation("获取实时租赁数据")
    public R<List<RealTimeRentDataVO>> getRealTimeRentData() {
        // 随机获取十条房源
        String businessDeptId = SecurityUtils.getBusinessDeptId();
        List<THouse> houses = houseService.list(new LambdaQueryWrapper<THouse>()
                .eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId)
                .last("ORDER BY RAND() LIMIT 10"));

        if (CollectionUtil.isEmpty(houses)){
@@ -129,7 +135,7 @@
        List<RealTimeRentDataVO> result = houses.stream().map(house -> {
            RealTimeRentDataVO vo = new RealTimeRentDataVO();
            vo.setStreetName(streetMap.getOrDefault(house.getStreetId(), "未知"));
            vo.setRoomName(house.getRoomNumber());
            vo.setRoomName(house.getHouseName());
            vo.setLeaseStatus(house.getLeaseStatus());
            return vo;
        }).collect(Collectors.toList());
@@ -143,8 +149,11 @@
    @GetMapping("/getHouseMapDistribution")
    @ApiOperation("获取房屋地图分布")
    public R<List<HouseMapDistributionVO>> getHouseMapDistribution() {

        String businessDeptId = SecurityUtils.getBusinessDeptId();
        // 获取所有房屋信息
        List<THouse> houses = houseService.list();
        List<THouse> houses = houseService.list(new LambdaQueryWrapper<THouse>()
                .eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId));
        List<HouseMapDistributionVO> result = new ArrayList<>();
        for (THouse house : houses) {
            HouseMapDistributionVO houseMapDistributionVO = new HouseMapDistributionVO();
@@ -154,6 +163,7 @@
            houseMapDistributionVO.setLongitude(house.getLongitude());
            houseMapDistributionVO.setLatitude(house.getLatitude());
            TContract contract = contractService.getOne(new LambdaQueryWrapper<TContract>()
                    .eq(!"0".equals(businessDeptId),TContract::getBusinessDeptId, businessDeptId)
                    .gt(TContract::getEndTime, LocalDate.now())
                    .eq(TContract::getHouseId, house.getId())
                    .eq(TContract::getStatus, 4)
@@ -161,6 +171,7 @@

            if (contract != null){
                List<TBill> tBills = billService.list(new LambdaQueryWrapper<TBill>()
                        .eq(!"0".equals(businessDeptId),TBill::getBusinessDeptId, businessDeptId)
                        .eq(TBill::getContractId, contract.getId())
                        .eq(TBill::getBillType, 1));
                houseMapDistributionVO.setTenant(contract.getPartyTwoName());
@@ -186,6 +197,7 @@
//                        .eq(TBill::getContractId, contract.getId()));

                List<TBill> ones = billService.list(new LambdaQueryWrapper<TBill>()
                        .eq(!"0".equals(businessDeptId),TBill::getBusinessDeptId, businessDeptId)
                        .le(TBill::getStartTime, LocalDate.now())
                        .ge(TBill::getEndTime, LocalDate.now())
                        .eq(TBill::getBillType, 1)