夏文涛 преди 3 години
родител
ревизия
41e23f5ae8
променени са 2 файла, в които са добавени 7 реда и са изтрити 7 реда
  1. 1 1
      mhotel/src/com/happy/action/AppHomePageAction.java
  2. 6 6
      mhotel/src/com/happy/dao/impl/BookingCommentImplDao.java

+ 1 - 1
mhotel/src/com/happy/action/AppHomePageAction.java

@@ -246,7 +246,7 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
         for (House houseData:houseList) {
             BigDecimal todayPrice = BigDecimal.ZERO;
             for (String dateStr:dateStrs){
-                Optional<HousePriceOneDataVo> oneData = oneDatas.stream().filter(e -> e.getHouseId().equals(houseData.getId()) && e.getSetDate().equals(dateStr)).sorted(Comparator.comparing(HousePriceOneDataVo::getCreateDate,Comparator.reverseOrder())).findFirst();
+                Optional<HousePriceOneDataVo> oneData = oneDatas.stream().filter(e -> e.getHouseId().toString().equals(houseData.getId()) && e.getSetDate().equals(dateStr)).sorted(Comparator.comparing(HousePriceOneDataVo::getCreateDate,Comparator.reverseOrder())).findFirst();
                 if(oneData != null && oneData.isPresent()){
                     todayPrice = todayPrice.add(BigDecimal.valueOf(oneData.get().getPrice()));
                 }else{

Файловите разлики са ограничени, защото са твърде много
+ 6 - 6
mhotel/src/com/happy/dao/impl/BookingCommentImplDao.java