Просмотр исходного кода

[租赁账单][修改][查询]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
89d4d7aa6f
2 измененных файлов: 3 добавлений и 2 удалений
  1. +1
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
  2. +2
    -1
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 1
- 1
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -108,7 +108,7 @@
rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate,rc.merchant_id merchantId,rc.type,
rc.start_date startDate,rc.end_date endDate,br.`name` brandName,rc.apply_status applyStatus,rc.bank_name
bankName,rc.merchant_id merchantId,rc.rent_shop_type rentShopType,rc.fix_start_date fixStartDate,rc.fix_end_date fixEndDate
,rc.business_type businessType
,rc.business_type businessType,rc.adjust_period adjustPeriod
from wx_rent_contract rc
left join wx_shop s on rc.shop_id=s.id
left join wx_mall_floor f on s.floor=f.id


+ 2
- 1
mallinkService/src/main/resources/mapper/WxShopMapper.xml Просмотреть файл

@@ -417,7 +417,8 @@
</if>
<if test="null!=status and status==1">
and s.id not in(
SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status!=1 and status!=5 and status!=6 and status!=7 and merchant_id is not null
SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status not in(0,1,5,6,7) and
merchant_id is not null
)
</if>
<if test=" null != type ">


Загрузка…
Отмена
Сохранить