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

mitao

2025-04-04 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f

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

# Conflicts:
#	ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml

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

@@ -114,6 +114,26 @@
        return R.ok(result);
    }


    public static void main(String[] args) {
        // 获取当前季度的开始和结束时间
        // 获取当前季度的开始和结束时间的实现示例：
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        LocalDate now = LocalDate.now();
        int month = now.getMonthValue();
        int year = now.getYear();

        // 计算季度起始月份（1,4,7,10）
        int quarterStartMonth = ((month - 1) / 3) * 3 + 1;
        int quarterEndMonth = quarterStartMonth + 2;
        // 构建季度起止日期
        LocalDate quarterStart = YearMonth.of(year, quarterStartMonth).atDay(1);
        LocalDate quarterEnd = YearMonth.of(year, quarterEndMonth).atEndOfMonth();

        System.out.println("季度开始：" + quarterStart.format(formatter));
        System.out.println("季度结束：" + quarterEnd.format(formatter));
    }

    /**
     * 获取房屋地图分布
     */
@@ -122,17 +142,23 @@
    public R<List<HouseMapDistributionVO>> getHouseMapDistribution() {

        String businessDeptId = SecurityUtils.getBusinessDeptId();
        // 获取所有房屋信息

        List<TContract> tContracts = contractService.list(new LambdaQueryWrapper<TContract>()
                .eq(!"0".equals(businessDeptId), TContract::getBusinessDeptId, businessDeptId)
                .eq(TContract::getPayType, 1));
                .eq(TContract::getPayType, 2));
        List<String> houseIds = tContracts.stream().map(TContract::getHouseId).collect(Collectors.toList());
        if (houseIds.isEmpty()){
            return R.ok(new ArrayList<>());
        }

        // 获取所有房屋信息
        List<THouse> houses = houseService.list(new LambdaQueryWrapper<THouse>()
                        .and(wrapper -> wrapper.in(THouse::getId, houseIds)
                                        .or()
                                        .eq(THouse::getLeaseStatus, "1")
                        )
                .eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId)
                .in(THouse::getId, houseIds));
        );
        List<HouseMapDistributionVO> result = new ArrayList<>();
        for (THouse house : houses) {
            HouseMapDistributionVO houseMapDistributionVO = new HouseMapDistributionVO();
@@ -141,9 +167,12 @@
            houseMapDistributionVO.setHouseStatus(house.getLeaseStatus());
            houseMapDistributionVO.setLongitude(house.getLongitude());
            houseMapDistributionVO.setLatitude(house.getLatitude());



            TContract contract = contractService.getOne(new LambdaQueryWrapper<TContract>()
                    .eq(!"0".equals(businessDeptId),TContract::getBusinessDeptId, businessDeptId)
                    .eq(TContract::getPayType, 1)
                    .eq(TContract::getPayType, 2)
                    .gt(TContract::getEndTime, LocalDate.now())
                    .eq(TContract::getHouseId, house.getId())
                    .eq(TContract::getStatus, 4)
@@ -155,15 +184,14 @@
                        .eq(TBill::getContractId, contract.getId())
                        .eq(TBill::getBillType, 1));
                houseMapDistributionVO.setTenant(contract.getPartyTwoName());
                LocalDateTime startTime = contract.getStartTime();
                LocalDateTime endTime = contract.getEndTime();
                BigDecimal monthRent = contract.getMonthRent();
                // 计算相差月份
                long monthsBetween = ChronoUnit.MONTHS.between(startTime, endTime);
                BigDecimal payableFeesMoney = monthRent.multiply(new BigDecimal(monthsBetween));

                BigDecimal payFeesMoney = tBills.stream()
                        .map(TBill::getPayFeesMoney)
                        .reduce(BigDecimal::add)
                        .orElse(BigDecimal.ZERO);

                BigDecimal payableFeesMoney = tBills.stream()
                        .map(TBill::getPayableFeesMoney)
                        .reduce(BigDecimal::add)
                        .orElse(BigDecimal.ZERO);
                String rentStatus = String.format("%.2f/%.2f", payFeesMoney, payableFeesMoney);
@@ -176,32 +204,56 @@
//                        .eq(TBill::getBillType, 1)
//                        .eq(TBill::getContractId, contract.getId()));


                // 获取当前季度的开始和结束时间
                // 获取当前季度的开始和结束时间的实现示例：
                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                LocalDate now = LocalDate.now();
                int month = now.getMonthValue();
                int year = now.getYear();

                // 计算季度起始月份（1,4,7,10）
                int quarterStartMonth = ((month - 1) / 3) * 3 + 1;
                int quarterEndMonth = quarterStartMonth + 2;
                // 构建季度起止日期
                LocalDate quarterStart = YearMonth.of(year, quarterStartMonth).atDay(1);
                LocalDate quarterEnd = YearMonth.of(year, quarterEndMonth).atEndOfMonth();

                System.out.println("季度开始：" + quarterStart.format(formatter));
                System.out.println("季度结束：" + quarterEnd.format(formatter));

                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())
                        .between(TBill::getStartTime, quarterStart, quarterEnd)
                        .eq(TBill::getBillType, 1)
                        .eq(TBill::getContractId, contract.getId()));
                TBill one = null;
                if (!ones.isEmpty()){
                     one = ones.get(0);
                }

                if (one != null){
                    if ("4".equals(one.getPayFeesStatus())){
                    long count = ones.stream().filter(tBill -> "4".equals(tBill.getPayFeesStatus())).count();
                    if (count > 0){
                        houseMapDistributionVO.setHouseStatus("4");
                    }
                    BigDecimal payFeesMoney1 = one.getPayFeesMoney();
                    BigDecimal payableFeesMoney1 = one.getPayableFeesMoney();

                    BigDecimal payFeesMoney1 = ones.stream()
                            .map(TBill::getPayFeesMoney)
                            .reduce(BigDecimal::add)
                            .orElse(BigDecimal.ZERO);

                    BigDecimal payableFeesMoney1 = ones.stream()
                            .map(TBill::getPayableFeesMoney)
                            .reduce(BigDecimal::add)
                            .orElse(BigDecimal.ZERO);

                    String rent = String.format("%.2f/%.2f", payFeesMoney1, payableFeesMoney1);
                    houseMapDistributionVO.setRent(rent);
                }else {
                    houseMapDistributionVO.setRent("暂无");
                    houseMapDistributionVO.setRent("欠费");
                }

            }else {
                houseMapDistributionVO.setTenant("暂无");
                houseMapDistributionVO.setRentStatus("暂无");
                houseMapDistributionVO.setRent("欠费");
                houseMapDistributionVO.setRentStatus("待出租");
                houseMapDistributionVO.setRent("暂无");
            }
            result.add(houseMapDistributionVO);
        }

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

@@ -370,6 +370,18 @@
        return R.ok(res);
    }

    // 计算两个日期相差天数的方法实现：
    public static long calculateDaysBetween(LocalDateTime start, LocalDateTime end) {
        return ChronoUnit.DAYS.between(start, end);
    }

    public static void main(String[] args) {
        LocalDateTime start = LocalDateTime.of(2024, 1, 1, 0, 0);
        LocalDateTime end = LocalDateTime.of(2024, 1, 5, 12, 0);
        long days = calculateDaysBetween(start, end); // 返回4天（不满一天不计）

    }

    private String generateContract(TContract contract) {
        String templateFileName = "1_yzj_租赁合同_个人.docx";
        String contractId = contract.getId();

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java

@@ -989,7 +989,13 @@
                            BigDecimal originalMoney = new BigDecimal("0");
                            // 不需要涨租金的时间段
                            long originalDays = 0;
                            if (tBill.getStartTime().getDayOfMonth()==1&&(tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().isAfter(tBill.getEndTime().toLocalDate())||tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().equals(tBill.getEndTime().toLocalDate()))){
                            if (tBill.getStartTime().getDayOfMonth()==1
                                    &&
                                    (
                                            tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().isBefore(tBill.getEndTime().toLocalDate())
                                            ||tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().equals(tBill.getEndTime().toLocalDate())
                                    )
                            ){
                                // 计算整月
                                originalMoney = originalMoney.add(contract.getChangeRent());
                            }else{

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java

@@ -196,7 +196,7 @@

            List<TContract> contracts = contractService.list(new LambdaQueryWrapper<TContract>()
                    .eq(!"0".equals(businessDeptId), TContract::getBusinessDeptId, businessDeptId)
                    .eq(TContract::getPayType, 1)
                    .eq(TContract::getPayType, 2)
                    .isNotNull(TContract::getSignTime)
                    .between(TContract::getSignTime, quarterStart, quarterEnd)
                    .orderByAsc(TContract::getSignTime));

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java

@@ -125,6 +125,7 @@
    public void terminateContract(TerminateContractDTO dto) {
        TContract contract = this.baseMapper.selectById(dto.getId());
        contract.setTerminateRemark(dto.getTerminateRemark());
        contract.setTerminateTime(dto.getTerminateTime());
        this.baseMapper.updateById(contract);
        // 进入合同提前终止审批流程
        ProcessStartBO processStartBO = new ProcessStartBO();

 ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml

@@ -88,15 +88,14 @@
    </select>
    <select id="getRentedArea" resultType="java.lang.Double">
        SELECT COALESCE(SUM(t1.house_area),0) FROM t_house t1
        LEFT JOIN t_contract t2 ON t1.id = t2.house_id AND t2.status = 4
        LEFT JOIN t_contract t2 ON t1.id = t2.house_id AND t2.status = 4 AND t2.pay_type = 2
        <where>
            t2.pay_type = 2 AND t1.lease_status != 1
            t1.lease_status != 1
            <if test="businessDeptId!=0">
                AND t1.business_dept_id = #{businessDeptId}
            </if>
            AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        GROUP BY t1.id
    </select>

</mapper>