| @@ -2,7 +2,6 @@ package com.iformall.domain.po; | |||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | import cn.afterturn.easypoi.excel.annotation.Excel; | ||||
| import com.iformall.common.SortColumn; | import com.iformall.common.SortColumn; | ||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -68,6 +67,7 @@ public class WxShop extends BaseEntity { | |||||
| /*经营面积**/ | /*经营面积**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="经营面积",name="operationArea") | @io.swagger.annotations.ApiModelProperty(value="经营面积",name="operationArea") | ||||
| @Excel(name="计租面积(㎡)",width = 20,orderNum = "6") | @Excel(name="计租面积(㎡)",width = 20,orderNum = "6") | ||||
| @SortColumn(column = "operationArea") | |||||
| private String operationArea; | private String operationArea; | ||||
| /*楼座号**/ | /*楼座号**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | ||||
| @@ -149,8 +149,8 @@ | |||||
| </select> | </select> | ||||
| <select id="findListMap" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> | <select id="findListMap" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> | ||||
| select s.id,s.shop_number shopNumber,CONVERT( s.build_area,SIGNED) buildArea, | |||||
| s.img_url imgUrl,s.operation_area operationArea, | |||||
| select s.id,s.shop_number shopNumber,CONVERT(s.build_area,SIGNED) buildArea, | |||||
| s.img_url imgUrl,CONVERT(s.operation_area,SIGNED) 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 | ||||