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

fix contract

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
df162870bc
2 измененных файлов: 3 добавлений и 2 удалений
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java
  2. +2
    -2
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java Просмотреть файл

@@ -22,6 +22,7 @@ public class WxRentPropertyContractVo extends TenantEntity {


@io.swagger.annotations.ApiModelProperty(value = "商铺号", name = "shopName") @io.swagger.annotations.ApiModelProperty(value = "商铺号", name = "shopName")
private String shopName; private String shopName;
private String shopNumber;


@io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "rentInfo") @io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "rentInfo")
private String rentInfo; private String rentInfo;


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

@@ -575,7 +575,7 @@
and rc.business_id in (${businessForRule}) and rc.business_id in (${businessForRule})
</if> </if>
<if test="null != rentShopType and 1 == rentShopType and null != floorForRule and '' != floorForRule ">
<!-- <if test="null != rentShopType and 1 == rentShopType and null != floorForRule and '' != floorForRule ">
and rc.`id` in and rc.`id` in
<foreach collection="tempShop" index="idx" separator=" union all " open="(" close=")"> <foreach collection="tempShop" index="idx" separator=" union all " open="(" close=")">
select id from wx_rent_contract where 1=1 select id from wx_rent_contract where 1=1
@@ -595,7 +595,7 @@
</if> </if>
and floor in (${floorForRule})) and floor in (${floorForRule}))
</foreach> </foreach>
</if>
</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 and rc.shop_id in (select id from wx_shop where 1=1
<if test=" null != tenantId and '' != tenantId"> <if test=" null != tenantId and '' != tenantId">


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