| @@ -94,40 +94,40 @@ | |||
| <sql id="dynamicWhereConditions"> | |||
| where 1 = 1 | |||
| <if test=" null != id ">and `id` = #{id}</if> | |||
| <if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if> | |||
| <if test=" null != price ">and `price` = #{price}</if> | |||
| <if test=" null != rentalStartDate ">and `rental_start_date` = #{rentalStartDate}</if> | |||
| <if test=" null != rentalEndDate ">and `rental_end_date` = #{rentalEndDate}</if> | |||
| <if test=" null != signDate ">and `sign_date` = #{signDate}</if> | |||
| <if test=" null != receivePeriod ">and `receive_period` = #{receivePeriod}</if> | |||
| <if test=" null != merchantId and '' != merchantId">and `merchant_id` = #{merchantId}</if> | |||
| <if test=" null != price and '' != price">and `price` = #{price}</if> | |||
| <if test=" null != rentalStartDate and '' != rentalStartDate">and `rental_start_date` = #{rentalStartDate}</if> | |||
| <if test=" null != rentalEndDate and '' != rentalEndDate">and `rental_end_date` = #{rentalEndDate}</if> | |||
| <if test=" null != signDate and '' != signDate">and `sign_date` = #{signDate}</if> | |||
| <if test=" null != receivePeriod and '' != receivePeriod">and `receive_period` = #{receivePeriod}</if> | |||
| <if test=" null != tenantId and '' != tenantId"> | |||
| and `tenant_id` = #{tenantId} | |||
| </if> | |||
| <if test=" null != parentTenantId and '' != parentTenantId"> | |||
| and `parent_tenant_id` = #{parentTenantId} | |||
| </if> | |||
| <if test=" null != filepath ">and `filepath` = #{filepath}</if> | |||
| <if test=" null != status ">and `status` = #{status}</if> | |||
| <if test=" null != contractNumber ">and `contract_number` = #{contractNumber}</if> | |||
| <if test=" null != deposit ">and `deposit` = #{deposit}</if> | |||
| <if test=" null != payDate ">and `pay_date` = #{payDate}</if> | |||
| <if test=" null != isDel ">and `is_del` = #{isDel}</if> | |||
| <if test=" null != merchantName ">and `merchant_name` = #{merchantName}</if> | |||
| <if test=" null != brand ">and `brand` = #{brand}</if> | |||
| <if test=" null != businessId ">and `business_id` = #{businessId}</if> | |||
| <if test=" null != shopType ">and `shop_type` = #{shopType}</if> | |||
| <if test=" null != updatetime ">and `updatetime` = #{updatetime}</if> | |||
| <if test=" null != createtime ">and `createtime` = #{createtime}</if> | |||
| <if test=" null != linkPerson ">and `link_person` = #{linkPerson}</if> | |||
| <if test=" null != linkPhone ">and `link_phone` = #{linkPhone}</if> | |||
| <if test=" null != payAccount ">and `pay_account` = #{payAccount}</if> | |||
| <if test=" null != filename ">and `filename` = #{filename}</if> | |||
| <if test=" null != lease ">and `lease` = #{lease}</if> | |||
| <if test=" null != type ">and `type` = #{type}</if> | |||
| <if test=" null != startDate ">and `start_date` = #{startDate}</if> | |||
| <if test=" null != endDate ">and `end_date` = #{endDate}</if> | |||
| <if test=" null != rentShopType ">and `rent_shop_type` = #{rentShopType}</if> | |||
| <if test=" null != operationType ">and `operation_type` = #{operationType}</if> | |||
| <if test=" null != filepath and '' != filepath">and `filepath` = #{filepath}</if> | |||
| <if test=" null != status and '' != status">and `status` = #{status}</if> | |||
| <if test=" null != contractNumber and '' != contractNumber">and `contract_number` = #{contractNumber}</if> | |||
| <if test=" null != deposit and '' != deposit">and `deposit` = #{deposit}</if> | |||
| <if test=" null != payDate and '' != payDate">and `pay_date` = #{payDate}</if> | |||
| <if test=" null != isDel and '' != isDel">and `is_del` = #{isDel}</if> | |||
| <if test=" null != merchantName and '' != merchantName">and `merchant_name` = #{merchantName}</if> | |||
| <if test=" null != brand and '' != brand">and `brand` = #{brand}</if> | |||
| <if test=" null != businessId and '' != businessId">and `business_id` = #{businessId}</if> | |||
| <if test=" null != shopType and '' != shopType">and `shop_type` = #{shopType}</if> | |||
| <if test=" null != updatetime and '' != updatetime">and `updatetime` = #{updatetime}</if> | |||
| <if test=" null != createtime and '' != createtime">and `createtime` = #{createtime}</if> | |||
| <if test=" null != linkPerson and '' != linkPerson">and `link_person` = #{linkPerson}</if> | |||
| <if test=" null != linkPhone and '' != linkPhone">and `link_phone` = #{linkPhone}</if> | |||
| <if test=" null != payAccount and '' != payAccount">and `pay_account` = #{payAccount}</if> | |||
| <if test=" null != filename and '' != filename">and `filename` = #{filename}</if> | |||
| <if test=" null != lease and '' != lease">and `lease` = #{lease}</if> | |||
| <if test=" null != type and '' != type">and `type` = #{type}</if> | |||
| <if test=" null != startDate and '' != startDate">and `start_date` = #{startDate}</if> | |||
| <if test=" null != endDate and '' != endDate">and `end_date` = #{endDate}</if> | |||
| <if test=" null != rentShopType and '' != rentShopType">and `rent_shop_type` = #{rentShopType}</if> | |||
| <if test=" null != operationType and '' != operationType">and `operation_type` = #{operationType}</if> | |||
| <if test=" null != ids "> | |||
| and id in | |||
| @@ -588,7 +588,7 @@ | |||
| and floor in (${floorForRule})) | |||
| </foreach> | |||
| </if> | |||
| <if test="null != rentShopType and 2 == rentShopType and null != floorForRule and '' != floorForRule "> | |||
| <!-- <if test="null != rentShopType and 2 == rentShopType and null != floorForRule and '' != floorForRule "> | |||
| and rc.shop_id in (select id from wx_shop where 1=1 | |||
| <if test=" null != tenantId and '' != tenantId"> | |||
| and `tenant_id` = #{tenantId} | |||
| @@ -597,7 +597,7 @@ | |||
| and `parent_tenant_id` = #{parentTenantId} | |||
| </if> | |||
| and floor in (${floorForRule})) | |||
| </if> | |||
| </if> --> | |||
| </where> | |||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||