| @@ -115,9 +115,10 @@ public class WxRentContractController extends BaseController { | |||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | ||||
| @ApiImplicitParam(name = "pageSize", 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"); | 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") | @GetMapping("exportContract") | ||||
| @@ -33,7 +33,7 @@ public interface WxRentContractMapper extends CommonMapper<WxRentContract, Strin | |||||
| void updateRentInvalidStatus(WxRentContract wxRentContract); | void updateRentInvalidStatus(WxRentContract wxRentContract); | ||||
| List<WxRentContract> getRentContractList(String tenantId); | |||||
| List<WxRentContract> getRentContractList(WxRentContract tenantId); | |||||
| void updateStatusForUnsign(WxRentContract wxRentContract); | void updateStatusForUnsign(WxRentContract wxRentContract); | ||||
| @@ -57,7 +57,7 @@ public interface WxRentContractService { | |||||
| ResultData updateMerchant(WxRentContract wxRentContract); | 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); | void exportContract(HttpServletRequest request, HttpServletResponse response, String tenantId, Long id); | ||||
| @@ -610,8 +610,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public PageInfo<WxRentContract> getRentContractList(String tenantId, Integer pageIndex, Integer pageSize) { | |||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(tenantId)); | |||||
| public PageInfo<WxRentContract> getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { | |||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(rentContract)); | |||||
| } | } | ||||
| public Map<String, Object> updateStatus(WxRentContract record) { | public Map<String, Object> updateStatus(WxRentContract record) { | ||||
| @@ -174,13 +174,14 @@ | |||||
| )s) and status=1 and status!=7 and tenant_id=#{tenantId} | )s) and status=1 and status!=7 and tenant_id=#{tenantId} | ||||
| </update> | </update> | ||||
| <select id="getRentContractList" parameterType="String" resultType="com.iformall.domain.po.WxRentContract"> | |||||
| <select id="getRentContractList" parameterType="com.iformall.domain.po.WxRentContract" | |||||
| resultType="com.iformall.domain.po.WxRentContract"> | |||||
| select rc.*,s.shop_number,b.building_name building, f.floor_name floor from wx_rent_contract rc | 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_shop s on rc.shop_id=s.id | ||||
| left join wx_mall_building b on s.building=b.id | left join wx_mall_building b on s.building=b.id | ||||
| left join wx_mall_floor f on s.floor=f.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} | where rc.status not in(1,5,6,7) and rc.tenant_id=#{tenantId} | ||||
| <if test=" null != rentShopType ">and rent_shop_type = #{rentShopType}</if> | |||||
| <if test=" null != rentShopType ">and rc.rent_shop_type = #{rentShopType}</if> | |||||
| order by id desc | order by id desc | ||||
| </select> | </select> | ||||