Преглед изворни кода

[租赁概览][修改][按楼层楼座查询信息]

release_toaliyun_real
gongbiao пре 6 година
родитељ
комит
f59a20537a
2 измењених фајлова са 27 додато и 10 уклоњено
  1. +15
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  2. +12
    -6
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 15
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java Прегледај датотеку

@@ -312,7 +312,7 @@ public class WxChartServiceImpl implements WxChartDataService {


//首页商铺出租数据 //首页商铺出租数据
if (chart.equals(EnumChart.INDEX_SHOP_RENT.getCode())) { if (chart.equals(EnumChart.INDEX_SHOP_RENT.getCode())) {
return getIndexShopRentData(tenantId);
return getIndexShopRentData(paramsMap);
} }


//首页商铺出租数据 //首页商铺出租数据
@@ -2430,14 +2430,25 @@ public class WxChartServiceImpl implements WxChartDataService {


/** /**
* 首页商铺出租数据 * 首页商铺出租数据
* @param tenantId
* @param paramMap
* @return * @return
*/ */
private ResultData getIndexShopRentData(String tenantId) {
private ResultData getIndexShopRentData(Map<String, String> paramMap) {
HashMap<String, Object> datamap = new HashMap<>(); HashMap<String, Object> datamap = new HashMap<>();
WxShop query = new WxShop(); WxShop query = new WxShop();
query.setTenantId(tenantId);
String tenantId = paramMap.get("tenantId");
String building = paramMap.get("building");
String floor = paramMap.get("floor");


if (StringUtils.isNotEmpty(tenantId)) {
query.setTenantId(tenantId);
}
if (StringUtils.isNotEmpty(building)) {
query.setBuilding(Long.valueOf(building));
}
if (StringUtils.isNotEmpty(floor)) {
query.setFloor(Long.valueOf(floor));
}
query.setType(null); query.setType(null);
Long total = wxShopMapper.getCountByWxShop(query); Long total = wxShopMapper.getCountByWxShop(query);
query.setType(EnumRentShopType.SHOP.getCode()); query.setType(EnumRentShopType.SHOP.getCode());


+ 12
- 6
mallinkService/src/main/resources/mapper/WxShopMapper.xml Прегледај датотеку

@@ -549,18 +549,24 @@
<if test=" null != tenantId "> <if test=" null != tenantId ">
and w.`tenant_id`= #{tenantId} and w.`tenant_id`= #{tenantId}
</if> </if>
<if test="null != startdate">
and ms.`create_date` >= #{startdate}
</if>
<if test="null != enddate">
and ms.`create_date` &lt;= #{enddate}
</if>
<if test="null != type"> <if test="null != type">
and `type`=#{type} and `type`=#{type}
</if> </if>
<if test="null != status"> <if test="null != status">
and status = #{status} and status = #{status}
</if> </if>
<if test="null != building">
and building = #{building}
</if>
<if test="null != floor">
and floor = #{floor}
</if>
<if test="null != startdate">
and ms.`create_date` >= #{startdate}
</if>
<if test="null != enddate">
and ms.`create_date` &lt;= #{enddate}
</if>
</select> </select>


<select id="rentRateHistory" resultType="hashmap" parameterType="hashmap"> <select id="rentRateHistory" resultType="hashmap" parameterType="hashmap">


Loading…
Откажи
Сачувај