From bc1637e6814b61544a01d7bfebe494e4364a87f4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 19 Apr 2019 11:53:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C=E5=AE=A1=E6=89=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E6=8A=BC=E9=87=91?= =?UTF-8?q?=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPropertyContractServiceImpl.java | 7 +++++++ .../iformall/service/impl/WxRentContractServiceImpl.java | 7 +++++++ 2 files changed, 14 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 6ad96de44..63c70ef8e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -118,6 +118,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract)); //押金欠缴 result.put("depositOweCount",wxBillPropertyDepositMapper.queryOweCount(propertyContract)); + //押金状态 + WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); + wxBillPropertyDeposit.setPropertyContractId(id); + List select = wxBillPropertyDepositMapper.select(wxBillPropertyDeposit); + if (!select.isEmpty()) { + result.put("depositStatus", select.get(0).getStatus()); + } //发起人备注 WxFlowRecord wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setBusinessId(id); 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 a77bbaeb6..0ad67c9f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -159,6 +159,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract)); //押金欠缴 result.put("depositOweCount",wxBillDepositMapper.queryOweCount(wxRentContract)); + //押金状态 + WxBillDeposit wxBillDeposit = new WxBillDeposit(); + wxBillDeposit.setRentContractId(id); + List select = wxBillDepositMapper.select(wxBillDeposit); + if (!select.isEmpty()) { + result.put("depositStatus", select.get(0).getStatus()); + } //发起人备注 WxFlowRecord wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setBusinessId(id);