Merge remote-tracking branch 'origin/master'

xuhy

2025-02-18 a9dc61d23c4e38c37a6004662638dc8e2077267d

Merge remote-tracking branch 'origin/master'

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

@@ -6,18 +6,18 @@
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.SignContractDTO;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.TContractRentType;
import com.ruoyi.system.model.THouse;
import com.ruoyi.system.model.TTenant;
import com.ruoyi.system.query.TContractAppletQuery;
import com.ruoyi.system.query.TContractQuery;
import com.ruoyi.system.service.TBillService;
import com.ruoyi.system.service.TContractRentTypeService;
import com.ruoyi.system.service.TContractService;
import com.ruoyi.system.service.THouseService;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TContractAppletVO;
import com.ruoyi.system.vo.TContractVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -50,6 +50,8 @@
    private TBillService billService;
    @Autowired
    private TokenService tokenService;
    @Autowired
    private TTenantService tTenantService;
    @ApiOperation(value = " 签订合同")
    @PostMapping(value = "/signContract")
    public R signContract(@RequestBody SignContractDTO dto) {
@@ -68,18 +70,27 @@
    }
    @ApiOperation(value = "查询合同信息信息")
    @GetMapping(value = "/getContractById")
    public R<TContractVO> getContractById(@RequestParam String id) {
        TContractVO res = new TContractVO();
    public R<TContractAppletVO> getContractById(@RequestParam String id) {
        LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
        if (loginUserApplet==null){
            return R.fail(401,"登录失效");
        }
        TContractAppletVO res = new TContractAppletVO();
        TContract contract = contractService.getById(id);
        BeanUtils.copyProperties(contract,res);
        res.setStartTimeString(DateUtils.localDateTimeToStringYear(contract.getStartTime()));
        res.setEndTimeString(DateUtils.localDateTimeToStringYear(contract.getEndTime()));
        res.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,res.getPayType()));
        res.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,res.getStatus()));
        TContractRentType contractRentType = contractRentTypeService.lambdaQuery().eq(TContractRentType::getContractId, id).one();
        if (contractRentType!=null){
            BeanUtils.copyProperties(contractRentType,res);
        }
        TTenant tTenant = tTenantService.getById(contract.getTenantId());
        res.setTenant(tTenant);
        TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>()
                .eq(TContract::getHouseId,contract.getHouseId())
                .eq(TContract::getTenantId,loginUserApplet.getUserId())
                .eq(TContract::getStatus, 4)
                .le(TContract::getStartTime, LocalDateTime.now())
                .ge(TContract::getEndTime, LocalDateTime.now()));

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TContractAppletVO.java

New file
@@ -0,0 +1,28 @@
package com.ruoyi.system.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.THouse;
import com.ruoyi.system.model.TTenant;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;

@Data
@ApiModel(value = "小程序-合同详情页VO")
public class TContractAppletVO extends TContract {

    @ApiModelProperty(value = "房屋信息")
    private THouse house;
    @ApiModelProperty(value = "租户信息")
    private TTenant tenant;
    @ApiModelProperty(value = "生效日期")
    private String startTimeString;

    @ApiModelProperty(value = "终止日期")
    private String endTimeString;
}

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

@@ -97,7 +97,7 @@
                    #{item}
                </foreach>
            </if>
            <if test="query.ids == null and query.ids.size()=0">
            <if test="query.ids != null and query.ids.size()=0">
                <if test="query.partyTwoName != null and query.partyTwoName != ''">
                    and t1.party_two_name like concat('%',#{query.partyTwoName},'%')
                </if>