| @@ -153,21 +153,31 @@ | |||||
| s.img_url imgUrl,CONVERT(s.operation_area,DECIMAL(10,2)) operationArea, | s.img_url imgUrl,CONVERT(s.operation_area,DECIMAL(10,2)) operationArea, | ||||
| s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId, | s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId, | ||||
| m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone, | m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone, | ||||
| s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay | |||||
| s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay,rent | |||||
| from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0 | from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0 | ||||
| left join wx_merchant m on ms.merchant_id=m.id | left join wx_merchant m on ms.merchant_id=m.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 s.is_del=0 | where s.is_del=0 | ||||
| <if test=" null != id "> | |||||
| <if test=" null != type "> | |||||
| and s.`type` = #{type} | |||||
| </if> | |||||
| <if test=" null != status"> | |||||
| and s.`status` = #{status} | |||||
| </if> | |||||
| <if test=" null != building "> | |||||
| and s.`building`= #{building} | |||||
| </if> | |||||
| <if test=" null != floor "> | |||||
| and s.`floor` = #{floor} | |||||
| </if> | |||||
| <if test=" null != id "> | |||||
| and s.`id` = #{id} | and s.`id` = #{id} | ||||
| </if> | |||||
| <if test=" null != tenantId "> | |||||
| and s.`tenant_id`= #{tenantId} | |||||
| </if> | </if> | ||||
| <if test=" null != shopNumber and ''!=shopNumber"> | <if test=" null != shopNumber and ''!=shopNumber"> | ||||
| @@ -185,21 +195,6 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != building "> | |||||
| and s.`building`= #{building} | |||||
| </if> | |||||
| <if test=" null != floor "> | |||||
| and s.`floor` = #{floor} | |||||
| </if> | |||||
| <if test=" null != status"> | |||||
| and s.`status` = #{status} | |||||
| </if> | |||||
| <if test=" null != x "> | <if test=" null != x "> | ||||
| and s.`x` = #{x} | and s.`x` = #{x} | ||||
| @@ -245,10 +240,8 @@ | |||||
| <if test=" null != managerPhone "> | <if test=" null != managerPhone "> | ||||
| and s.`manager_phone` = #{managerPhone} | and s.`manager_phone` = #{managerPhone} | ||||
| </if> | </if> | ||||
| <if test=" null != type "> | |||||
| and s.`type` = #{type} | |||||
| </if> | |||||
| <if test=" null != pointType "> | |||||
| <if test=" null != pointType "> | |||||
| and s.`point_type` = #{pointType} | and s.`point_type` = #{pointType} | ||||
| </if> | </if> | ||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||