|
|
|
@@ -28,14 +28,14 @@ |
|
|
|
<result column="freeDay" property="freeDay"/> |
|
|
|
<result column="rent" property="rent"/> |
|
|
|
<result column="rent_unit" property="rentUnit"/> |
|
|
|
<result column="business" property="business"/> |
|
|
|
<result column="business_id" property="businessId"/> |
|
|
|
|
|
|
|
</resultMap> |
|
|
|
|
|
|
|
<sql id="allColumns"> |
|
|
|
`id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`addr`, |
|
|
|
`baidu_poi`,`longitude`,`latitude`,`create_date`,`update_date`,`img_url`,`manager`,`manager_phone`, |
|
|
|
`type`,`point_type`,`comments`,`is_del`,DATEDIFF(now(),create_date) freeDay,rent,rent_unit,business |
|
|
|
`type`,`point_type`,`comments`,`is_del`,DATEDIFF(now(),create_date) freeDay,rent,rent_unit,business_id |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="dynamicWhereConditions"> |
|
|
|
@@ -156,7 +156,8 @@ |
|
|
|
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, |
|
|
|
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,rent,rent_unit,business |
|
|
|
s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay,rent,rent_unit,business_id as |
|
|
|
businessId |
|
|
|
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_mall_building b on s.building=b.id |
|
|
|
@@ -443,8 +444,8 @@ |
|
|
|
and s.`point_type` = #{pointType} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="null != business"> |
|
|
|
and s.business = #{business} |
|
|
|
<if test="null != businessId"> |
|
|
|
and s.business_id = #{businessId} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != ids "> |
|
|
|
@@ -565,8 +566,8 @@ |
|
|
|
<if test="null != enddate"> |
|
|
|
and `create_date` <= #{enddate} |
|
|
|
</if> |
|
|
|
<if test="null != business"> |
|
|
|
and business = #{business} |
|
|
|
<if test="null != businessId"> |
|
|
|
and business_id = #{businessId} |
|
|
|
</if> |
|
|
|
</select> |
|
|
|
|
|
|
|
@@ -588,8 +589,8 @@ |
|
|
|
<if test="floor!=null"> |
|
|
|
and s.floor=#{floor} |
|
|
|
</if> |
|
|
|
<if test="business!=null"> |
|
|
|
and s.business=#{business} |
|
|
|
<if test="businessId!=null"> |
|
|
|
and s.business_id=#{businessId} |
|
|
|
</if> |
|
|
|
group by xTime |
|
|
|
order by xTime |
|
|
|
|