xhxu 4 лет назад
Родитель
Сommit
f13cf72865
4 измененных файлов: 24 добавлений и 19 удалений
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxShop.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java
  3. +1
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
  4. +18
    -16
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

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

@@ -58,9 +58,13 @@ public class WxShop extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
private Long building;
@TableField(exist = false)
private String buildingName;

@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
private Long floor;
@TableField(exist = false)
private String floorName;

@Excel(name="租赁状态",width = 20,orderNum = "7",replace = {"未出租_0","已出租_1"})
@io.swagger.annotations.ApiModelProperty(value="状态(0:未出租, 1:已出租)",name="status")


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java Просмотреть файл

@@ -43,5 +43,5 @@ public interface WxShopMapper extends CommonMapper<WxShop, String> {

Map<String,Object> detailById(@Param("id") Long id);

// List<WxShop> selectBatchByIds(@Param("ids")List<Long> ids);
List<WxShop> selectBatchByIds(@Param("ids")List<Long> ids);
}

+ 1
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java Просмотреть файл

@@ -82,8 +82,7 @@ public class WxShopServiceImpl implements WxShopService {
if(CollectionUtils.isEmpty(ids)) {
return new ArrayList<>() ;
}
return wxShopMapper.selectBatchIds(ids) ;
// return wxShopMapper.selectBatchByIds((List<Long>) ids) ;
return wxShopMapper.selectBatchByIds((List<Long>) ids) ;
}

@Override


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

@@ -10,6 +10,8 @@
<result column="operation_area" jdbcType="VARCHAR" property="operationArea"/>
<result column="building" jdbcType="BIGINT" property="building"/>
<result column="floor" jdbcType="BIGINT" property="floor"/>
<result column="building_name" jdbcType="VARCHAR" property="buildingName"/>
<result column="floor_name" jdbcType="VARCHAR" property="floorName"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="x" jdbcType="DECIMAL" property="x"/>
<result column="y" jdbcType="DECIMAL" property="y"/>
@@ -139,22 +141,22 @@
<include refid="dynamicWhereConditions"/>
</select>

<!-- <select id="selectBatchByIds" resultMap="BaseResultMap">-->
<!-- select-->
<!-- s.`id`,s.`tenant_id`,s.`parent_tenant_id`,s.`shop_number`,s.`build_area`,s.`operation_area`,b.building_name building,f.floor_name floor,s.`status`,s.`x`,s.`y`,s.`addr`,-->
<!-- s.`baidu_poi`,s.`longitude`,s.`latitude`,s.`create_date`,s.`update_date`,s.`img_url`,s.`manager`,s.`manager_phone`,-->
<!-- s.`type`,s.`point_type`,s.`comments`,s.`is_del`,DATEDIFF(now(),s.create_date) freeDay,s.rent,s.rent_unit,s.business_id-->
<!-- from wx_shop s-->
<!-- left join wx_mall_building b on s.building=b.id-->
<!-- left join wx_mall_floor f on s.floor=f.id-->
<!-- where s.is_del=0-->
<!-- <if test=" null != ids ">-->
<!-- and s.id in-->
<!-- <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">-->
<!-- #{idItem}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- </select>-->
<select id="selectBatchByIds" resultMap="BaseResultMap">
select
s.`id`,s.`tenant_id`,s.`parent_tenant_id`,s.`shop_number`,s.`build_area`,s.`operation_area`,s.building,b.building_name building_name,s.floor,f.floor_name floor_name,s.`status`,s.`x`,s.`y`,s.`addr`,
s.`baidu_poi`,s.`longitude`,s.`latitude`,s.`create_date`,s.`update_date`,s.`img_url`,s.`manager`,s.`manager_phone`,
s.`type`,s.`point_type`,s.`comments`,s.`is_del`,DATEDIFF(now(),s.create_date) freeDay,s.rent,s.rent_unit,s.business_id
from wx_shop s
left join wx_mall_building b on s.building=b.id
left join wx_mall_floor f on s.floor=f.id
where s.is_del=0
<if test=" null != ids ">
and s.id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
</select>

<select id="findListMap" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap">
select s.id id, s.tenant_id tenantId, s.parent_tenant_id parentTenantId, s.shop_number shopNumber,CONVERT(s.build_area,DECIMAL(10,2)) buildArea,


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