bug修改

mitao

2025-04-03 021f085016565e81566bdb955d2296d9da6b0bec

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

@@ -80,7 +80,6 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * <p>
@@ -326,6 +325,7 @@
        // 将所有未缴费账单设置未已失效
        List<TBill> tBills = billService.list(new LambdaQueryWrapper<TBill>()
                .ne(TBill::getPayFeesStatus, 3)
                        .ne(TBill::getBillType,4)
                .eq(TBill::getContractId, contract.getId()));
        for (TBill tBill : tBills) {
            tBill.setPayFeesStatus("5");
@@ -394,7 +394,7 @@
        Map<String, Object> templateParam = new HashMap<>(5);
        fill(templateParam, "contractNumber", contract.getContractNumber());
        fill(templateParam, "partyOneName", contract.getPartyOneName());
        fill(templateParam, "partyTwoName", contract.getPartyTwoName());


        if (Objects.nonNull(tenant)) {
            fill(templateParam, "mailAddress", tenant.getMailAddress());
@@ -402,6 +402,7 @@
            fill(templateParam, "residentName", tenant.getResidentName());
            fill(templateParam, "bankNumber", tenant.getBankNumber());
            fill(templateParam, "bankName", tenant.getBankName());
            fill(templateParam, "partyTwoName", tenant.getLessee());

            // 企业、政府机构、国有企业
            if (Objects.nonNull(tenant.getTenantType())
@@ -593,7 +594,7 @@
        if (Objects.isNull(contract)) {
            throw new ServiceException("合同不存在");
        }
        if (StringUtils.isNotBlank(contract.getContractFile())) {
  /*      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());
@@ -607,7 +608,10 @@
            contract.setContractFile(dto.getContractFile());
            contract.setContractFileName(dto.getContractFileName());
            contract.setMemory(dto.getMemory());
        }
        }*/
        contract.setContractFile(dto.getContractFile());
        contract.setContractFileName(dto.getContractFileName());
        contract.setMemory(dto.getMemory());
        return R.ok(contractService.updateById(contract));
    }