From 064ffb64a64fbf911cb3cb4af78b1e9b3aa04e63 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 6 Aug 2024 16:21:38 +0800 Subject: [PATCH] fix --- .../src/main/java/com/iformall/enums/EnumBillAllType.java | 2 +- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java index 1defecde8..83b282bef 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillAllType.java @@ -8,7 +8,7 @@ public enum EnumBillAllType { RENT(1,"租金",1L,false), RENT_BUSSINESS_MANAGE(11,"商业管理费",2L,false), RENT_OPERATION_MANAGE(12,"运营管理费",3L,false), - RENT_DEPOSIT(13,"租赁押金",null,false), + RENT_DEPOSIT(13,"租赁押金",null,true), PROPERTY(2,"物业",5L,false), PROPERTY_DEPOSIT(21,"物业押金",6L,true), DAILY(3, "能耗(水电空调)费",null,false), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 9b572c270..78ff911b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1917,6 +1917,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (timeVo.getEndDate().after(yearEndDate)) { timeVo.setEndDate(yearEndDate); yearsEndList.remove(yearEndDate); + }else if(timeVo.getEndDate().equals(yearEndDate)) { + yearsEndList.remove(yearEndDate); } }