From 5e7006162aeb7ae18ce987d4a93f486158c72251 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 15 Jun 2019 13:26:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A=E5=90=88?= =?UTF-8?q?=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=9B=B4=E6=96=B0=E8=B4=A6?= =?UTF-8?q?=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 4 +- .../impl/WxRentContractServiceImpl.java | 6 +- .../WxRentPropertyContractServiceImpl.java | 58 +++---------------- 3 files changed, 12 insertions(+), 56 deletions(-) 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 a1820b953..1a8f31107 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -71,12 +71,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public Map listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { - Object rentContractStatusInfo = getRentContractStatusInfo(record); + //Object rentContractStatusInfo = getRentContractStatusInfo(record); PageHelper.startPage(pageIndex, pageSize); List> rentContractData = wxPropertyContractMapper.queryPropertyContractData(record); PageInfo> pageInfo = new PageInfo<>(rentContractData); Map result = new HashMap<>(); - result.put("rentContractStatusInfo", rentContractStatusInfo); + //result.put("rentContractStatusInfo", rentContractStatusInfo); result.put("pageInfo", pageInfo); return result; 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 5d79868cb..fc00214c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -110,12 +110,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public Map listAsPage(WxRentContract record, Integer pageIndex, Integer pageSize) { - Object rentContractStatusInfo = getRentContractStatusInfo(record); + //Object rentContractStatusInfo = getRentContractStatusInfo(record); PageHelper.startPage(pageIndex, pageSize); List> rentContractData = wxRentContractMapper.queryRentContractData(record); PageInfo> pageInfo = new PageInfo<>(rentContractData); Map result = new HashMap<>(); - result.put("rentContractStatusInfo", rentContractStatusInfo); + //result.put("rentContractStatusInfo", rentContractStatusInfo); result.put("pageInfo", pageInfo); return result; } @@ -1376,7 +1376,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())). findFirst().orElse(null); if (propertyContract != null) { - wxPropertyContractService.updatePropertyPreviewBill(propertyContract); + wxPropertyContractService.updatePropertyContractStatus(propertyContract.getId()); } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index ba8d9b97c..efc6e69ff 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -7,10 +7,11 @@ import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.enums.EnumRentContractStatus; -import com.iformall.mapper.*; -import com.iformall.service.*; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.TaskService; +import com.iformall.mapper.WxPropertyContractMapper; +import com.iformall.mapper.WxRentContractMapper; +import com.iformall.service.WxPropertyContractService; +import com.iformall.service.WxRentContractService; +import com.iformall.service.WxRentPropertyContractService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,62 +27,17 @@ import java.util.Map; public class WxRentPropertyContractServiceImpl implements WxRentPropertyContractService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired - private String fmUploadDir; - @Autowired WxRentContractMapper wxRentContractMapper; - @Autowired - WxShopMapper wxShopMapper; - - @Autowired - WxMerchantService wxMerchantService; - - @Autowired - WxBillRentMapper wxBillRentMapper; - - @Autowired - WxBillDepositMapper wxBillDepositMapper; - @Autowired WxPropertyContractMapper wxPropertyContractMapper; - @Autowired - WxMerchantMapper wxMerchantMapper; - - @Autowired - WxBusinessMapper wxBusinessMapper; - - @Autowired - WxMallMapper wxMallMapper; - - @Autowired - WxBrandMapper WxBrandMapper; - - @Autowired - WxFlowRecordService wxFlowRecordService; - - @Autowired - RuntimeService runtimeService; - - @Autowired - private TaskService taskService; - - @Autowired - private WxFlowService wxFlowService; - - @Autowired - WxMerchantShopMapper wxMerchantShopMapper; - - @Autowired - WxFlowRecordMapper wxFlowRecordMapper; - @Autowired WxPropertyContractService wxPropertyContractService; @Autowired - WxRentContractService wxRentontractService; + WxRentContractService wxRentContractService; @Override public PageInfo listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { @@ -91,7 +47,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract @Override public ResultData getContractInfo(Long id) { Map data = new HashMap<>(); - Map rent = wxRentontractService.getById(id); + Map rent = wxRentContractService.getById(id); data.put("rent", rent); WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); wxPropertyContractQuery.setRentContractId(id);