From 8ff6842edf6229bb40344eafc4fe084fb09c7d24 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 26 二月 2025 14:02:34 +0800 Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) 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 61c5b1f..4084b2c 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 @@ -155,9 +155,12 @@ if (contract.getStatus().equals("4"))return R.fail("该合同已签订"); contract.setSignature(dto.getSignature()); contract.setStatus("4"); - contractMapper.updateById(contract); contract.setFirstPayTime(contract.getStartTime().plusDays(10)); - List<TBill> bills = new ArrayList<>(); + contractMapper.updateById(contract); + + // TODO 进入签订审批流程 + + List<TContractRentType> contractRentTypes = contractRentTypeService.list(); // 生成第一笔账单 // 第一次应缴费日期 -- Gitblit v1.7.1