bug修改

mitao

2025-04-02 45a7c01ea76ce113c2e0f940292574018c12ac59

bug修改

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

@@ -26,10 +26,21 @@
import com.ruoyi.system.dto.TContractDTO;
import com.ruoyi.system.dto.TerminateContractDTO;
import com.ruoyi.system.export.ContractExport;
import com.ruoyi.system.model.*;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TCheckAcceptRecord;
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.TContractBillQuery;
import com.ruoyi.system.query.TContractQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.service.StateProcessTemplateService;
import com.ruoyi.system.service.TBillService;
import com.ruoyi.system.service.TCheckAcceptRecordService;
import com.ruoyi.system.service.TContractRentTypeService;
import com.ruoyi.system.service.TContractService;
import com.ruoyi.system.service.THouseService;
import com.ruoyi.system.service.TTenantService;
import com.ruoyi.system.task.base.QuartzManager;
import com.ruoyi.system.task.base.TimeJobType;
import com.ruoyi.system.task.jobs.StateProcessJob;
@@ -45,7 +56,13 @@
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.DeleteMapping;
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.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
@@ -56,7 +73,14 @@
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * <p>
@@ -490,7 +514,7 @@
                "/usr/local/project/file/",
                templateFileName,
                templateParam,
                "租赁合同",
                templateFileName,
                "/usr/local/project/file/");
    }

@@ -559,7 +583,33 @@
            e.printStackTrace();
        }
    }

    @ApiOperation("上传合同附件")
    @PostMapping(value = "/upload-file")
    public R<Boolean> uploadFile(@RequestBody TContractDTO dto ) {
        if (Objects.isNull(dto.getId())) {
            throw new ServiceException("合同id不能为空");
        }
        TContract contract = contractService.getById(dto.getId());
        if (Objects.isNull(contract)) {
            throw new ServiceException("合同不存在");
        }
        if (StringUtils.isNotBlank(contract.getContractFile())) {
            List<String> contractFileList = Arrays.stream(contract.getContractFile().split(",")).collect(Collectors.toList());
            List<String> memoryList = Arrays.stream(contract.getMemory().split(",")).collect(Collectors.toList());
            List<String> contractNameList = Arrays.stream(contract.getContractFileName().split(",")).collect(Collectors.toList());
            contractFileList.addAll(Arrays.asList(dto.getContractFile().split(",")));
            contractNameList.addAll(Arrays.asList(dto.getContractFileName().split(",")));
            memoryList.addAll(Arrays.asList(dto.getMemory().split(",")));
            contract.setContractFile(String.join(",", contractFileList));
            contract.setContractFileName(String.join(",", contractNameList));
            contract.setMemory(String.join(",", memoryList));
        } else {
            contract.setContractFile(dto.getContractFile());
            contract.setContractFileName(dto.getContractFileName());
            contract.setMemory(dto.getMemory());
        }
        return R.ok(contractService.updateById(contract));
    }

}


 ruoyi-system/src/main/java/com/ruoyi/system/dto/TerminateContractDTO.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,6 +21,7 @@

    @ApiModelProperty(value = "终止日期")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime terminateTime;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java

@@ -11,7 +11,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.time.LocalDateTime;

@@ -126,7 +125,6 @@

    @ApiModelProperty(value = "合同附件,多个逗号拼接")
    @TableField("contract_file")
    @NotBlank(message = "合同附件不能为空")
    private String contractFile;

    @ApiModelProperty(value = "备注")

 ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java

@@ -100,4 +100,8 @@
    @TableField("bank_name")
    private String bankName;

    @ApiModelProperty(value = "承租人")
    @TableField("lessee")
    private String lessee;

}