From 6e5aa53e2f82b6c32c03f63f2aa6c678d06c5118 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 16:42:17 +0800
Subject: [PATCH] 权限

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 bbccfa7..18c37d3 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
@@ -196,7 +196,7 @@
         variable.put("projectId", dto.getId());
         processStartBO.setVariable(variable);
         //开启工作流程
-        stateProcessTemplateService.start(processStartBO);
+        stateProcessTemplateService.startApplet(processStartBO);
 
         List<TContractRentType> contractRentTypes = contractRentTypeService.list();
         // 生成第一笔账单
@@ -263,9 +263,10 @@
             }
         }else{
             if (contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isAfter(contract.getEndTime())){
-                rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
-            }else{
                 rentBill.setEndTime(contract.getEndTime());
+
+            }else{
+                rentBill.setEndTime(contract.getFirstPayTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
             }
             // 不走递增递减
             long allDays = ChronoUnit.DAYS.between(contract.getFirstPayTime(), rentBill.getEndTime());
@@ -301,7 +302,7 @@
 
 
             while(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12).isBefore(contract.getEndTime())){
-
+                    beforeBill.setEndTime(beforeBill.getEndTime().plusMonths(contract.getPayType().equals("1")? 1:contract.getPayType().equals("2")? 3:12));
                     TBill tBill = new TBill();
                     tBill.setContractId(contract.getId());
                     tBill.setContractNumber(contract.getContractNumber());

--
Gitblit v1.7.1