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

[租赁概览][修改][按业态查询图表及店铺出租数据]

release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
acc11659d1
2 измененных файлов: 29 добавлений и 0 удалений
  1. +18
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  2. +11
    -0
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

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

@@ -451,6 +451,20 @@ public class WxChartServiceImpl implements WxChartDataService {
queryMap.put("tenantId",tenantId);
queryMap.put("dateType",dateType);

String building = paramsMap.get("building");
String floor = paramsMap.get("floor");
String business = paramsMap.get("business");

if (StringUtils.isNotEmpty(building)) {
queryMap.put("building", building);
}
if (StringUtils.isNotEmpty(floor)) {
queryMap.put("floor", building);
}
if (StringUtils.isNotEmpty(business)) {
queryMap.put("business", building);
}

// get all
WxShop query = new WxShop();
query.setTenantId(tenantId);
@@ -2439,6 +2453,7 @@ public class WxChartServiceImpl implements WxChartDataService {
String tenantId = paramMap.get("tenantId");
String building = paramMap.get("building");
String floor = paramMap.get("floor");
String business = paramMap.get("business");

if (StringUtils.isNotEmpty(tenantId)) {
query.setTenantId(tenantId);
@@ -2449,6 +2464,9 @@ public class WxChartServiceImpl implements WxChartDataService {
if (StringUtils.isNotEmpty(floor)) {
query.setFloor(Long.valueOf(floor));
}
if (StringUtils.isNotEmpty(business)) {
query.setBusiness(Long.valueOf(business));
}
query.setType(null);
Long total = wxShopMapper.getCountByWxShop(query);
query.setType(EnumRentShopType.SHOP.getCode());


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

@@ -442,6 +442,11 @@
<if test=" null != pointType ">
and s.`point_type` = #{pointType}
</if>
<if test="null != business">
and s.business = #{business}
</if>
<if test=" null != ids ">
and s.id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -560,6 +565,9 @@
<if test="null != enddate">
and `create_date` &lt;= #{enddate}
</if>
<if test="null != business">
and business = #{business}
</if>
</select>

<select id="rentRateHistory" resultType="hashmap" parameterType="hashmap">
@@ -580,6 +588,9 @@
<if test="floor!=null">
and s.floor=#{floor}
</if>
<if test="business!=null">
and s.business=#{business}
</if>
group by xTime
order by xTime
</select>


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