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

luofl

2025-03-24 ed772c2bec3eac88d040514b6b886a505d9fd119

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

@@ -3,7 +3,6 @@

import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.hutool.core.bean.BeanUtil;
import com.aizuda.bpm.engine.entity.FlwTask;
import com.aizuda.bpm.mybatisplus.mapper.FlwTaskMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -298,32 +297,11 @@
        List<TContract> list = contractService.lambdaQuery().in(TContract::getId, dto.getIds()).list();
        List<String> res = new ArrayList<>();
        for (TContract contract : list) {
            String url = generateContract(contract);
            res.add(url);
        }

        return R.ok(res);
    }

    private String generateContract(TContract contract) {
        String templateFileName = "1_yzj_租赁合同_个人.docx";
        TBill firstBill = null;
        TTenant tenant = null;
        THouse tHouse = null;
        TCheckAcceptRecord tCheckAcceptRecord = null;
        if (StringUtils.isNotEmpty(contract.getId())){
            firstBill = billService.lambdaQuery().eq(TBill::getContractId, contract.getId())
            TBill firstBill = billService.lambdaQuery().eq(TBill::getContractId, contract.getId())
                    .orderByDesc(TBill::getStartTime).last("limit 1").one();
            tenant = tenantService.getById(contract.getTenantId());
            tHouse = houseService.getById(contract.getHouseId());
            // 验收时间
            tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery()
                    .eq(TCheckAcceptRecord::getContractId, contract.getId())
                    .last("limit 1").one();
        }



            TTenant tenant = tenantService.getById(contract.getTenantId());
            THouse tHouse = houseService.getById(contract.getHouseId());
        Map<String, Object> templateParam = new HashMap<>(5);
        templateParam.put("${contractNumber}", contract.getContractNumber());
        templateParam.put("${partyOneName}", contract.getPartyOneName());
@@ -331,8 +309,11 @@
        if (Objects.nonNull(tenant)) {
            templateParam.put("${mailAddress}", StringUtils.isNotBlank(tenant.getMailAddress()) ? tenant.getMailAddress() : "");
            templateParam.put("${idCard}", StringUtils.isNotBlank(tenant.getIdCard()) ? tenant.getIdCard() : "");
                templateParam.put("${residentName}", tenant.getResidentName());
                templateParam.put("${bankNumber}", StringUtils.isNotBlank(tenant.getBankNumber()) ? tenant.getBankNumber() : "");
                templateParam.put("${bankName}", StringUtils.isNotBlank(tenant.getBankName()) ? tenant.getBankName() : "");
            //企业、政府机构、国有企业
            if (tenant.getTenantType().equals("2") || tenant.getTenantType().equals("5") || tenant.getTenantType().equals("7")){
                if (Objects.nonNull(tenant.getTenantType()) && (tenant.getTenantType().equals("2") || tenant.getTenantType().equals("5") || tenant.getTenantType().equals("7"))) {
                templateParam.put("${creditCode}", StringUtils.isNotBlank(tenant.getCreditCode()) ? tenant.getCreditCode() : "");
                templateParam.put("${legalPerson}", StringUtils.isNotBlank(tenant.getLegalPerson()) ? tenant.getLegalPerson() : "");
                templateFileName = "1_yzj_租赁合同_企业.docx";
@@ -340,6 +321,9 @@
        }
        templateParam.put("${houseAddress}", tHouse.getHouseAddress());
        templateParam.put("${houseArea}", tHouse.getHouseArea()+"m²");
            templateParam.put("${remark}", StringUtils.isNotBlank(contract.getRemark()) ? contract.getRemark() : "");
            templateParam.put("${houseUseScope}", StringUtils.isNotBlank(contract.getHouseUseScope()) ? contract.getHouseUseScope() : "");
            templateParam.put("${days}", ChronoUnit.DAYS.between(contract.getStartTime(), contract.getEndTime()));
        long between = ChronoUnit.DAYS.between(contract.getStartTime(), contract.getStartPayTime())+1;
        templateParam.put("${day}", between);
        templateParam.put("${endTimeFree}", DateUtils.localDateTimeToStringYear(contract.getStartPayTime().plusDays(1)));
@@ -367,29 +351,20 @@
        templateParam.put("${partyOnePhone}", contract.getPartyOnePhone());
        templateParam.put("${partyTwoPerson}", contract.getPartyTwoPerson());
        templateParam.put("${partyTwoPhone}", contract.getPartyTwoPhone());

            // 验收时间
            TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery().eq(TCheckAcceptRecord::getContractId, contract.getId()).last("limit 1").one();
        if (tCheckAcceptRecord!=null &&tCheckAcceptRecord.getCheckTime()!=null ){
            templateParam.put("${checkTime}", DateUtils.localDateTimeToStringYear(tCheckAcceptRecord.getCheckTime()));
        }else{
            templateParam.put("${checkTime}", "");

        }
        return wordUtil.generatePdf("/usr/local/project/file/", templateFileName, templateParam, "租赁合同", "/usr/local/project/file/");
            String url = wordUtil.generatePdf("/usr/local/project/file/", templateFileName, templateParam, "租赁合同", "/usr/local/project/file/");
            res.add(url);
    }

    /**
     * 生成预览版合同附件
     */
    @ApiOperation(value = "生成预览版合同附件")
    @PostMapping("/generateContractPreview")
    public R<String> generateContractPreview(@RequestBody TContractDTO dto)
    {
        TContract contract = new TContract();
        BeanUtil.copyProperties(dto,contract);
        return R.ok(generateContract(contract));
        return R.ok(res);
    }



    /**
     * 导出