From 09f98d8509fb22db2edcc18bdafc0c7ab7c3baa1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 07 四月 2025 09:12:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into dev

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java       |   96 ++++++++++++++++++-----
 ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml                     |    5 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java    |   33 ++++++--
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java        |   32 ++++++-
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java        |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java |    1 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java                       |   31 ++++---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java     |    2 
 8 files changed, 147 insertions(+), 55 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
index 27aed4c..1fec807 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
+++ b/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);
         }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index c0b0f63..de6f98f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -3,26 +3,37 @@
 
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.dto.*;
-import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.dto.BillStatisticsDto;
+import com.ruoyi.system.dto.CachPayDto;
+import com.ruoyi.system.dto.OfflinePayCheckDto;
+import com.ruoyi.system.dto.SmsByBillDto;
+import com.ruoyi.system.dto.TBillDto;
+import com.ruoyi.system.dto.TbillSaveDto;
 import com.ruoyi.system.model.TBillConfirm;
 import com.ruoyi.system.model.TBillDetail;
 import com.ruoyi.system.model.TContract;
 import com.ruoyi.system.query.TBillQuery;
 import com.ruoyi.system.query.TContractQuery;
-import com.ruoyi.system.service.*;
+import com.ruoyi.system.service.TBillConfirmService;
+import com.ruoyi.system.service.TBillDetailService;
+import com.ruoyi.system.service.TBillService;
+import com.ruoyi.system.service.TContractService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -70,7 +81,14 @@
     @PostMapping("add")
     @ApiOperation("新增账单")
     public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
-        bill.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
+        String businessDeptId = SecurityUtils.getBusinessDeptId();
+        if (SecurityUtils.getBusinessDeptId().equals("0")) {
+            TContract contract = contractService.getById(bill.getContractId());
+            if (Objects.nonNull(contract)) {
+                businessDeptId = contract.getBusinessDeptId();
+            }
+        }
+        bill.setBusinessDeptId(businessDeptId);
         tBillService.saveBill(bill);
         return R.ok();
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index 007aa13..2456e4c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -14,6 +14,7 @@
 import com.ruoyi.common.constant.DictConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.DisabledEnum;
 import com.ruoyi.common.enums.ProcessCategoryEnum;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
@@ -370,6 +371,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();
@@ -379,7 +392,8 @@
         if (StringUtils.isNotEmpty(contractId)) {
             firstBill = billService.lambdaQuery()
                     .eq(TBill::getContractId, contractId)
-                    .orderByDesc(TBill::getStartTime)
+                    .orderByAsc(TBill::getStartTime)
+                    .ne(TBill::getManualAddition, DisabledEnum.YES.getCode())
                     .last("limit 1")
                     .one();
             tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery()
@@ -407,6 +421,7 @@
             fill(templateParam, "bankNumber", tenant.getBankNumber());
             fill(templateParam, "bankName", tenant.getBankName());
             fill(templateParam, "partyTwoName", tenant.getLessee());
+            fill(templateParam, "email", tenant.getEmail());
 
             // 企业、政府机构、国有企业
             if (Objects.nonNull(tenant.getTenantType())
@@ -470,19 +485,19 @@
 
         // 首期租金处理
         if (firstBill != null) {
+            double firstRent = (contract.getPayType().equals("1")
+                    ? contract.getMonthRent()
+                    : contract.getPayType().equals("2")
+                    ? contract.getMonthRent().multiply(new BigDecimal("3"))
+                    : contract.getMonthRent().multiply(new BigDecimal("12")))
+                    .setScale(2, RoundingMode.DOWN).doubleValue();
             fill(templateParam, "firstRent", "¥" + firstBill.getPayableFeesMoney() + "元");
+            // 其他财务字段
+            fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(firstBill.getPayableFeesMoney().doubleValue()));
         } else {
             fill(templateParam, "firstRent", "");
         }
 
-        // 其他财务字段
-        fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(
-                (contract.getPayType().equals("1")
-                        ? contract.getMonthRent()
-                        : contract.getPayType().equals("2")
-                        ? contract.getMonthRent().multiply(new BigDecimal("3"))
-                        : contract.getMonthRent().multiply(new BigDecimal("12")))
-                        .setScale(2, RoundingMode.DOWN).doubleValue()));
 
         fill(templateParam, "firstRentString",
                 "人民币"+NumberToChineseUtils.numberToChinese(
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
index 2970b75..2ea41f2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
@@ -1,24 +1,23 @@
 package com.ruoyi.system.model;
 
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.common.core.domain.BaseModel;
-import com.ruoyi.common.core.domain.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.Transient;
-import springfox.documentation.annotations.ApiIgnore;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -184,6 +183,12 @@
     @TableField(exist = false)
     private BigDecimal preOutstand;
 
+    @ApiModelProperty(value = "是否管理后台添加 1=是 0=否 用于生成合同附件时过滤管理后台添加的账单,查询首个账单")
+    @TableField("is_manual_addition")
+    private Integer manualAddition;
+
+
+
 
 
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java
index 5e45c2b..07e1869 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScreenService.java
+++ b/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));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index 42adf5f..c49375a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -5,6 +5,7 @@
 import com.ruoyi.common.constant.AmountConstant;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.enums.DisabledEnum;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.OrderNos;
@@ -247,6 +248,7 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveBill(TbillSaveDto bill) {
+        bill.setManualAddition(DisabledEnum.YES.getCode());
         save(bill);
         if (bill.getBillType().equals("3")){
             if (bill.getDetails()==null || bill.getDetails().size()==0){
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
index b9e250b..9abc49d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
+++ b/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();
diff --git a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
index 00f15a6..f6a5a13 100644
--- a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
+++ b/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
+        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>

--
Gitblit v1.7.1