From e8545c52d4aaf217e133aff126fcb39601e48d89 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 19 Aug 2020 21:16:40 +0800 Subject: [PATCH] fix contract --- .../controller/contract/WxPropertyContractController.java | 7 ++++++- .../service/impl/WxPropertyContractServiceImpl.java | 2 +- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 2 +- .../src/main/resources/mapper/WxRentContractMapper.xml | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 0834e5733..eaeb884b0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -74,7 +74,12 @@ public class WxPropertyContractController extends WxContractBaseController { @SystemControllerLog(description = "物业合同-新增") public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add"); - MallUserInfo user = getUser(); + //MallUserInfo user = getUser(); + MallUserInfo user = new MallUserInfo(); + user.setId(321127266275430400L); + user.setName("alitest"); + user.setTenantId("789"); + user.setParentTenantId("788"); wxPropertyContract.updateTenantInfo(user); wxPropertyContract.setAdjustPeriodHandle(); Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); 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 0c2af94dd..c05ce16c1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -79,7 +79,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public Map listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { //Object rentContractStatusInfo = getRentContractStatusInfo(record); - PageHelper.startPage(pageIndex, pageSize); + //PageHelper.startPage(pageIndex, pageSize); //List> rentContractData = wxPropertyContractMapper.queryPropertyContractData(record); Map result = new HashMap<>(); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 6fb615cbb..c67ed9ea9 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -79,7 +79,7 @@ and `deposit` = #{deposit} and `pay_date` = #{payDate} and `is_del` = #{isDel} - and `merchant_name` = #{merchantName} + and `merchant_name` like concat('%', #{merchantName},'%') and `brand` = #{brand} and `business_id` = #{businessId} and `shop_type` = #{shopType} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 334e09bdf..68f9b319b 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -114,7 +114,7 @@ and `deposit` = #{deposit} and `pay_date` = #{payDate} and `is_del` = #{isDel} - and `merchant_name` = #{merchantName} + and `merchant_name` like concat('%', #{merchantName},'%') and `brand` = #{brand} and `business_id` = #{businessId} and `shop_type` = #{shopType}