xhxu 4 лет назад
Родитель
Сommit
0d2bc97dd1
2 измененных файлов: 5 добавлений и 2 удалений
  1. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  2. +2
    -1
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

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

@@ -2333,8 +2333,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
result.put("threeRentalPriceUpper1", PriceUtil.digitUppercase(priceRent)); result.put("threeRentalPriceUpper1", PriceUtil.digitUppercase(priceRent));


result.put("threeRentPrice",wxRentContract.getRentPrice()); result.put("threeRentPrice",wxRentContract.getRentPrice());
Integer threePayRatio1 = new BigDecimal(wxRentContract.getPayRatio())
.divide(new BigDecimal(100)).intValue();
result.put("threePayRatio1",threePayRatio1);


result.put("threePayRatio1",wxRentContract.getPayRatio());
result.put("threePayDate",wxRentContract.getPayDate()); result.put("threePayDate",wxRentContract.getPayDate());
if(StringUtils.isNotBlank(incrementStartDate)){ if(StringUtils.isNotBlank(incrementStartDate)){
result.put("threeRentalEndDateYear1",incrementStartDate.substring(0,4)); result.put("threeRentalEndDateYear1",incrementStartDate.substring(0,4));


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

@@ -667,10 +667,11 @@
s.img_url imgUrl,CONVERT(s.operation_area,DECIMAL(10,2)) operationArea, s.img_url imgUrl,CONVERT(s.operation_area,DECIMAL(10,2)) operationArea,
s.status,b.building_name building,f.floor_name floor,s.manager,s.manager_phone managerPhone, s.status,b.building_name building,f.floor_name floor,s.manager,s.manager_phone managerPhone,
s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay,rent,rent_unit,s.business_id as s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay,rent,rent_unit,s.business_id as
businessId,s.create_date create_date
businessId,bu.title businessName,s.create_date create_date
from wx_shop s from wx_shop s
left join wx_mall_building b on s.building=b.id left join wx_mall_building b on s.building=b.id
left join wx_mall_floor f on s.floor=f.id left join wx_mall_floor f on s.floor=f.id
left join wx_business bu on s.business_id = bu.id
where s.`id` = #{id} where s.`id` = #{id}
</select> </select>
</mapper> </mapper>

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