diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index 658aaf817..c4709697d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -115,9 +115,10 @@ public class WxRentContractController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData getRentContractList(Integer pageNum, Integer pageSize) { + public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); - return new ResultData(wxRentContractService.getRentContractList(getTenantId(),pageNum, pageSize)); + wxRentContract.setTenantId(getTenantId()); + return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); } @GetMapping("exportContract") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 7b7b3c0a9..b1b83af35 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -33,7 +33,7 @@ public interface WxRentContractMapper extends CommonMapper getRentContractList(String tenantId); + List getRentContractList(WxRentContract tenantId); void updateStatusForUnsign(WxRentContract wxRentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index cb886abc5..0506050c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -57,7 +57,7 @@ public interface WxRentContractService { ResultData updateMerchant(WxRentContract wxRentContract); - Object getRentContractList(String tenantId, Integer pageNum, Integer pageSize); + Object getRentContractList(WxRentContract rentContract, Integer pageNum, Integer pageSize); void exportContract(HttpServletRequest request, HttpServletResponse response, String tenantId, Long 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 26a4fa32c..11fe0a14b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -610,8 +610,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public PageInfo getRentContractList(String tenantId, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(tenantId)); + public PageInfo getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(rentContract)); } public Map updateStatus(WxRentContract record) { diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index ed5ece095..ec1059aff 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -174,13 +174,14 @@ )s) and status=1 and status!=7 and tenant_id=#{tenantId} - select rc.*,s.shop_number,b.building_name building, f.floor_name floor from wx_rent_contract rc left join wx_shop s on rc.shop_id=s.id left join wx_mall_building b on s.building=b.id left join wx_mall_floor f on s.floor=f.id where rc.status not in(1,5,6,7) and rc.tenant_id=#{tenantId} - and rent_shop_type = #{rentShopType} + and rc.rent_shop_type = #{rentShopType} order by id desc