From 4378c144f3ccfe0656adf1ad11824bf9705a57ba Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 12 Apr 2019 13:51:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BC=98=E5=8C=96=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E5=91=A8=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 1 + .../com/iformall/service/impl/WxRentContractServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index a701cd2f5..00a08d3d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -288,6 +288,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService ||!wxPropertyContract.getPrice().equals(record.getPrice()) ||!wxPropertyContract.getDeposit().equals(record.getDeposit()) ||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod()) + || !DateUtils.date2String(wxPropertyContract.getStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(record.getStartDate(),"yyyy-MM-dd")) )){ wxBillPropertyMapper.deletePreviewBill(record); //重新生成 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 aeb9b1777..77d3ec066 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -344,6 +344,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { || !record.getType().equals(dbRent.getType()) || !record.getPrice().equals(dbRent.getPrice()) || !record.getAdjustRatio().replaceAll("\\s*", "").equals(dbRent.getAdjustRatio().replaceAll("\\s*", "")) + || !DateUtils.date2String(record.getStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(dbRent.getStartDate(),"yyyy-MM-dd")) ) { change = true; } @@ -353,6 +354,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { || !record.getType().equals(dbRent.getType()) || !record.getRevenue().equals(dbRent.getRevenue()) || !record.getPayRatio().equals(dbRent.getPayRatio()) + || !DateUtils.date2String(record.getStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(dbRent.getStartDate(),"yyyy-MM-dd")) ) { change = true; } @@ -362,6 +364,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { || !record.getType().equals(dbRent.getType()) || !record.getPrice().equals(dbRent.getPrice()) || !record.getPayRatio().equals(dbRent.getPayRatio()) + || !DateUtils.date2String(record.getStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(dbRent.getStartDate(),"yyyy-MM-dd")) ) { change = true; }