diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index 2fbd0ea91..8788a4ecf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -68,5 +68,9 @@ public class WxRentPropertyContractVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType") private Integer operationType; + @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型1店铺2多经点位", name = "rentShopType") + private Integer rentShopType; + + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 709a3d5d4..8db5380f6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.vo.WxRentPropertyContractVo; import java.util.List; import java.util.Map; @@ -59,4 +60,6 @@ public interface WxRentContractMapper extends CommonMapper Integer getShopType(WxRentContract wxRentContract); + List listContractVo(WxRentPropertyContractVo 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 f9657bfbe..478dca706 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1837,8 +1837,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public PageInfo listContractVo(WxRentPropertyContractVo wxRentPropertyContractVo, Integer pageNum, Integer pageSize) { - return null; + public PageInfo listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.listContractVo(record)); } public static double getMonthNeedPay(Double price,Date start,Date end){ diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index fbdfccf50..8216ffa60 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -296,6 +296,51 @@ select s.type from wx_rent_contract r left join wx_shop s on(s.id = r.`shop_id`) where r.id = #{id} + + + + + + + + + + + + + + + + + + + +